diff --git a/CREDITS.txt b/CREDITS.txt
index 6ea0e45a2..c9f3d46c8 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -2,6 +2,7 @@ Bertrand Songis
 Romolo Manfredini
 André Bernet
 Michael Blandford
+Rob Thomson
 Bryan J. Rentoul (aka Gruvin)
 Cameron Weeks
 Martin Hotař
@@ -17,4 +18,4 @@ Severino Anedda (splash screens)
 Grootwitbaas - 9xforums.com (mac)
 Adrian Amberg (splash screens)
 Wallaguest1 - 9xforums.com (splash screens)
-HC1969 - 9xforums.com (splash screens)
\ No newline at end of file
+HC1969 - 9xforums.com (splash screens)
diff --git a/DONATIONS.txt b/DONATIONS.txt
index 49eab321a..fef01b05d 100644
--- a/DONATIONS.txt
+++ b/DONATIONS.txt
@@ -166,7 +166,7 @@ Heiko Polig
 Andrew Fernie
 Marco Lange
 Nick McMillan
-Michel Baily (mensual)
+Michel Baily (monthly)
 Patrick Mullen
 Scott Campbell
 Erich Roeder
@@ -272,3 +272,19 @@ Kenneth Lilja (monthly)
 R Wells
 Uwe Jordt
 Harald Wilczak
+Bernhard Lohmann
+Ferenc Koller
+Robert Ferguson
+Daniel Byers
+Tyler Darby
+Miguel Villalpando
+Kim Dong Hoon 
+Terry McKinley
+Walter Bell
+wsTech - http://wstech.de
+Clinton Linck
+Gordon Stahl
+Josep Clodas Sola 
+Thierry Martin
+Peter Mauro 
+Mitchell Brenner
diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 318a65524..8ec853eaa 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT( companion9x )
+PROJECT( companion )
 
 SET( C9X_VERSION_MAJOR "1" )
 SET( C9X_VERSION_MINOR "51" )
@@ -109,7 +109,9 @@ add_custom_command(
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp
 )
 
-SET( companion9x_SRCS
+add_subdirectory(modeledit)
+
+SET( companion_SRCS
      eeprominterface.cpp
      hexinterface.cpp
      flashinterface.cpp
@@ -124,28 +126,24 @@ SET( companion9x_SRCS
      ${ER9X_CHECKOUT_DIRECTORY}/er9xsimulator.cpp
      firmwares/gruvin9x/gruvin9xeeprom.cpp
      firmwares/gruvin9x/gruvin9xinterface.cpp  
-     firmwares/opentx/open9xeeprom.cpp
+     firmwares/opentx/opentxeeprom.cpp
      firmwares/opentx/open9xStockeeprom.cpp
-     firmwares/opentx/open9xinterface.cpp
      firmwares/opentx/open9xGruvin9xeeprom.cpp
      firmwares/opentx/open9xSky9xeeprom.cpp
+     firmwares/opentx/opentxinterface.cpp
      firmwares/opentx/opentxTaranisSimulator.cpp
-     firmwares/opentx/open9xSky9xsimulator.cpp
-     firmwares/opentx/open9xGruvin9xsimulator.cpp
-     firmwares/opentx/open9xM128simulator.cpp
-     firmwares/opentx/open9xsimulator.cpp  
+     firmwares/opentx/opentxSky9xsimulator.cpp
+     firmwares/opentx/opentxGruvin9xsimulator.cpp
+     firmwares/opentx/opentxM128simulator.cpp
+     firmwares/opentx/opentxsimulator.cpp  
      firmwares/ersky9x/ersky9xeeprom.cpp
      firmwares/ersky9x/ersky9xinterface.cpp
      ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
-     node.cpp
-     edge.cpp
      helpers.cpp
      mdichild.cpp
      generaledit.cpp
-     modeledit.cpp 
      modelslist.cpp
      mountlist.cpp 
-     mixerslist.cpp 
      avroutputdialog.cpp
      preferencesdialog.cpp
      burnconfigdialog.cpp
@@ -155,8 +153,6 @@ SET( companion9x_SRCS
      burndialog.cpp
      printdialog.cpp
      fusesdialog.cpp
-     expodialog.cpp
-     mixerdialog.cpp
      logsdialog.cpp
      downloaddialog.cpp
      simulatordialog.cpp
@@ -168,16 +164,14 @@ SET( companion9x_SRCS
      qcustomplot.cpp
 )
 
-SET( companion9x_MOC_HDRS
+SET( companion_MOC_HDRS
      avroutputdialog.h
      preferencesdialog.h
      burnconfigdialog.h
      comparedialog.h
      printdialog.h
      fusesdialog.h
-     mixerdialog.h
      logsdialog.h
-     expodialog.h
      contributorsdialog.h
      customizesplashdialog.h
      splashlibrary.h
@@ -191,31 +185,27 @@ SET( companion9x_MOC_HDRS
      xmenuwidget.h
      xsimulatordialog.h
      generaledit.h
-     modeledit.h
      modelslist.h
-     mixerslist.h
      mdichild.h
      mainwindow.h
      myslider.h
      modelconfigdialog.h
      qcustomplot.h
+     helpers.h
 )
      
-SET( companion9x_UIS
+SET( companion_UIS
      mdichild.ui
      avroutputdialog.ui
      comparedialog.ui
      fusesdialog.ui
-     expodialog.ui
      logsdialog.ui
-     mixerdialog.ui
      preferencesdialog.ui
      simulatordialog.ui
      xsimulatordialog.ui
      burnconfigdialog.ui
      downloaddialog.ui
      generaledit.ui
-     modeledit.ui
      printdialog.ui
      contributorsdialog.ui
      customizesplashdialog.ui
@@ -225,25 +215,25 @@ SET( companion9x_UIS
 )
 
 IF ( SDL_FOUND )
-  SET( companion9x_SRCS
-       ${companion9x_SRCS}
+  SET( companion_SRCS
+       ${companion_SRCS}
        joystick.cpp
        joystickdialog.cpp
      )
   
-  SET( companion9x_MOC_HDRS
-       ${companion9x_MOC_HDRS}
+  SET( companion_MOC_HDRS
+       ${companion_MOC_HDRS}
        joystick.h
        joystickdialog.h
      )
      
-  SET( companion9x_UIS
-       ${companion9x_UIS}
+  SET( companion_UIS
+       ${companion_UIS}
        joystickdialog.ui
      ) 
 ENDIF( ) 
 
-SET( companion9x_RCS
+SET( companion_RCS
      companion9x.qrc
      ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
 )
@@ -286,7 +276,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${
 SET( PATCH_FLAGS "--binary" )
 
 IF( WIN32 )
-  SET( companion9x_SRCS ${companion9x_SRCS} icon.rc )
+  SET( companion_SRCS ${companion_SRCS} icon.rc )
   IF ( NOT MSVC )
     SET(CMAKE_EXE_LINKER_FLAGS -mwindows)
   ENDIF( )
@@ -298,28 +288,33 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
 
 SET( LANGUAGES he pt ru de fr it sv cs )
 FOREACH( language ${LANGUAGES} )
-  SET( companion9x_TS ${companion9x_TS} translations/companion9x_${language}.ts )
+  SET( companion_TS ${companion_TS} translations/companion_${language}.ts )
 ENDFOREACH( language )
 
-QT4_WRAP_UI( companion9x_SRCS ${companion9x_UIS} )
-QT4_WRAP_CPP( companion9x_SRCS ${companion9x_MOC_HDRS} )
-QT4_ADD_TRANSLATION( companion9x_QM ${companion9x_TS}  )
-QT4_ADD_RESOURCES( companion9x_SRCS ${companion9x_RCS} )
+QT4_WRAP_UI( companion_SRCS ${companion_UIS} )
+QT4_WRAP_CPP( companion_SRCS ${companion_MOC_HDRS} )
+QT4_ADD_TRANSLATION( companion_QM ${companion_TS}  )
+QT4_ADD_RESOURCES( companion_SRCS ${companion_RCS} )
 
 ADD_DEFINITIONS( -DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}" )
 
 IF( APPLE )
-    ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion9x_SRCS} ${companion9x_QM} )
+    ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion_SRCS} ${companion_QM} )
 ELSE( )
-    ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion9x_SRCS} ${companion9x_QM} )
+    ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
 ENDIF( )
 
-TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
+TARGET_LINK_LIBRARIES( ${PROJECT_NAME} modeledit ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-    INSTALL( FILES companion9x.desktop DESTINATION share/applications )
-    INSTALL( FILES companion9x.png DESTINATION share/icons )
+    INSTALL( FILES companion.desktop DESTINATION share/applications )
+    INSTALL( FILES images/linuxicons/32x32/companion.png    DESTINATION /usr/share/icons/hicolor/32x32/apps )
+    INSTALL( FILES images/linuxicons/48x48/companion.png    DESTINATION /usr/share/icons/hicolor/48x48/apps )
+    INSTALL( FILES images/linuxicons/128x128/companion.png  DESTINATION /usr/share/icons/hicolor/128x128/apps )
+    INSTALL( FILES images/linuxicons/256x256/companion.png  DESTINATION /usr/share/icons/hicolor/256x256/apps )
+    INSTALL( FILES images/linuxicons/512x512/companion.png  DESTINATION /usr/share/icons/hicolor/512x512/apps )
+    INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps )
     INSTALL( FILES ../targets/linux/45-taranis.rules DESTINATION /etc/udev/rules.d/ )
     # Linux specific code
     SET(OperatingSystem "Linux")
@@ -329,13 +324,13 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 IF( WIN32 )
   IF( MSVC )
-    SET( NSI_IN_FILE companion9x-vs.nsi.in )  
+    SET( NSI_IN_FILE companion-vs.nsi.in )  
   ELSE( )
-    SET( NSI_IN_FILE companion9x-msys.nsi.in )
+    SET( NSI_IN_FILE companion-msys.nsi.in )
   ENDIF( )
 
   SET( SYSDIR "$ENV{windir}/system32" )  
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion9x.nsi @ONLY)     
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY)     
 
   FIND_PROGRAM(NSIS_EXE makensis.exe PATHS
     "C:/Program Files/NSIS"
@@ -343,14 +338,14 @@ IF( WIN32 )
     "C:/Programs/NSIS"
   )
   
-  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companion9xInstall.exe
-                     COMMAND "${NSIS_EXE}" ARGS companion9x.nsi
-                     DEPENDS ${PROJECT_NAME} ${PROJECT_BINARY_DIR}/companion9x.nsi
+  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe
+                     COMMAND "${NSIS_EXE}" ARGS companion.nsi
+                     DEPENDS ${PROJECT_NAME} ${PROJECT_BINARY_DIR}/companion.nsi
                      COMMENT "Windows NSIS Installer")
 
   ADD_CUSTOM_TARGET( installer
-    DEPENDS ${PROJECT_BINARY_DIR}/companion9xInstall.exe
-    SOURCES ${PROJECT_BINARY_DIR}/companion9x.nsi)
+    DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe
+    SOURCES ${PROJECT_BINARY_DIR}/companion.nsi)
 ENDIF( )
 
 IF( APPLE )
@@ -362,36 +357,36 @@ IF( APPLE )
   ENDIF()
   
   ADD_CUSTOM_TARGET( addframeworks ALL 
-                     COMMAND mkdir -p companion9x.app/Contents/Frameworks
-                     COMMAND mkdir -p companion9x.app/Contents/Resources
-		     COMMAND mkdir -p companion9x.app/Contents/translations                     
-		     COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion9x.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
-                     COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/lib* companion9x.app/Contents/Frameworks
-                     #COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/libcrypto.1.0.0.dylib companion9x.app/Contents/Frameworks
-                     COMMAND rsync -r --exclude=.svn  ${PROJECT_SOURCE_DIR}/../macbuild/qt_menu.nib companion9x.app/Contents/Resources/
-                     COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion9x.app/Contents/translations
-		     COMMAND ${QT_BINARY_DIR}/macdeployqt companion9x.app
+                     COMMAND mkdir -p companion.app/Contents/Frameworks
+                     COMMAND mkdir -p companion.app/Contents/Resources
+		     COMMAND mkdir -p companion.app/Contents/translations                     
+		     COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
+                     COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/lib* companion.app/Contents/Frameworks
+                     #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks
+                     COMMAND rsync -r --exclude=.svn  ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
+                     COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
+		     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
                      WORKING_DIRECTORY ${WORK_DIR}
                      DEPENDS ${PROJECT_NAME} )
 
                         
   ADD_CUSTOM_TARGET( makedmg
-                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion9x.app -dmg -no-plugins
+                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
                      WORKING_DIRECTORY ${WORK_DIR}
                      DEPENDS addframeworks )
 
 ENDIF( )
 
 ADD_CUSTOM_TARGET( stamp
-                   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion9x.stamp 
+                   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp 
                    DEPENDS ${CMAKE_BINARY_DIR}/version.h )
 
 ADD_CUSTOM_TARGET( translations
                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                   COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion9x_TS} )
+                   COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
 
-SET(CPACK_PACKAGE_NAME "COMPANION9X")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "EEPROM Editor for the openTx open source firmware")
+SET(CPACK_PACKAGE_NAME "COMPANION")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
 string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
 find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
 if(DPKG_PROGRAM)
diff --git a/companion/src/avroutputdialog.cpp b/companion/src/avroutputdialog.cpp
index a125d8e99..8680d39a7 100644
--- a/companion/src/avroutputdialog.cpp
+++ b/companion/src/avroutputdialog.cpp
@@ -58,7 +58,7 @@ avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg,
       QFile exec;
       winTitle=wTitle;
       if (!(exec.exists(prog))) {
-        QMessageBox::critical(this, "companion9x", getProgrammer() + " " + tr("executable not found"));
+        QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("executable not found"));
         closeOpt = AVR_DIALOG_FORCE_CLOSE;
         QTimer::singleShot(0, this, SLOT(forceClose()));
       } else {
@@ -315,10 +315,10 @@ void avrOutputDialog::errorWizard()
       }
     }
     if (fwexist==false) {
-      QMessageBox::warning(this, "companion9x - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease check advanced burn options to set the correct cpu type.").arg(DeviceStr));
+      QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease check advanced burn options to set the correct cpu type.").arg(DeviceStr));
     } else {
       FirmwareInfo *firmware = GetCurrentFirmware();
-      QMessageBox::warning(this, "companion9x - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->name));
+      QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->name));
     }
   }
 }
@@ -416,24 +416,24 @@ void avrOutputDialog::doFinished(int code=0)
         if (hasErrors || code) {
           if (!cmdLine.isEmpty()) {
             if (getProgrammer()!="AVRDUDE") {
-               QMessageBox::critical(this, "companion9x", getProgrammer() + " " + tr("did not finish correctly"));
+               QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly"));
             } else {
-              int res = QMessageBox::question(this, "companion9x",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No);
+              int res = QMessageBox::question(this, "Companion",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No);
               if (res != QMessageBox::No) {
                 errorWizard();
               }
             }
           } else {
-            QMessageBox::critical(this, "companion9x",  tr("Copy did not finish correctly"));
+            QMessageBox::critical(this, "Companion",  tr("Copy did not finish correctly"));
           }
             // reject();
         } else {
           if (!cmdLine.isEmpty()) {
             ui->progressBar->setValue(100);
-            QMessageBox::information(this, "companion9x", getProgrammer() + " " + tr("finished correctly"));
+            QMessageBox::information(this, "Companion", getProgrammer() + " " + tr("finished correctly"));
             accept();
           } else {
-            QMessageBox::information(this, "companion9x", tr("Copy finished correctly"));
+            QMessageBox::information(this, "Companion", tr("Copy finished correctly"));
             accept();            
           }
         }
diff --git a/companion/src/burnconfigdialog.cpp b/companion/src/burnconfigdialog.cpp
index 71887d4da..f4440b05f 100644
--- a/companion/src/burnconfigdialog.cpp
+++ b/companion/src/burnconfigdialog.cpp
@@ -325,7 +325,7 @@ void burnConfigDialog::restFuses(bool eeProtect)
 
     QMessageBox::StandardButton ret = QMessageBox::No;
 
-    ret = QMessageBox::warning(this, tr("companion9x"),
+    ret = QMessageBox::warning(this, tr("Companion"),
                                tr("<b><u>WARNING!</u></b><br>This will reset the fuses of  %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue?").arg(avrMCU),
                                QMessageBox::Yes | QMessageBox::No);
     if (ret == QMessageBox::Yes)
@@ -394,7 +394,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
     } else {
       ui->label_av3->show();
       ui->avrdude_mcu->show();
-      QMessageBox::warning(this, tr("companion9x"),
+      QMessageBox::warning(this, tr("Companion"),
         tr("<b><u>WARNING!</u></b><br>Normally CPU type is automatically selected according to the chosen firmware.<br>If you change the CPU type the resulting eeprom could be inconsistent."),
         QMessageBox::Ok);
     }
diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp
index 54b37d7a2..c601b23cf 100644
--- a/companion/src/burndialog.cpp
+++ b/companion/src/burndialog.cpp
@@ -292,7 +292,7 @@ bool burnDialog::checkeEprom(QString fileName)
     uint8_t eeprom[EESIZE_RLC_MAX];
     int eeprom_size = HexInterface(inputStream).load(eeprom, EESIZE_RLC_MAX);
     if (!eeprom_size) {
-      int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
+      int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
       if (res == QMessageBox::No) {
         return false;
       }
@@ -302,7 +302,7 @@ bool burnDialog::checkeEprom(QString fileName)
     }
     file.close();
     if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
-      int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
+      int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
       if (res == QMessageBox::No) {
         return false;
       }
@@ -325,7 +325,7 @@ bool burnDialog::checkeEprom(QString fileName)
         return false;
     }
     if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
-      int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
+      int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
       if (res == QMessageBox::No) {
         return false;
       }
diff --git a/companion/src/burndialog.ui b/companion/src/burndialog.ui
index d9c51ec35..7c739d0a1 100644
--- a/companion/src/burndialog.ui
+++ b/companion/src/burndialog.ui
@@ -273,7 +273,7 @@
         </sizepolicy>
        </property>
        <property name="toolTip">
-        <string>Allows companion9x to write to older version of the firmware</string>
+        <string>Allows Companion to write to older version of the firmware</string>
        </property>
        <property name="text">
         <string>Check Firmware compatibility</string>
diff --git a/companion/src/companion.desktop b/companion/src/companion.desktop
new file mode 100644
index 000000000..df19a4a80
--- /dev/null
+++ b/companion/src/companion.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Companion
+GenericName=Transmitter Companion App
+Comment=The Ultimate Transmitter Companion
+Icon=companion
+Exec='companion'
+Terminal=false
+StartupNotify=false
+Categories=Application
diff --git a/companion/src/companion9x.desktop b/companion/src/companion9x.desktop
deleted file mode 100644
index e50e1551a..000000000
--- a/companion/src/companion9x.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=companion9x
-GenericName=COMPANION9X
-Comment=9x EeProm Editor
-Icon=/usr/share/icons/companion9x.png
-Exec='companion9x'
-Terminal=false
-StartupNotify=false
-Categories=Application
\ No newline at end of file
diff --git a/companion/src/companion9x.png b/companion/src/companion9x.png
deleted file mode 100644
index 90a961731..000000000
Binary files a/companion/src/companion9x.png and /dev/null differ
diff --git a/companion/src/companion9x.qrc b/companion/src/companion9x.qrc
index 8a8409172..6cd5e7faa 100644
--- a/companion/src/companion9x.qrc
+++ b/companion/src/companion9x.qrc
@@ -48,7 +48,7 @@
     <file>images/screenshot.png</file>
     <file>images/splash.png</file>
     <file>images/splasht.png</file>
-    <file>images/companion9x-title.png</file>
+    <file>images/companion-title.png</file>
     <file>images/read_eeprom.png</file>
     <file>images/write_eeprom.png</file>
     <file>images/write_flash.png</file>
diff --git a/companion/src/comparedialog.cpp b/companion/src/comparedialog.cpp
index ded52c41c..48ed3f9f5 100644
--- a/companion/src/comparedialog.cpp
+++ b/companion/src/comparedialog.cpp
@@ -21,7 +21,7 @@ public:
   }
   bool general_settings;
   uint8_t models_count;
-  uint8_t models[C9XMAX_MODELS];
+  uint8_t models[C9X_MAX_MODELS];
 };
 
 compareDialog::compareDialog(QWidget *parent, GeneralSettings *gg) :
@@ -342,7 +342,7 @@ void compareDialog::printPhases()
     gvars=1;
   }
   if (gvars==1) {
-    gvarnum=GetEepromInterface()->getCapability(GvarsNum);
+    gvarnum=GetEepromInterface()->getCapability(Gvars);
   }
   if ((gvars==1 && GetEepromInterface()->getCapability(GvarsFlightPhases)) || GetEepromInterface()->getCapability(RotaryEncoders)) {
     str.append("<br><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">");
@@ -564,7 +564,7 @@ void compareDialog::printGvars()
   int gvarnum=0;
   if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetEepromInterface()->getCapability(HasVariants) && GetEepromInterface()->getCapability(Gvars))) {
     gvars=1;
-    gvarnum=GetEepromInterface()->getCapability(GvarsNum);
+    gvarnum=GetEepromInterface()->getCapability(Gvars);
   }
 
   if (!GetEepromInterface()->getCapability(GvarsFlightPhases) && (gvars==1 && GetEepromInterface()->getCapability(Gvars))) {
@@ -649,7 +649,8 @@ void compareDialog::printExpos()
           };
 
           str += tr("Weight") + QString("%1").arg(getGVarString(ed->weight)).rightJustified(6, ' ');
-          str += " " + tr("Expo") + QString("%1").arg(getGVarString(ed->expo)).rightJustified(7, ' ');
+          str += ed->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
+
           if (GetEepromInterface()->getCapability(FlightPhases)) {
             if(ed->phases) {
               if (ed->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
@@ -681,16 +682,14 @@ void compareDialog::printExpos()
                   mask <<=1;
                 }
                 str += QString(")");
-              } else {
+              }
+              else {
                 str += tr("DISABLED")+QString(" !!!");
               }
             }
           } 
           if (ed->swtch.type)
             str += " " + tr("Switch") + QString("(%1)").arg(ed->swtch.toString());
-          if (ed->curveMode)
-            if (ed->curveParam) 
-                str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(ed->curveParam).replace("<", "&lt;").replace(">", "&gt;"));
           str += "</font></td></tr>";
         }
       }
@@ -728,7 +727,8 @@ void compareDialog::printExpos()
           }
 
           str += tr("Weight") + QString("%1").arg(getGVarString(ed->weight)).rightJustified(6, ' ');
-          str += " " + tr("Expo") + QString("%1").arg(getGVarString(ed->expo)).rightJustified(7, ' ');
+          str += ed->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
+
           if (GetEepromInterface()->getCapability(FlightPhases)) {
             if(ed->phases) {
               if (ed->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
@@ -767,9 +767,7 @@ void compareDialog::printExpos()
           } 
           if (ed->swtch.type)
             str += " " + tr("Switch") + QString("(%1)").arg(ed->swtch.toString());
-          if (ed->curveMode)
-            if (ed->curveParam) 
-                str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(ed->curveParam).replace("<", "&lt;").replace(">", "&gt;"));
+
           str += "</font></td></tr>";
         }
       }
@@ -824,13 +822,8 @@ void compareDialog::printMixers()
           str += md->srcRaw.toString();
           if (md->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
           if (md->carryTrim) str += " " + tr("noTrim");
-          if(GetEepromInterface()->getCapability(MixFmTrim) && md->enableFmTrim==1){ 
-                  if (md->sOffset)  str += " "+ tr("FMTrim") + QString(" (%1%)").arg(md->sOffset);
-          } else {
-                  if (md->sOffset)  str += " "+ tr("Offset") + QString(" (%1%)").arg(getGVarString(md->sOffset));           
-          }
-          if (md->differential)  str += " "+ tr("Diff") + QString(" (%1%)").arg(getGVarString(md->differential));
-          if (md->curve) str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(md->curve).replace("<", "&lt;").replace(">", "&gt;"));
+          if (md->sOffset)  str += " "+ tr("Offset") + QString(" (%1%)").arg(getGVarString(md->sOffset));
+          str += md->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
           if (md->delayDown || md->delayUp) str += tr(" Delay(u%1:d%2)").arg(md->delayUp/scale).arg(md->delayDown/scale);
           if (md->speedDown || md->speedUp) str += tr(" Slow(u%1:d%2)").arg(md->speedUp/scale).arg(md->speedDown/scale);
           if (md->mixWarn)  str += " "+tr("Warn")+QString("(%1)").arg(md->mixWarn);
@@ -907,13 +900,9 @@ void compareDialog::printMixers()
           str += md->srcRaw.toString();
           if (md->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
           if (md->carryTrim) str += " " + tr("noTrim");
-          if(GetEepromInterface()->getCapability(MixFmTrim) && md->enableFmTrim==1){ 
-                  if (md->sOffset)  str += " "+ tr("FMTrim") + QString(" (%1%)").arg(getGVarString(md->sOffset));
-          } else {
-                  if (md->sOffset)  str += " "+ tr("Offset") + QString(" (%1%)").arg(getGVarString(md->sOffset));
-          }
-          if (md->differential)  str += " "+ tr("Diff") + QString(" (%1%)").arg(getGVarString(md->differential));
-          if (md->curve) str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(md->curve).replace("<", "&lt;").replace(">", "&gt;"));
+          if (md->sOffset)  str += " "+ tr("Offset") + QString(" (%1%)").arg(getGVarString(md->sOffset));
+          // TODO if (md->differential)  str += " "+ tr("Diff") + QString(" (%1%)").arg(getGVarString(md->differential));
+          // TODO if (md->curve) str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(md->curve).replace("<", "&lt;").replace(">", "&gt;"));
           if (md->delayDown || md->delayUp) str += tr(" Delay(u%1:d%2)").arg(md->delayUp/scale).arg(md->delayDown/scale);
           if (md->speedDown || md->speedUp) str += tr(" Slow(u%1:d%2)").arg(md->speedUp/scale).arg(md->speedDown/scale);
           if (md->mixWarn)  str += " "+tr("Warn")+QString("(%1)").arg(md->mixWarn);
diff --git a/companion/src/contributorsdialog.cpp b/companion/src/contributorsdialog.cpp
index d60a682db..02eb30041 100644
--- a/companion/src/contributorsdialog.cpp
+++ b/companion/src/contributorsdialog.cpp
@@ -26,7 +26,8 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
             ui->textBrowser->insertPlainText(file2.readAll());
         }
         ui->textBrowser->insertPlainText("\n\n\n");
-        ui->textBrowser->insertPlainText(tr("Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) \nof course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which\ncompanion9x was forked out."));
+        ui->textBrowser->insertPlainText(tr(
+"Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) \nof course. Also to Erez Raviv (er9x) and the fantastic eePe program \nwhich was the staring point for OpenTX Companion."));
         ui->textBrowser->insertPlainText("\n\n");
         ui->textBrowser->insertPlainText(tr("Thank you all !!!"));
         ui->textBrowser->setReadOnly(true);
@@ -42,7 +43,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
         }
         ui->textBrowser->setReadOnly(true);
         ui->textBrowser->verticalScrollBar()->setValue(0);
-        this->setWindowTitle(tr("Companion9x Release Notes"));
+        this->setWindowTitle(tr("Companion Release Notes"));
         }
         break;
       case 2:{
diff --git a/companion/src/downloaddialog.cpp b/companion/src/downloaddialog.cpp
index 83da451bd..bfd425619 100644
--- a/companion/src/downloaddialog.cpp
+++ b/companion/src/downloaddialog.cpp
@@ -21,7 +21,7 @@ downloadDialog::downloadDialog(QWidget *parent, QString src, QString tgt) :
 
     file = new QFile(tgt);
     if (!file->open(QIODevice::WriteOnly)) {
-        QMessageBox::critical(this, "companion9x",
+        QMessageBox::critical(this, "Companion",
                               tr("Unable to save the file %1: %2.")
                               .arg(tgt).arg(file->errorString()));
         QTimer::singleShot(0, this, SLOT(fileError()));
@@ -51,7 +51,7 @@ void downloadDialog::httpFinished()
     if (reply->error())
     {
         file->remove();
-        QMessageBox::information(this, tr("companion9x"),
+        QMessageBox::information(this, tr("Companion"),
                                  tr("Download failed: %1.")
                                  .arg(reply->errorString()));
         ok = false;
diff --git a/companion/src/eepromimportexport.h b/companion/src/eepromimportexport.h
index 370287851..ed5ab9ff5 100644
--- a/companion/src/eepromimportexport.h
+++ b/companion/src/eepromimportexport.h
@@ -74,7 +74,10 @@ class DataField {
       QByteArray bytes = bitsToBytes(bits);
       int result = (offset+bits.count()) % 8;
       for (int i=0; i<level; i++) printf("  ");
-      printf("%s ", getName());
+      if (bits.count() % 8 == 0)
+        printf("%s (%dbytes) ", getName(), bytes.count());
+      else
+        printf("%s (%dbits) ", getName(), bits.count());
       for (int i=0; i<bytes.count(); i++) {
         unsigned char c = bytes[i];
         if ((i==0 && offset) || (i==bytes.count()-1 && result!=0))
@@ -422,7 +425,7 @@ class StructField: public DataField {
     virtual int Dump(int level=0, int offset=0)
     {
       for (int i=0; i<level; i++) printf("  ");
-      printf("%s\n", getName());
+      printf("%s (%d bytes)\n", getName(), size()/8);
       foreach(DataField *field, fields) {
         offset = field->Dump(level+1, offset);
       }
@@ -547,6 +550,7 @@ class ConversionField: public TransformedField {
       _field(0),
       table(table),
       shift(0),
+      scale(1),
       min(INT_MIN),
       max(INT_MAX),
       exportFunc(NULL),
@@ -562,6 +566,7 @@ class ConversionField: public TransformedField {
       _field(0),
       table(table),
       shift(0),
+      scale(0),
       min(INT_MIN),
       max(INT_MAX),
       exportFunc(NULL),
@@ -577,6 +582,7 @@ class ConversionField: public TransformedField {
       _field(0),
       table(NULL),
       shift(0),
+      scale(0),
       min(INT_MIN),
       max(INT_MAX),
       exportFunc(exportFunc),
@@ -585,13 +591,14 @@ class ConversionField: public TransformedField {
     {
     }
 
-    ConversionField(int & field, int shift, int min=INT_MIN, int max=INT_MAX, const char *name = "Signed shifted"):
+    ConversionField(int & field, int shift, int scale=0, int min=INT_MIN, int max=INT_MAX, const char *name = "Signed shifted"):
       TransformedField(internalField),
       internalField(_field, name),
       field(field),
       _field(0),
       table(NULL),
       shift(shift),
+      scale(scale),
       min(min),
       max(max),
       exportFunc(NULL),
@@ -600,13 +607,14 @@ class ConversionField: public TransformedField {
     {
     }
 
-    ConversionField(unsigned int & field, int shift):
+    ConversionField(unsigned int & field, int shift, int scale=0):
       TransformedField(internalField),
       internalField((unsigned int &)_field),
       field((int &)field),
       _field(0),
       table(NULL),
       shift(shift),
+      scale(scale),
       min(INT_MIN),
       max(INT_MAX),
       exportFunc(NULL),
@@ -617,19 +625,25 @@ class ConversionField: public TransformedField {
 
     virtual void beforeExport()
     {
+      int val = field;
+
+      if (scale) {
+        val /= scale;
+      }
+
       if (table) {
-        if (table->exportValue(field, _field))
+        if (table->exportValue(val, _field))
           return;
         if (!error.isEmpty())
           EEPROMWarnings += error + "\n";
       }
       else if (shift) {
-        if (field < min) _field = min + shift;
-        else if (field > max) _field = max + shift;
-        else _field = field + shift;
+        if (val < min) _field = min + shift;
+        else if (val > max) _field = max + shift;
+        else _field = val + shift;
       }
       else {
-        _field = exportFunc(field);
+        _field = exportFunc(val);
       }
     }
 
@@ -645,6 +659,10 @@ class ConversionField: public TransformedField {
       else {
         field = importFunc(_field);
       }
+
+      if (scale) {
+        field *= scale;
+      }
     }
 
   protected:
@@ -653,6 +671,7 @@ class ConversionField: public TransformedField {
     int _field;
     ConversionTable * table;
     int shift;
+    int scale;
     int min;
     int max;
     int (*exportFunc)(int);
diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 497149ca2..998e8d9bf 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -4,12 +4,16 @@
 #include "firmwares/er9x/er9xinterface.h"
 #include "firmwares/th9x/th9xinterface.h"
 #include "firmwares/gruvin9x/gruvin9xinterface.h"
-#include "firmwares/opentx/open9xinterface.h"
+#include "firmwares/opentx/opentxinterface.h"
 #include "firmwares/ersky9x/ersky9xinterface.h"
 #include "qsettings.h"
+#include "helpers.h"
 
 QString EEPROMWarnings;
 
+const char * switches9X[] = { "3POS", "THR", "RUD", "ELE", "AIL", "GEA", "TRN" };
+const char * switchesX9D[] = { "SA", "SB", "SC", "SD", "SE", "SF", "SG", "SH" };
+
 void setEEPROMString(char *dst, const char *src, int size)
 {
   memcpy(dst, src, size);
@@ -244,27 +248,28 @@ double RawSource::getStep(const ModelData & Model)
   }
 }
 
+QString AnalogString(int index)
+{
+  static const QString sticks[]  = { QObject::tr("Rud"), QObject::tr("Ele"), QObject::tr("Thr"), QObject::tr("Ail") };
+  static const QString pots9X[]  = { QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3") };
+  static const QString potsX9D[] = { QObject::tr("S1"), QObject::tr("S2"), QObject::tr("LS"), QObject::tr("RS") };
+
+  if (index < 4)
+    return CHECK_IN_ARRAY(sticks, index);
+  else
+    return (IS_TARANIS(GetEepromInterface()->getBoard()) ? CHECK_IN_ARRAY(potsX9D, index-4) : CHECK_IN_ARRAY(pots9X, index-4));
+}
+
+QString RotaryEncoderString(int index)
+{
+  static const QString rotary[]  = { QObject::tr("REa"), QObject::tr("REb") };
+  return CHECK_IN_ARRAY(rotary, index);
+}
+
 QString RawSource::toString()
 {
-  static const QString sticks[]      = { QObject::tr("Rud"), QObject::tr("Ele"), QObject::tr("Thr"), QObject::tr("Ail") };
-
   static const QString trims[]       = { QObject::tr("TrmR"), QObject::tr("TrmE"), QObject::tr("TrmT"), QObject::tr("TrmA")};
 
-  static const QString pots9X[]      = { QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3") };
-
-  static const QString potsX9D[]     = { QObject::tr("S1"), QObject::tr("S2"), QObject::tr("LS"), QObject::tr("RS") };
-
-  static const QString rotary[]      = { QObject::tr("REa"), QObject::tr("REb") };
-
-  static const QString switches9X[]  = { QObject::tr("3POS"),
-                            QObject::tr("THR"), QObject::tr("RUD"), QObject::tr("ELE"),
-                            QObject::tr("AIL"), QObject::tr("GEA"), QObject::tr("TRN"),
-                          };
-
-  static const QString switchesX9D[] = { QObject::tr("SA"), QObject::tr("SB"), QObject::tr("SC"), QObject::tr("SD"),
-                            QObject::tr("SE"), QObject::tr("SF"), QObject::tr("SG"), QObject::tr("SH"),
-                          };
-
   static const QString telemetry[]   = { QObject::tr("Batt"), QObject::tr("Timer1"), QObject::tr("Timer2"),
                             (IS_TARANIS(GetEepromInterface()->getBoard()) ? QObject::tr("SWR") :  QObject::tr("Tx")), (IS_TARANIS(GetEepromInterface()->getBoard()) ? QObject::tr("RSSI") :  QObject::tr("Rx")), QObject::tr("A1"), QObject::tr("A2"), QObject::tr("Alt"), QObject::tr("Rpm"), QObject::tr("Fuel"), QObject::tr("T1"),
                             QObject::tr("T2"), QObject::tr("Speed"), QObject::tr("Dist"), QObject::tr("GPS Alt"), QObject::tr("Cell"), QObject::tr("Cels"), QObject::tr("Vfas"), QObject::tr("Curr"),
@@ -284,14 +289,11 @@ QString RawSource::toString()
   }
   switch(type) {
     case SOURCE_TYPE_STICK:
-      if (index < 4)
-        return CHECK_IN_ARRAY(sticks, index);
-      else
-        return (IS_TARANIS(GetEepromInterface()->getBoard()) ? CHECK_IN_ARRAY(potsX9D, index-4) : CHECK_IN_ARRAY(pots9X, index-4));
+      return AnalogString(index);
     case SOURCE_TYPE_TRIM:
       return CHECK_IN_ARRAY(trims, index);
     case SOURCE_TYPE_ROTARY_ENCODER:
-      return CHECK_IN_ARRAY(rotary, index);
+      return RotaryEncoderString(index);
     case SOURCE_TYPE_MAX:
       return QObject::tr("MAX");
     case SOURCE_TYPE_SWITCH:
@@ -407,6 +409,25 @@ QString RawSwitch::toString()
   return QObject::tr("----");
 }
 
+QString CurveReference::toString()
+{
+  if (value == 0) {
+    return "----";
+  }
+  else {
+    switch(type) {
+      case CURVE_REF_DIFF:
+        return QObject::tr("Diff(%1)").arg(getGVarString(value));
+      case CURVE_REF_EXPO:
+        return QObject::tr("Expo(%1)").arg(getGVarString(value));
+      case CURVE_REF_FUNC:
+        return QObject::tr("Function(%1)").arg(QString("x>0" "x<0" "|x|" "f>0" "f<0" "|f|").mid(3*(value-1), 3));
+      default:
+        return QString(value > 0 ? QObject::tr("Curve(%1)") : QObject::tr("!Curve(%1)")).arg(abs(value));
+    }
+  }
+}
+
 GeneralSettings::GeneralSettings()
 {
   memset(this, 0, sizeof(GeneralSettings));
@@ -534,6 +555,18 @@ ModelData::ModelData()
   clear();
 }
 
+void ModelData::clearInputs()
+{
+  for (int i=0; i<C9X_MAX_EXPOS; i++)
+    expoData[i].clear();
+}
+
+void ModelData::clearMixes()
+{
+  for (int i=0; i<C9X_MAX_MIXERS; i++)
+    mixData[i].clear();
+}
+
 void ModelData::clear()
 {
   memset(this, 0, sizeof(ModelData));
@@ -553,10 +586,8 @@ void ModelData::clear()
   }
   for (int i=0; i<C9X_MAX_PHASES; i++)
     phaseData[i].clear();
-  for (int i=0; i<C9X_MAX_EXPOS; i++)
-    expoData[i].clear();
-  for (int i=0; i<C9X_MAX_MIXERS; i++)
-    mixData[i].clear();
+  clearInputs();
+  clearMixes();
   for(int i=0; i<4; i++){
     mixData[i].destCh = i+1;
     mixData[i].srcRaw = RawSource(SOURCE_TYPE_STICK, i);
@@ -568,12 +599,8 @@ void ModelData::clear()
     expoData[i].clear();
   for (int i=0; i<C9X_NUM_CSW; i++)
     customSw[i].clear();
-  bool custom = GetEepromInterface()->getCapability(CustomCurves);
   for (int i=0; i<C9X_MAX_CURVES; i++) {
-    if (!custom && i>=8)
-      curves[i].clear(9);
-    else
-      curves[i].clear(5);
+    curves[i].clear(5);
   }
 
   swashRingData.clear();
@@ -617,13 +644,13 @@ ModelData ModelData::removeGlobalVars()
 
   for (int i=0; i<C9X_MAX_MIXERS; i++) {
     removeGlobalVar(mixData[i].weight);
-    removeGlobalVar(mixData[i].differential);
+    removeGlobalVar(mixData[i].curve.value);
     removeGlobalVar(mixData[i].sOffset);
   }
 
   for (int i=0; i<C9X_MAX_EXPOS; i++) {
     removeGlobalVar(expoData[i].weight);
-    removeGlobalVar(expoData[i].expo);
+    removeGlobalVar(expoData[i].curve.value);
   }
 
   return result;
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 4f91a8719..02cc9650d 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -44,14 +44,17 @@ template<class t> t LIMIT(t mi, t x, t ma) { return std::min(std::max(mi, x), ma
 enum BoardEnum {
   BOARD_STOCK,
   BOARD_M128,
+  BOARD_MEGA2560,
   BOARD_GRUVIN9X,
   BOARD_SKY9X,
   BOARD_TARANIS,
   BOARD_TARANIS_REV4a
 };
+
 #define IS_STOCK(board)       (board==BOARD_STOCK || board==BOARD_M128)
-#define IS_ARM(board)       (board==BOARD_SKY9X || board==BOARD_TARANIS  || board==BOARD_TARANIS_REV4a)
-#define IS_TARANIS(board)       (board==BOARD_TARANIS  || board==BOARD_TARANIS_REV4a)
+#define IS_2560(board)        (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560)
+#define IS_ARM(board)         (board==BOARD_SKY9X || board==BOARD_TARANIS  || board==BOARD_TARANIS_REV4a)
+#define IS_TARANIS(board)     (board==BOARD_TARANIS  || board==BOARD_TARANIS_REV4a)
 
 const uint8_t modn12x3[4][4]= {
   {1, 2, 3, 4},
@@ -59,13 +62,14 @@ const uint8_t modn12x3[4][4]= {
   {4, 2, 3, 1},
   {4, 3, 2, 1} };
 
-#define C9XMAX_MODELS             60
+#define C9X_MAX_MODELS            60
 #define C9X_MAX_PHASES            9
 #define C9X_MAX_MIXERS            64
-#define C9X_MAX_EXPOS             32
-#define C9X_MAX_CURVES            16
-#define MAX_POINTS                17
-#define C9X_MAX_GVARS                 9
+#define C9X_MAX_EXPOS             64
+#define C9X_MAX_CURVES            32
+#define C9X_MAX_POINTS            17
+#define C9X_MAX_GVARS             9
+#define C9X_MAX_ENCODERS          2
 #define NUM_SAFETY_CHNOUT         16
 #define C9X_NUM_CHNOUT            32 // number of real output channels
 #define C9X_NUM_CSW               32 // number of custom switches
@@ -107,6 +111,18 @@ const uint8_t chout_ar[] = { //First number is 0..23 -> template setup,  Second
 3,1,2,4 , 3,1,4,2 , 3,2,1,4 , 3,2,4,1 , 3,4,1,2 , 3,4,2,1,
 4,1,2,3 , 4,1,3,2 , 4,2,1,3 , 4,2,3,1 , 4,3,1,2 , 4,3,2,1    }; // TODO delete it?
 
+// Beep center bits
+#define BC_BIT_RUD (0x01)
+#define BC_BIT_ELE (0x02)
+#define BC_BIT_THR (0x04)
+#define BC_BIT_AIL (0x08)
+#define BC_BIT_P1  (0x10)
+#define BC_BIT_P2  (0x20)
+#define BC_BIT_P3  (0x40)
+#define BC_BIT_P4  (0x80)
+#define BC_BIT_REA (0x80)
+#define BC_BIT_REB (0x100)
+
 // TODO remove this enum!
 enum EnumKeys {
   KEY_MENU,
@@ -185,10 +201,13 @@ enum HeliSwashTypes {
 #define NUM_CAL_PPM         4
 #define NUM_PPM             8
 #define NUM_CYC             3
-#define C9X_NUM_SWITCHES          10
-#define C9X_NUM_KEYS          6
+#define C9X_NUM_SWITCHES    10
+#define C9X_NUM_KEYS        6
 #define C9X_MAX_TIMERS      2
 
+extern const char * switches9X[];
+extern const char * switchesX9D[];
+
 enum TelemetrySource {
   TELEMETRY_SOURCE_TX_BATT,
   TELEMETRY_SOURCE_TIMER1,
@@ -241,6 +260,8 @@ enum TelemetrySource {
 
 enum RawSourceType {
   SOURCE_TYPE_NONE,
+  SOURCE_TYPE_VIRTUAL_INPUT,
+  SOURCE_TYPE_LUA_INPUT,
   SOURCE_TYPE_STICK, // and POTS
   SOURCE_TYPE_ROTARY_ENCODER,
   SOURCE_TYPE_TRIM,
@@ -254,8 +275,12 @@ enum RawSourceType {
   SOURCE_TYPE_TELEMETRY,
   MAX_SOURCE_TYPE
 };
+
 class ModelData;
 
+QString AnalogString(int index);
+QString RotaryEncoderString(int index);
+
 class RawSource {
   public:
     RawSource():
@@ -404,7 +429,6 @@ class GeneralSettings {
     int    timezone;
     bool      optrexDisplay;
     unsigned int    inactivityTimer;
-    bool      throttleReversed;
     bool      minuteBeep;
     bool      preBeep;
     bool      flashBeep;
@@ -451,17 +475,44 @@ class GeneralSettings {
     unsigned int switchUnlockStates;
 };
 
+class CurveReference {
+  public:
+    enum CurveRefType {
+      CURVE_REF_DIFF,
+      CURVE_REF_EXPO,
+      CURVE_REF_FUNC,
+      CURVE_REF_CUSTOM
+    };
+
+    CurveReference() { clear(); }
+
+    CurveReference(CurveRefType type, int value):
+      type(type),
+      value(value)
+    {
+    }
+
+    void clear() { memset(this, 0, sizeof(CurveReference)); }
+
+    CurveRefType type;
+    int value;
+
+    QString toString();
+};
+
 class ExpoData {
   public:
     ExpoData() { clear(); }
+    RawSource srcRaw;
+    unsigned int scale;
     unsigned int mode;         // 0=end, 1=pos, 2=neg, 3=both
     unsigned int chn;
     RawSwitch swtch;
     unsigned int phases;        // -5=!FP4, 0=normal, 5=FP4
     int  weight;
-    int  expo;
-    unsigned int curveMode;
-    int  curveParam;
+    int offset;
+    CurveReference curve;
+    int carryTrim;
     char name[10+1];
     void clear() { memset(this, 0, sizeof(ExpoData)); }
 };
@@ -474,11 +525,19 @@ class CurvePoint {
 
 class CurveData {
   public:
+    enum CurveType {
+      CURVE_TYPE_STANDARD,
+      CURVE_TYPE_CUSTOM,
+      CURVE_TYPE_LAST = CURVE_TYPE_CUSTOM
+    };
+
     CurveData() { clear(5); }
-    bool custom;         // 0=end, 1=pos, 2=neg, 3=both
-    uint8_t count;
-    CurvePoint points[MAX_POINTS];
-    char  name[6+1];
+
+    CurveType type;
+    bool smooth;
+    int  count;
+    CurvePoint points[C9X_MAX_POINTS];
+    char name[6+1];
     void clear(int count) { memset(this, 0, sizeof(CurveData)); this->count = count; }
 };
 
@@ -492,6 +551,7 @@ class LimitData {
     int   ppmCenter;
     bool  symetrical;
     char  name[6+1];
+    CurveReference curve;
     void clear() { memset(this, 0, sizeof(LimitData)); min = -100; max = +100; }
 };
 
@@ -501,7 +561,6 @@ enum MltpxValue {
   MLTPX_REP=2
 };
 
-
 class MixData {
   public:
     MixData() { clear(); }
@@ -509,9 +568,8 @@ class MixData {
     RawSource srcRaw;
     unsigned int srcVariant;
     int     weight;
-    int     differential;
     RawSwitch swtch;
-    int     curve;             //0=symmetrisch
+    CurveReference     curve;             //0=symmetrisch
     unsigned int delayUp;
     unsigned int delayDown;
     unsigned int speedUp;           // Servogeschwindigkeit aus Tabelle (10ms Cycle)
@@ -520,9 +578,7 @@ class MixData {
     bool noExpo;
     MltpxValue mltpx;          // multiplex method 0=+ 1=* 2=replace
     unsigned int mixWarn;           // mixer warning
-    unsigned int enableFmTrim;
     unsigned int phases;             // -5=!FP4, 0=normal, 5=FP4
-    unsigned int lateOffset;
     int    sOffset;
     char   name[10+1];
 
@@ -572,10 +628,7 @@ enum AssignFunc {
   FuncBackgroundMusic,
   FuncBackgroundMusicPause,
   FuncAdjustGV1,
-  FuncAdjustGV2,
-  FuncAdjustGV3,
-  FuncAdjustGV4,
-  FuncAdjustGV5,
+  FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1,
   FuncCount
 };
 
@@ -602,7 +655,7 @@ class PhaseData {
     unsigned int fadeIn;
     unsigned int fadeOut;
     int rotaryEncoders[2];
-    int gvars[5];
+    int gvars[C9X_MAX_GVARS];
     void clear() { memset(this, 0, sizeof(PhaseData)); for (int i=0; i<NUM_STICKS; i++) trimRef[i] = -1; }
 };
 
@@ -805,7 +858,9 @@ class ModelData {
     int8_t   t2throttle;  // Start timer2 using throttle
     unsigned int   modelId;
     unsigned int switchWarningStates;
+    // TODO structure
     char     gvars_names[C9X_MAX_GVARS][6+1];
+    bool     gvars_popups[C9X_MAX_GVARS];
     uint8_t  gvsource[5];
     uint8_t  bt_telemetry;
     uint8_t  numVoice;
@@ -828,6 +883,9 @@ class ModelData {
 
     ModelData removeGlobalVars();
 
+    void clearMixes();
+    void clearInputs();
+
   protected:
     void removeGlobalVar(int & var);
 };
@@ -835,19 +893,19 @@ class ModelData {
 class RadioData {
   public:   
     GeneralSettings generalSettings;
-    ModelData models[C9XMAX_MODELS];    
+    ModelData models[C9X_MAX_MODELS];    
 };
 
+// TODO rename FlightPhase to FlightMode
 enum Capability {
  OwnerName,
  FlightPhases,
- FlightPhasesAreNamed,
+ FlightModesName,
  FlightPhasesHaveFades,
  SimulatorType,
  Mixes,
  MixesWithoutExpo,
  Timers,
- TimerTriggerB,
  TimeDivisions,
  minuteBeep,
  countdownBeep,
@@ -857,7 +915,6 @@ enum Capability {
  ModelVoice,
  MultiLangVoice,
  ModelImage,
- InstantTrimSW,
  Pots,
  Switches,
  SwitchesPositions,
@@ -867,20 +924,12 @@ enum Capability {
  CustomSwitchesExt,
  RotaryEncoders,
  Outputs,
+ ChannelsName,
  ExtraChannels,
  ExtraInputs,
  ExtraTrims,
  ExtendedTrims,
- HasNegCurves,
  HasInputFilter,
- HasExpoCurves,
- ExpoIsCurve,
- ExpoCurve5,
- ExpoCurve9,
- CustomCurves,
- NumCurves3,
- NumCurves5,
- NumCurves9,
  NumCurves,
  NumCurvePoints,
  OffsetWeight,
@@ -900,7 +949,6 @@ enum Capability {
  TrainerSwitch,
  ModelTrainerEnable,
  Timer2ThrTrig,
- HasTTrace,
  HasExpoNames,
  HasMixerNames,
  HasChNames,
@@ -910,14 +958,10 @@ enum Capability {
  HasPPMStart,
  HasGeneralUnits,
  HasFAIMode,
- NoTimerDirs,
- NoThrExpo,
  OptrexDisplay,
  PPMExtCtrl,
  PPMFrameLength,
- MixFmTrim,
  gsSwitchMask,
- pmSwitchMask,
  BLonStickMove,
  DSM2Indexes,
  Telemetry,
@@ -930,9 +974,7 @@ enum Capability {
  GvarsFlightPhases,
  GvarsHaveSources,
  GvarsAsSources,
- GvarsAsWeight,
- GvarsNum,
- GvarsOfsNum,
+ GvarsName,
  NoTelemetryProtocol,
  TelemetryCSFields,
  TelemetryColsCSFields,
@@ -949,11 +991,9 @@ enum Capability {
  HasPPMSim,
  HasCrossTrims,
  HasStickScroll,
- HasFixOffset,
  HasSoundMixer,
  NumModules,
  FSSwitch,
- DiffMixers,
  PPMCenter,
  SYMLimits,
  HasCurrentCalibration,
@@ -961,8 +1001,6 @@ enum Capability {
  HasBrightness,
  HasContrast,
  PerModelTimers,
- PerModelThrottleWarning,
- PerModelThrottleInvert,
  SlowScale,
  SlowRange,
  PermTimers,
@@ -970,6 +1008,11 @@ enum Capability {
  CSFunc,
  LCDWidth,
  GetThrSwitch,
+ VirtualInputs,
+ LuaInputs,
+ LimitsPer1000,
+ EnhancedCurves,
+ TelemetryInternalAlarms
 };
 
 enum UseContext {
diff --git a/companion/src/expodialog.cpp b/companion/src/expodialog.cpp
deleted file mode 100644
index 9382766b0..000000000
--- a/companion/src/expodialog.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-#include "expodialog.h"
-#include "ui_expodialog.h"
-#include "eeprominterface.h"
-#include "helpers.h"
-
-ExpoDialog::ExpoDialog(QWidget *parent, ExpoData *expoData, int stickMode) :
-    QDialog(parent),
-    ui(new Ui::ExpoDialog),
-    ed(expoData)
-{
-    ui->setupUi(this);
-    QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
-    QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
-
-    setWindowTitle(tr("DEST -> %1").arg(getStickStr(ed->chn)));
-    QRegExp rx(CHAR_FOR_NAMES_REGEX);
-    
-    if (GetEepromInterface()->getCapability(GvarsAsWeight)) {
-      int gvars=0;
-      if (GetEepromInterface()->getCapability(HasVariants)) {
-        if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
-          gvars=1;
-        }
-      } else {
-        gvars=1;
-      }
-      if (gvars==0) {
-        ui->expoGV->setDisabled(true);
-        ui->weightGV->setDisabled(true);
-        ui->expoCurveGV->setDisabled(true);
-        if (ed->expo>100) {
-          ed->expo=0;
-        }
-        if (ed->weight>100 || ed->weight<-100) {
-          ed->weight=100;
-        }
-        if (ed->curveParam>100 || ed->curveParam<-100) {
-          ed->curveParam=0;
-        }
-      }
-      populateGVCB(ui->expoCB,ed->expo);
-      populateGVCB(ui->weightCB,ed->weight);
-      populateGVCB(ui->expoCurveCB,ed->curveParam);
-
-      ui->weightSB->setMinimum(0);
-      ui->weightSB->setMaximum(100);
-      if (ed->weight>100 || ed->weight<0) {
-        ui->weightGV->setChecked(true);
-        ui->weightSB->hide();
-        ui->weightCB->show();
-      } else {
-        ui->weightGV->setChecked(false);
-        ui->weightSB->setValue(ed->weight);
-        ui->weightSB->show();
-        ui->weightCB->hide();
-      }
-
-      ui->expoSB->setMinimum(-100);
-      ui->expoSB->setMaximum(100);
-      if (ed->expo>100 || ed->expo<-100) {
-        ui->expoGV->setChecked(true);
-        ui->expoSB->hide();
-        ui->expoCB->show();
-      } else {
-        ui->expoGV->setChecked(false);
-        ui->expoSB->setValue(ed->expo);
-        ui->expoSB->show();
-        ui->expoCB->hide();
-      }
-
-      ui->expoCurveSB->setMinimum(-100);
-      ui->expoCurveSB->setMaximum(100);
-      if (ed->curveParam>100 || ed->curveParam<-100) {
-        ui->expoCurveGV->setChecked(true);
-        ui->expoCurveSB->hide();
-        ui->expoCurveCB->show();
-      } else {
-        ui->expoCurveGV->setChecked(false);
-        ui->expoCurveSB->setValue(ed->curveParam);
-        ui->expoCurveSB->show();
-        ui->expoCurveCB->hide();
-      }
-    } else {
-      ui->expoGV->hide();
-      ui->weightGV->hide();
-      ui->expoCurveGV->hide();
-      ui->expoSB->setMinimum(-100);
-      ui->expoSB->setMaximum(100);
-      ui->expoSB->setValue(ed->expo);
-      ui->expoCurveSB->setMinimum(-100);
-      ui->expoCurveSB->setMaximum(100);
-      ui->expoCurveSB->setValue(ed->curveParam);
-      ui->weightSB->setMinimum(0);
-      ui->weightSB->setMaximum(100);
-      ui->weightSB->setValue(ed->weight);
-    }
-    populateSwitchCB(ui->switchesCB,ed->swtch);
-    if (ed->curveMode==0) {
-      populateExpoCurvesCB(ui->curvesCB,0); // TODO capacity for er9x
-    } else {
-      populateExpoCurvesCB(ui->curvesCB,ed->curveParam); // TODO capacity for er9x
-    }
-    ui->modeCB->setCurrentIndex(ed->mode-1);
-    if (!GetEepromInterface()->getCapability(HasExpoCurves)) {
-      ui->label_curves->hide();
-      ui->curvesCB->hide();
-      ed->curveMode=1;
-    }
-    if (!GetEepromInterface()->getCapability(ExpoIsCurve)) {
-      ui->expoCurveCB->hide();
-      ui->expoCurveSB->hide();
-      ui->expoCurveGV->hide();
-      ui->label_curves->setText(tr("Curve"));
-    } else {
-      ui->label_expo->hide();
-      ui->expoCB->hide();
-      ui->expoGV->hide();
-      ui->expoSB->hide();
-    }
-    if (!GetEepromInterface()->getCapability(FlightPhases)) {
-      ui->label_phases->hide();
-      for (int i=0; i<9; i++) {
-        lb_fp[i]->hide();
-        cb_fp[i]->hide();
-      }
-    } else {
-      int mask=1;
-      for (int i=0; i<9 ; i++) {
-        if ((ed->phases & mask)==0) {
-          cb_fp[i]->setChecked(true);
-        }
-        mask <<= 1;
-      }
-      for (int i=GetEepromInterface()->getCapability(FlightPhases); i<9;i++) {
-        lb_fp[i]->hide();
-        cb_fp[i]->hide();
-      }      
-    }
-    int expolength=GetEepromInterface()->getCapability(HasExpoNames);
-    if (!expolength) {
-      ui->label_name->hide();
-      ui->expoName->hide();
-    } else {
-      ui->expoName->setMaxLength(expolength);
-    }
-    ui->expoName->setValidator(new QRegExpValidator(rx, this));
-    ui->expoName->setText(ed->name);
-    valuesChanged();
-    connect(ui->expoName,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
-    connect(ui->expoCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->expoSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
-    connect(ui->expoCurveCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->expoCurveSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
-    connect(ui->weightCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->weightSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
-    connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->curvesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->modeCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->expoGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
-    connect(ui->expoCurveGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
-    connect(ui->weightGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
-    for (int i=0; i<9; i++) {
-      connect(cb_fp[i],SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
-    }
-    QTimer::singleShot(0, this, SLOT(shrink()));
-}
-
-ExpoDialog::~ExpoDialog()
-{
-    delete ui;
-}
-
-void ExpoDialog::changeEvent(QEvent *e)
-{
-    QDialog::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
-void ExpoDialog::widgetChanged()
-{
-    if (GetEepromInterface()->getCapability(GvarsAsWeight)) {
-      int gvars=0;
-      if (GetEepromInterface()->getCapability(HasVariants)) {
-        if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
-          gvars=1;
-        }
-      } else {
-        gvars=1;
-      }
-      if (gvars==1) {
-        if (!GetEepromInterface()->getCapability(ExpoIsCurve)) {
-          if (ui->expoGV->isChecked()) {
-            ui->expoCB->show();
-            ui->expoSB->hide();
-          } else {
-            ui->expoCB->hide();
-            ui->expoSB->show();
-          }
-        } else {
-          if (ui->expoCurveGV->isChecked()) {
-            ui->expoCurveCB->show();
-            ui->expoCurveSB->hide();
-          } else {
-            ui->expoCurveCB->hide();
-            ui->expoCurveSB->show();
-          }
-        }
-        if (ui->weightGV->isChecked()) {
-          ui->weightCB->show();
-          ui->weightSB->hide();
-        } else {
-          ui->weightCB->hide();
-          ui->weightSB->show();
-        }
-      }
-      valuesChanged();
-      QTimer::singleShot(0, this, SLOT(shrink()));      
-    }
-}
-
-
-void ExpoDialog::valuesChanged()
-{
-    QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
-    if (ui->curvesCB->currentIndex()==0)  {
-      if (GetEepromInterface()->getCapability(ExpoIsCurve)) {
-        ed->curveMode = 0;
-        ui->expoCurveGV->show();
-        if (ui->expoCurveGV->isChecked()) {
-          ui->expoCurveCB->show();
-          ui->expoCurveSB->hide();
-          ed->curveParam = ui->expoCurveCB->itemData(ui->expoCurveCB->currentIndex()).toInt();
-        } else {
-          ui->expoCurveCB->hide();
-          ui->expoCurveSB->show();
-          ed->curveParam = ui->expoCurveSB->value();
-        }
-        ed->expo = ed->curveParam;
-      } else {
-        ui->expoCurveCB->hide();
-        ui->expoCurveSB->hide();
-        ui->expoCurveGV->hide();
-        ed->curveMode = 0;
-        if (ui->expoGV->isChecked()) {
-          ed->expo = ui->expoCB->itemData(ui->expoCB->currentIndex()).toInt();
-        } else {
-          ed->expo = ui->expoSB->value();
-        }
-        ed->curveParam = ed->expo;
-      }
-    } else {
-      if (!GetEepromInterface()->getCapability(ExpoIsCurve)) {
-        ed->curveMode = 1;
-        ed->curveParam = ui->curvesCB->currentIndex();
-        if (ui->expoGV->isChecked()) {
-          ed->expo = ui->expoCB->itemData(ui->expoCB->currentIndex()).toInt();
-        } else {
-          ed->expo = ui->expoSB->value();
-        }
-      } else {
-        ed->curveMode = 1;
-        ed->curveParam = ui->curvesCB->currentIndex();
-        ed->expo = 0;
-      }
-      ui->expoCurveCB->hide();
-      ui->expoCurveSB->hide();
-      ui->expoCurveGV->hide();
-    }
-    if (ui->weightGV->isChecked()) {
-      ed->weight = ui->weightCB->itemData(ui->weightCB->currentIndex()).toInt();
-    } else {
-      ed->weight = ui->weightSB->value();
-    }
-    ed->swtch  = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
-    ed->mode   = ui->modeCB->currentIndex() + 1;
-    int i=0;
-    for (i=0; i<ui->expoName->text().toAscii().length(); i++) {
-      ed->name[i]=ui->expoName->text().toAscii().at(i);
-    }
-    ed->name[i]=0;
-    ed->phases=0;
-    for (int i=8; i>=0 ; i--) {
-      if (!cb_fp[i]->checkState()) {
-        ed->phases+=1;
-      }
-      ed->phases<<=1;
-    }
-    ed->phases>>=1;
-    if (GetEepromInterface()->getCapability(FlightPhases)) {
-      int zeros=0;
-      int ones=0;
-      int phtemp=ed->phases;
-      for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
-        if (phtemp & 1) {
-          ones++;
-        }
-        else {
-          zeros++;
-        }
-        phtemp >>=1;
-      }
-      if (zeros==1) {
-        phtemp=ed->phases;
-        for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
-          if ((phtemp & 1)==0) {
-            break;
-          }
-          phtemp >>=1;
-        }
-      }
-      else if (ones==1) {
-        phtemp=ed->phases;
-        for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
-          if (phtemp & 1) {
-            break;
-          }
-          phtemp >>=1;
-        }
-      }
-    } else {
-      ed->phases=0;
-    }  
-}
-
-void ExpoDialog::shrink()
-{
-    resize(0,0);
-}
diff --git a/companion/src/file.cpp b/companion/src/file.cpp
index 10c918cf3..404a40db8 100644
--- a/companion/src/file.cpp
+++ b/companion/src/file.cpp
@@ -323,7 +323,10 @@ unsigned int EFile::readRlc12(uint8_t *buf, unsigned int i_len, bool rlc2)
 
       if (read(&m_bRlc, 1) !=1) break; //read how many bytes to read
 
-      assert(m_bRlc & 0x7f);
+      if (!(m_bRlc & 0x7f)) {
+        qDebug() << "RLC decoding error!";
+        return 0;
+      }
       
       if (rlc2) {
         if(m_bRlc&0x80){ // if contains high byte
diff --git a/companion/src/firmwares/er9x/er9xeeprom.cpp b/companion/src/firmwares/er9x/er9xeeprom.cpp
index 335121706..f07716e72 100644
--- a/companion/src/firmwares/er9x/er9xeeprom.cpp
+++ b/companion/src/firmwares/er9x/er9xeeprom.cpp
@@ -3,26 +3,6 @@
 #include "helpers.h"
 #include <QObject>
 
-int8_t er9xFromSwitch(const RawSwitch & sw)
-{
-  switch (sw.type) {
-    case SWITCH_TYPE_SWITCH:
-      return sw.index;
-    case SWITCH_TYPE_VIRTUAL:
-      return sw.index > 0 ? (9 + sw.index) : (-9 + sw.index);
-    case SWITCH_TYPE_ON:
-      return 22;
-    case SWITCH_TYPE_OFF:
-      return -22;
-    case SWITCH_TYPE_MOMENT_SWITCH:
-      return sw.index > 0 ? (22 + sw.index) : (-22 + sw.index);
-    case SWITCH_TYPE_MOMENT_VIRTUAL:
-      return sw.index > 0 ? (31 + sw.index) : (-31 + sw.index);
-    default:
-      return 0;
-  }
-}
-
 RawSwitch er9xToSwitch(int8_t sw)
 {
   uint8_t swa = abs(sw);
@@ -47,15 +27,6 @@ t_Er9xTrainerMix::t_Er9xTrainerMix()
   memset(this, 0, sizeof(t_Er9xTrainerMix));
 }
 
-t_Er9xTrainerMix::t_Er9xTrainerMix(TrainerMix &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xTrainerMix));
-  srcChn = c9x.src;
-  swtch = er9xFromSwitch(c9x.swtch);
-  studWeight = (8 * c9x.weight) / 25;
-  mode = c9x.mode;
-}
-
 t_Er9xTrainerMix::operator TrainerMix()
 {
   TrainerMix c9x;
@@ -71,15 +42,6 @@ t_Er9xTrainerData::t_Er9xTrainerData()
   memset(this, 0, sizeof(t_Er9xTrainerData));
 }
 
-t_Er9xTrainerData::t_Er9xTrainerData(TrainerData &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xTrainerData));
-  for (int i=0; i<NUM_STICKS; i++) {
-    calib[i] = c9x.calib[i];
-    mix[i] = c9x.mix[i];
-  }
-}
-
 t_Er9xTrainerData::operator TrainerData ()
 {
   TrainerData c9x;
@@ -95,76 +57,6 @@ t_Er9xGeneral::t_Er9xGeneral()
   memset(this, 0, sizeof(t_Er9xGeneral));
 }
 
-t_Er9xGeneral::t_Er9xGeneral(GeneralSettings &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xGeneral));
-
-  myVers = MDVERS;
-
-  for (int i=0; i<NUM_STICKSnPOTS; i++) {
-    calibMid[i] = c9x.calibMid[i];
-    calibSpanNeg[i] = c9x.calibSpanNeg[i];
-    calibSpanPos[i] = c9x.calibSpanPos[i];
-  }
-
-  uint16_t sum = 0;
-  for (int i=0; i<12; i++)
-    sum += calibMid[i];
-  chkSum = sum;
-
-  currModel = c9x.currModel;
-  contrast = c9x.contrast;
-  vBatWarn = c9x.vBatWarn;
-  vBatCalib = c9x.vBatCalib;
-
-  trainer = c9x.trainer;
-  view = c9x.view;
-  disableThrottleWarning = c9x.disableThrottleWarning;
-  disableSwitchWarning = (c9x.switchWarning != -1);
-  disableMemoryWarning = c9x.disableMemoryWarning;
-
-  if (c9x.beeperMode == e_quiet)
-    beeperVal = 0;
-  else if (c9x.beeperMode < e_all)
-    beeperVal = 1;
-  else
-    beeperVal = c9x.beeperLength + 4;
-
-  disableAlarmWarning = c9x.disableAlarmWarning;
-  stickMode = c9x.stickMode;
-  inactivityTimer = c9x.inactivityTimer - 10;
-  throttleReversed = c9x.throttleReversed;
-  minuteBeep = c9x.minuteBeep;
-  preBeep = c9x.preBeep;
-  flashBeep = c9x.flashBeep;
-  disableSplashScreen = c9x.splashMode;
-  disablePotScroll=(c9x.disablePotScroll ? 1 : 0);
-  disableBG=(c9x.disableBG ? 1 :0);
-  frskyinternalalarm = c9x.frskyinternalalarm;
-  blightinv=(c9x.blightinv ? 1 : 0);
-  stickScroll=(c9x.stickScroll ? 1 : 0);
-
-  if (c9x.backlightMode == 4)
-    lightSw = 22;
-  if (c9x.backlightMode & 1)
-    lightAutoOff = c9x.backlightDelay;
-  if (c9x.backlightMode & 2)
-    lightOnStickMove = c9x.backlightDelay;
-
-  templateSetup = c9x.templateSetup;
-  PPM_Multiplier = c9x.PPM_Multiplier;
-  setEEPROMString(ownerName, c9x.ownerName, sizeof(ownerName));
-  speakerPitch = c9x.speakerPitch;
-  hapticStrength = c9x.hapticStrength;
-  hideNameOnSplash = (c9x.hideNameOnSplash ? 1 : 0);
-  enablePpmsim = (c9x.enablePpmsim ? 1 : 0);;
-
-  speakerMode = c9x.speakerMode;
-  switchWarningStates =c9x.switchWarningStates;
-  crosstrim=(c9x.crosstrim ? 1 : 0);
-  
-}
-
 Er9xGeneral::operator GeneralSettings ()
 {
   GeneralSettings result;
@@ -207,7 +99,6 @@ Er9xGeneral::operator GeneralSettings ()
   result.disableAlarmWarning = disableAlarmWarning;
   result.stickMode = std::max((uint8_t)0, std::min(stickMode, (uint8_t)3));
   result.inactivityTimer = inactivityTimer + 10;
-  result.throttleReversed = throttleReversed;
   result.minuteBeep = minuteBeep;
   result.preBeep = preBeep;
   result.flashBeep = flashBeep;
@@ -244,15 +135,6 @@ t_Er9xLimitData::t_Er9xLimitData()
   memset(this, 0, sizeof(t_Er9xLimitData));
 }
 
-t_Er9xLimitData::t_Er9xLimitData(LimitData &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xLimitData));
-  min = c9x.min+100;
-  max = c9x.max-100;
-  revert = c9x.revert;
-  offset = c9x.offset;
-}
-
 t_Er9xLimitData::operator LimitData ()
 {
   LimitData c9x;
@@ -268,107 +150,6 @@ t_Er9xMixData::t_Er9xMixData()
   memset(this, 0, sizeof(t_Er9xMixData));
 }
 
-t_Er9xMixData::t_Er9xMixData(MixData &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xMixData));
-  destCh = c9x.destCh;
-  swtch = er9xFromSwitch(c9x.swtch);
-
-  if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-    srcRaw = 0;
-    swtch = 0;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-    srcRaw = 1 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("er9x doesn't have Rotary Encoders") + "\n";
-    srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-    srcRaw = 8; // MAX
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-    srcRaw = 9; // FULL
-    swtch = er9xFromSwitch(RawSwitch(c9x.srcRaw.index));
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-    srcRaw = 10 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-    srcRaw = 13 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-    srcRaw = 21 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_GVAR) {
-    srcRaw = 38 + c9x.srcRaw.index;
-  } 
-  else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-    EEPROMWarnings += ::QObject::tr("er9x doesn't have trims as source") + "\n";
-    srcRaw = 0; // use pots instead
-  }
-  if (abs(c9x.weight)>125) {
-    if (c9x.weight>0) {
-      int index=abs(c9x.weight)-10000;
-      int gvar=125+index;
-      if (gvar>127) {
-        gvar-=256;
-      }
-      weight = gvar;
-    } else {
-      EEPROMWarnings += ::QObject::tr("er9x doesn't have negative gvars as weight") + "\n";
-      weight=0;
-    }
-  } else {
-    weight = c9x.weight;
-  }
-
-  if (abs(c9x.sOffset)>125) {
-    if (c9x.sOffset>0) {
-      int index=abs(c9x.sOffset)-10000;
-      int gvar=125+index;
-      if (gvar>127) {
-        gvar-=256;
-      }
-      sOffset = gvar;
-    } else {
-      EEPROMWarnings += ::QObject::tr("er9x doesn't have negative gvars as offset") + "\n";
-      sOffset=0;
-    }
-  } else {
-    sOffset = c9x.sOffset;
-  }
-  
-  if (c9x.curve!=0) {
-    curve = c9x.curve;
-    differential=0;
-  } else {
-    if (c9x.differential!=0) {
-      curve=c9x.differential;
-      differential=1;
-    } else {
-      curve=0;
-      differential=0;
-    }
-  }
-  lateOffset=c9x.lateOffset;
-  delayUp = c9x.delayUp;
-  delayDown = c9x.delayDown;
-  speedUp = c9x.speedUp;
-  speedDown = c9x.speedDown;
-  if (c9x.carryTrim<0) {
-    EEPROMWarnings += ::QObject::tr("er9x doesn't have swappable trims") + "\n";
-    carryTrim=1;
-  } else {
-    carryTrim = c9x.carryTrim;
-  }
-  mltpx = (MltpxValue)c9x.mltpx;
-  mixWarn = c9x.mixWarn;
-  enableFmTrim=c9x.enableFmTrim;
-  
-}
-
 t_Er9xMixData::operator MixData ()
 {
   MixData c9x;
@@ -434,14 +215,21 @@ t_Er9xMixData::operator MixData ()
   else {
     c9x.srcRaw = RawSource(SOURCE_TYPE_GVAR, srcRaw-38);    
   }
+
   if (differential==1) {
-    c9x.differential=curve;
-    c9x.curve=0;
-  } else {
-    c9x.differential=0;
-    c9x.curve=curve;
+    c9x.curve.type = CurveReference::CURVE_REF_DIFF;
+    c9x.curve.value = differential;
   }
-  c9x.lateOffset=lateOffset;
+  else if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
+
+  // c9x.lateOffset=lateOffset;
   c9x.delayUp = delayUp;
   c9x.delayDown = delayDown;
   c9x.speedUp = speedUp;
@@ -449,32 +237,10 @@ t_Er9xMixData::operator MixData ()
   c9x.carryTrim = carryTrim;
   c9x.mltpx = (MltpxValue)mltpx;
   c9x.mixWarn = mixWarn;
-  c9x.enableFmTrim=enableFmTrim;
+  // c9x.enableFmTrim=enableFmTrim;
   return c9x;
 }
 
-int8_t er9xFromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("er9x on this board doesn't have Rotary Encoders") + "\n";
-    v1 = 5+source.index;
-  }
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 8;
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 10+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 13+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 21+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 36+source.index;
-  return v1;
-}
-
 RawSource er9xToSource(int8_t value)
 {
   if (value == 0) {
@@ -503,33 +269,6 @@ RawSource er9xToSource(int8_t value)
   }
 }
 
-t_Er9xCustomSwData::t_Er9xCustomSwData(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-  
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = er9xFromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    v2 = er9xFromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = er9xFromSwitch(RawSwitch(c9x.val1));
-    v2 = er9xFromSwitch(RawSwitch(c9x.val2));
-  }
-  
-  if (func>ER9X_MAX_CSFUNC ) {
-    EEPROMWarnings += ::QObject::tr("er9x does not support Custom Switch function %1").arg(getFuncName(func)) + "\n";
-    func=0;
-    v1=0;
-    v2=0;
-  }
-}
-
 Er9xCustomSwData::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -559,13 +298,6 @@ t_Er9xSafetySwData::t_Er9xSafetySwData()
   memset(this, 0, sizeof(t_Er9xSafetySwData));
 }
 
-t_Er9xSafetySwData::t_Er9xSafetySwData(SafetySwData &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xSafetySwData));
-  swtch = er9xFromSwitch(c9x.swtch);
-  val = c9x.val;
-}
-
 t_Er9xSafetySwData::operator SafetySwData ()
 {
   SafetySwData c9x;
@@ -574,35 +306,11 @@ t_Er9xSafetySwData::operator SafetySwData ()
   return c9x;
 }
 
-
 t_Er9xFrSkyChannelData::t_Er9xFrSkyChannelData()
 {
   memset(this, 0, sizeof(t_Er9xFrSkyChannelData));
 }
 
-t_Er9xFrSkyChannelData::t_Er9xFrSkyChannelData(FrSkyChannelData &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xFrSkyChannelData));
-  ratio = c9x.ratio;
-  alarms_value[0] = c9x.alarms[0].value;
-  alarms_value[1] = c9x.alarms[1].value;
-  alarms_level = (c9x.alarms[1].level << 2) + c9x.alarms[0].level;
-  alarms_greater = (c9x.alarms[1].greater << 1) + c9x.alarms[0].greater;
-  if (c9x.type==0) {
-    if (c9x.multiplier==0) {
-      type = 0;
-    } else if (c9x.multiplier==1) {
-      type = 2;
-    } else {
-      EEPROMWarnings += ::QObject::tr("er9x does not support this range for A1/A2") + "\n";
-    }      
-  } else if (c9x.type==1 || c9x.type==3) {
-    type=c9x.type;
-  } else {
-    EEPROMWarnings += ::QObject::tr("er9x does not support this telemetry units") + "\n";
-  }
-}
-
 t_Er9xFrSkyChannelData::operator FrSkyChannelData ()
 {
   FrSkyChannelData c9x;
@@ -622,19 +330,11 @@ t_Er9xFrSkyChannelData::operator FrSkyChannelData ()
   return c9x;
 }
 
-
 t_Er9xFrSkyData::t_Er9xFrSkyData()
 {
   memset(this, 0, sizeof(t_Er9xFrSkyData));
 }
 
-t_Er9xFrSkyData::t_Er9xFrSkyData(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xFrSkyData));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1]; 
-}
-
 t_Er9xFrSkyData::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -643,24 +343,6 @@ t_Er9xFrSkyData::operator FrSkyData ()
   return c9x;
 }
 
-int setEr9xTimerMode(TimerMode mode)
-{
-  if (mode == TMRMODE_OFF || mode == TMRMODE_ABS)
-    return mode;
-  else if (mode == TMRMODE_THs || mode == TMRMODE_THp)
-    return mode + 4;
-  else if (mode >= TMRMODE_FIRST_MOMENT_SWITCH)
-    return 37+mode-TMRMODE_FIRST_MOMENT_SWITCH;
-  else if (mode >= TMRMODE_FIRST_SWITCH)
-    return 16+mode-TMRMODE_FIRST_SWITCH;
-  else if (mode <= TMRMODE_FIRST_NEG_MOMENT_SWITCH)
-    return -37+mode-TMRMODE_FIRST_NEG_MOMENT_SWITCH;
-  else if (mode <= TMRMODE_FIRST_NEG_SWITCH)
-    return -16+mode-TMRMODE_FIRST_NEG_SWITCH;
-  else
-    return 0;
-}
-
 TimerMode getEr9xTimerMode(int mode)
 {
   if (mode <= -33)
@@ -675,162 +357,6 @@ TimerMode getEr9xTimerMode(int mode)
     return TimerMode(TMRMODE_FIRST_MOMENT_SWITCH+(mode-16-21));
 }
 
-t_Er9xModelData::t_Er9xModelData(ModelData &c9x)
-{
-  memset(this, 0, sizeof(t_Er9xModelData));
-
-  if (c9x.used) {
-    setEEPROMString(name, c9x.name, sizeof(name));
-    modelVoice=c9x.modelVoice;
-    tmrMode = setEr9xTimerMode(c9x.timers[0].mode);
-    tmrModeB = c9x.timers[0].modeB;
-    tmrDir = c9x.timers[0].dir;
-    tmrVal = c9x.timers[0].val;
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case PPM16:
-        protocol = 3;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += QObject::tr("Er9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    traineron = c9x.traineron;
-    t2throttle = c9x.t2throttle;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    thrTrim = c9x.thrTrim;
-    thrExpo = c9x.thrExpo;
-    trimInc = c9x.trimInc;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    for (unsigned int i=0; i<C9X_MAX_CUSTOM_FUNCTIONS; i++) 
-      if (c9x.funcSw[i].func == FuncInstantTrim && c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE) {
-        trimSw = er9xFromSwitch(c9x.funcSw[i].swtch);
-        break;
-      }
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    swashInvertELE = c9x.swashRingData.invertELE;
-    swashInvertAIL = c9x.swashRingData.invertAIL;
-    swashInvertCOL = c9x.swashRingData.invertCOL;
-    swashType = c9x.swashRingData.type;
-    swashCollectiveSource = er9xFromSource(c9x.swashRingData.collectiveSource);
-    swashRingValue = c9x.swashRingData.value;
-    for (int i=0; i<ER9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<ER9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-
-    // expoData
-    for (unsigned int i=0; i<NUM_STICKS; i++) {
-      // first we find the switches
-      for (int e=0; e<C9X_MAX_EXPOS && c9x.expoData[e].mode; e++) {
-        if (c9x.expoData[e].chn == i) {
-          if (c9x.expoData[e].swtch.type!=SWITCH_TYPE_NONE) {
-            if (!expoData[i].drSw1)
-              expoData[i].drSw1 = -er9xFromSwitch(c9x.expoData[e].swtch);
-            else if (er9xFromSwitch(c9x.expoData[e].swtch) != -expoData[i].drSw1 && !expoData[i].drSw2) {
-              expoData[i].drSw2 = -er9xFromSwitch(c9x.expoData[e].swtch);
-            }
-          }
-        }
-      }
-
-      if (expoData[i].drSw1 && !expoData[i].drSw2) {
-        expoData[i].drSw1 = -expoData[i].drSw1;
-      }
-
-      for (int pos=0; pos<3; pos++) {
-        int swtch1=0, swtch2=0;
-        if (expoData[i].drSw1 && !expoData[i].drSw2) {
-          switch (pos) {
-            case 0:
-              swtch1 = -expoData[i].drSw1;
-              break;
-            case 1:
-              swtch1 = expoData[i].drSw1;
-              break;
-            default:
-              swtch1 = expoData[i].drSw1;
-              break;
-          }
-        }
-        else {
-          switch (pos) {
-            case 0:
-              swtch1 = -expoData[i].drSw1;
-              break;
-            case 1:
-              swtch1 = expoData[i].drSw1;
-              swtch2 = -expoData[i].drSw2;
-              break;
-            default:
-              swtch1 = expoData[i].drSw1;
-              swtch2 = expoData[i].drSw2;
-              break;
-          }
-        }
-        for (int mode=0; mode<2; mode++) {
-          for (int e=0; e<C9X_MAX_EXPOS && c9x.expoData[e].mode; e++) {
-            if (c9x.expoData[e].chn == i && !c9x.expoData[e].phases) {
-              if (c9x.expoData[e].swtch.type==SWITCH_TYPE_NONE || c9x.expoData[e].swtch == er9xToSwitch(swtch1) || c9x.expoData[e].swtch == er9xToSwitch(swtch2)) {
-                if (c9x.expoData[e].mode == 3 || (c9x.expoData[e].mode==2 && mode==0) || (c9x.expoData[e].mode==1 && mode==1)) {
-                  expoData[i].expo[pos][0][mode] = c9x.expoData[e].expo;
-                  expoData[i].expo[pos][1][mode] = c9x.expoData[e].weight - 100;
-                  break;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    for (int i=0; i<NUM_STICKS; i++)
-      trim[i] = std::max(-125, std::min(125, c9x.phaseData[0].trim[i]));
-
-    for (int i=0; i<ER9X_MAX_CURVE5; i++)
-      if  (c9x.curves[i].count==5) {
-        if  (c9x.curves[i].custom)
-          EEPROMWarnings += QObject::tr("Er9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1) + "\n";    
-        for (int j=0; j<5; j++)
-            curves5[i][j] = c9x.curves[i].points[j].y;
-      } else {
-        EEPROMWarnings += QObject::tr("Er9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i].count).arg(i+1) + "\n";
-      }   
-    for (int i=0; i<ER9X_MAX_CURVE9; i++)
-      if  (c9x.curves[i+ER9X_MAX_CURVE5].count==9) {
-        if  (c9x.curves[i+ER9X_MAX_CURVE5].custom)
-          EEPROMWarnings += QObject::tr("Er9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1+ER9X_MAX_CURVE5) + "\n";    
-        for (int j=0; j<9; j++)
-            curves9[i][j] = c9x.curves[i+ER9X_MAX_CURVE5].points[j].y;
-      } else {
-        EEPROMWarnings += QObject::tr("Er9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i+ER9X_MAX_CURVE5].count).arg(i+1+ER9X_MAX_CURVE5) + "\n";
-      }   
-
-    for (int i=0; i<ER9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-
-    for (int i=0; i<ER9X_NUM_CHNOUT; i++)
-      safetySw[i] = c9x.safetySw[i];
-    frsky = c9x.frsky;
-    FrSkyUsrProto = c9x.frsky.usrProto;
-    FrSkyImperial = c9x.frsky.imperial;
-    FrSkyGpsAlt = c9x.frsky.FrSkyGpsAlt;
-  }
-}
-
 t_Er9xModelData::operator ModelData ()
 {
   ModelData c9x;
@@ -902,7 +428,10 @@ t_Er9xModelData::operator ModelData ()
         c9x.expoData[e].swtch = er9xToSwitch(dr == 0 ? -expoData[ch].drSw1 : (dr == 1 ? -expoData[ch].drSw2 : 0));
       }
       c9x.expoData[e].chn = ch;
-      c9x.expoData[e].expo = expoData[ch].expo[pos][0][0];
+      if (expoData[ch].expo[pos][0][0]) {
+        c9x.expoData[e].curve.type = CurveReference::CURVE_REF_EXPO;
+        c9x.expoData[e].curve.value = expoData[ch].expo[pos][0][0];
+      }
       c9x.expoData[e].weight = 100 + expoData[ch].expo[pos][1][0];
       if (expoData[ch].expo[pos][0][0] == expoData[ch].expo[pos][0][1] && expoData[ch].expo[pos][1][0] == expoData[ch].expo[pos][1][1]) {
         c9x.expoData[e++].mode = 3;
@@ -913,7 +442,10 @@ t_Er9xModelData::operator ModelData ()
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
-          c9x.expoData[e].expo = expoData[ch].expo[pos][0][1];
+          if (expoData[ch].expo[pos][0][1]) {
+            c9x.expoData[e].curve.type = CurveReference::CURVE_REF_EXPO;
+            c9x.expoData[e].curve.value = expoData[ch].expo[pos][0][1];
+          }
           c9x.expoData[e++].weight = 100 + expoData[ch].expo[pos][1][1];
         }
       }
@@ -924,7 +456,6 @@ t_Er9xModelData::operator ModelData ()
     c9x.phaseData[0].trim[i] = trim[i];
 
   for (int i=0; i<ER9X_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -932,7 +463,6 @@ t_Er9xModelData::operator ModelData ()
     }
   }
   for (int i=0; i<ER9X_MAX_CURVE9; i++) {
-    c9x.curves[ER9X_MAX_CURVE5 + i].custom = false;
     c9x.curves[ER9X_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[ER9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
diff --git a/companion/src/firmwares/er9x/er9xeeprom.h b/companion/src/firmwares/er9x/er9xeeprom.h
index ef63409cb..295aa8c42 100644
--- a/companion/src/firmwares/er9x/er9xeeprom.h
+++ b/companion/src/firmwares/er9x/er9xeeprom.h
@@ -42,8 +42,6 @@ PACK(typedef struct t_Er9xTrainerMix {
 
   operator TrainerMix();
   t_Er9xTrainerMix();
-  t_Er9xTrainerMix(TrainerMix&);
-
 }) Er9xTrainerMix; //
 
 PACK(typedef struct t_Er9xTrainerData {
@@ -52,8 +50,6 @@ PACK(typedef struct t_Er9xTrainerData {
 
   operator TrainerData();
   t_Er9xTrainerData();
-  t_Er9xTrainerData(TrainerData&);
-
 }) Er9xTrainerData;
 
 PACK(typedef struct t_Er9xGeneral {
@@ -109,8 +105,6 @@ PACK(typedef struct t_Er9xGeneral {
 
   operator GeneralSettings();
   t_Er9xGeneral();
-  t_Er9xGeneral(GeneralSettings&);
-
 }) Er9xGeneral;
 
 PACK(typedef struct t_Er9xExpoData {
@@ -130,7 +124,6 @@ PACK(typedef struct t_Er9xLimitData {
 
   operator LimitData();
   t_Er9xLimitData();
-  t_Er9xLimitData(LimitData&);
 }) Er9xLimitData;
 
 #define MLTPX_ADD  0
@@ -158,7 +151,6 @@ PACK(typedef struct t_Er9xMixData {
 
   operator MixData();
   t_Er9xMixData();
-  t_Er9xMixData(MixData&);
 }) Er9xMixData;
 
 
@@ -170,7 +162,6 @@ PACK(typedef struct t_Er9xCustomSwData { // Custom Switches data
 
   operator CustomSwData();
   t_Er9xCustomSwData() { memset(this, 0, sizeof(t_Er9xCustomSwData)); }
-  t_Er9xCustomSwData(CustomSwData&);
 }) Er9xCustomSwData;
 
 PACK(typedef struct t_Er9xSafetySwData { // Custom Switches data
@@ -179,7 +170,6 @@ PACK(typedef struct t_Er9xSafetySwData { // Custom Switches data
 
   operator SafetySwData();
   t_Er9xSafetySwData();
-  t_Er9xSafetySwData(SafetySwData&);
 }) Er9xSafetySwData;
 
 PACK(typedef struct t_Er9xFrSkyChannelData {
@@ -191,7 +181,6 @@ PACK(typedef struct t_Er9xFrSkyChannelData {
 
   operator FrSkyChannelData();
   t_Er9xFrSkyChannelData();
-  t_Er9xFrSkyChannelData(FrSkyChannelData&);
 }) Er9xFrSkyChannelData;
 
 PACK(typedef struct t_Er9xFrSkyData {
@@ -199,7 +188,6 @@ PACK(typedef struct t_Er9xFrSkyData {
 
   operator FrSkyData();
   t_Er9xFrSkyData();
-  t_Er9xFrSkyData(FrSkyData&);
 }) Er9xFrSkyData;
 
 PACK(typedef struct t_gvar {
@@ -268,9 +256,6 @@ PACK(typedef struct t_Er9xModelData {
   
   operator ModelData();
   t_Er9xModelData() { memset(this, 0, sizeof(t_Er9xModelData)); }
-  t_Er9xModelData(ModelData&);
 }) Er9xModelData;
 
-
 #endif
-/*eof*/
diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp
index 4895e31e6..f2eed4608 100644
--- a/companion/src/firmwares/er9x/er9xinterface.cpp
+++ b/companion/src/firmwares/er9x/er9xinterface.cpp
@@ -184,57 +184,20 @@ bool Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize,
 
 int Er9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
 {
-  EEPROMWarnings.clear();
+  std::cout << "NO!\n";
+  // TODO an error
 
-  efile->EeFsCreate(eeprom, getEEpromSize(), BOARD_STOCK);
-
-  Er9xGeneral er9xGeneral(radioData.generalSettings);
-  int sz = efile->writeRlc1(FILE_GENERAL, FILE_TYP_GENERAL, (uint8_t*)&er9xGeneral, sizeof(Er9xGeneral));
-  if(sz != sizeof(Er9xGeneral)) {
-    return 0;
-  }
-
-  for (int i=0; i<getMaxModels(); i++) {
-    if (!radioData.models[i].isempty()) {
-      Er9xModelData er9xModel(radioData.models[i]);
-      applyStickModeToModel(er9xModel, radioData.generalSettings.stickMode+1);
-      sz = efile->writeRlc1(FILE_MODEL(i), FILE_TYP_MODEL, (uint8_t*)&er9xModel, sizeof(Er9xModelData));
-      if(sz != sizeof(Er9xModelData)) {
-        return 0;
-      }
-    }
-  }
-
-  return getEEpromSize();
+  return 0;
 }
 
 int Er9xInterface::getSize(ModelData &model)
 {
-  if (model.isempty())
-    return 0;
-
-  uint8_t tmp[2*EESIZE_STOCK];
-  efile->EeFsCreate(tmp, getEEpromSize(), BOARD_STOCK);
-
-  Er9xModelData er9xModel(model);
-  int sz = efile->writeRlc1(0, FILE_TYP_MODEL, (uint8_t*)&er9xModel, sizeof(Er9xModelData));
-  if(sz != sizeof(Er9xModelData)) {
-     return -1;
-  }
-  return efile->size(0);
+  return 0;
 }
 
 int Er9xInterface::getSize(GeneralSettings &settings)
 {
-  uint8_t tmp[2*EESIZE_STOCK];
-  efile->EeFsCreate(tmp, getEEpromSize(), BOARD_STOCK);
-  
-  Er9xGeneral er9xGeneral(settings);
-  int sz = efile->writeRlc1(0, FILE_TYP_GENERAL, (uint8_t*)&er9xGeneral, sizeof(Er9xGeneral));
-  if(sz != sizeof(Er9xGeneral)) {
-    return -1;
-  }
-  return efile->size(0);
+  return 0;
 }
 
 int Er9xInterface::getCapability(const Capability capability)
@@ -244,12 +207,6 @@ int Er9xInterface::getCapability(const Capability capability)
         return 4;
     case Mixes:
       return ER9X_MAX_MIXERS;
-    case NumCurves5:
-      return ER9X_MAX_CURVE5;
-    case NumCurves9:
-      return ER9X_MAX_CURVE5;      
-    case MixFmTrim:
-      return 1;
     case PPMExtCtrl:
       return 1;
     case ModelTrainerEnable:
@@ -286,10 +243,6 @@ int Er9xInterface::getCapability(const Capability capability)
       return 12;
     case CustomAndSwitches:
         return 5;
-    case GvarsNum:
-        return 7;
-    case GvarsOfsNum:
-      return 5;
     case CSFunc:
       return 13;
     case Outputs:
@@ -306,8 +259,6 @@ int Er9xInterface::getCapability(const Capability capability)
       return TM_HASTELEMETRY|TM_HASWSHH;
     case TelemetryUnits:
       return 1;
-    case TimerTriggerB:
-      return 1;
     case TelemetryMaxMultiplier:
       return 2;
     case MaxVolume:
@@ -325,17 +276,13 @@ int Er9xInterface::getCapability(const Capability capability)
     case HasStickScroll:
     case HasAltitudeSel:
     case HasContrast:
-    case InstantTrimSW:
     case HasVolume:
     case HasBlInvert:
     case ModelVoice:
-    case DiffMixers:
-    case HasNegCurves:
-    case HasFixOffset:
     case Gvars:
+      return 7;
     case GvarsHaveSources:
     case GvarsAsSources:
-    case GvarsAsWeight:
      return 1;
     case GetThrSwitch:
       return DSW_THR;     
diff --git a/companion/src/firmwares/ersky9x/ersky9xeeprom.cpp b/companion/src/firmwares/ersky9x/ersky9xeeprom.cpp
index f21688f20..1247c795a 100644
--- a/companion/src/firmwares/ersky9x/ersky9xeeprom.cpp
+++ b/companion/src/firmwares/ersky9x/ersky9xeeprom.cpp
@@ -3,19 +3,8 @@
 #include "ersky9xeeprom.h"
 #include <QObject>
 
-extern int8_t er9xFromSwitch(const RawSwitch & sw);
 extern RawSwitch er9xToSwitch(int8_t sw);
 
-int setErSky9xTimerMode(TimerMode mode)
-{
-  if (mode == TMRMODE_OFF || mode == TMRMODE_ABS || mode == TMRMODE_THs || mode == TMRMODE_THp)
-    return mode;
-  else if (mode >= TMRMODE_FIRST_CHPERC)
-    return 4+mode-TMRMODE_FIRST_CHPERC;
-  else
-    return 0;
-}
-
 TimerMode getErSky9xTimerMode(int mode)
 {
   if (mode<4)
@@ -26,26 +15,6 @@ TimerMode getErSky9xTimerMode(int mode)
     return TimerMode(0);
 }
 
-int8_t ersky9xFromSwitch(const RawSwitch & sw)
-{
-  switch (sw.type) {
-    case SWITCH_TYPE_SWITCH:
-      return sw.index;
-    case SWITCH_TYPE_VIRTUAL:
-      return sw.index > 0 ? (9 + sw.index) : (-9 + sw.index);
-    case SWITCH_TYPE_ON:
-      return 34;
-    case SWITCH_TYPE_OFF:
-      return -34;
-    case SWITCH_TYPE_MOMENT_SWITCH:
-      return sw.index > 0 ? (34 + sw.index) : (-34 + sw.index);
-    case SWITCH_TYPE_MOMENT_VIRTUAL:
-      return sw.index > 0 ? (31 + sw.index) : (-31 + sw.index);
-    default:
-      return 0;
-  }
-}
-
 RawSwitch ersky9xToSwitch(int8_t sw)
 {
   uint8_t swa = abs(sw);
@@ -65,21 +34,11 @@ RawSwitch ersky9xToSwitch(int8_t sw)
     return RawSwitch(SWITCH_TYPE_MOMENT_VIRTUAL, sw > 0 ? sw-34-9 : sw+34+9);
 }
 
-
 t_Ersky9xTrainerMix::t_Ersky9xTrainerMix()
 {
   memset(this, 0, sizeof(t_Ersky9xTrainerMix));
 }
 
-t_Ersky9xTrainerMix::t_Ersky9xTrainerMix(TrainerMix &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xTrainerMix));
-  srcChn = c9x.src;
-  swtch = er9xFromSwitch(c9x.swtch);
-  studWeight = (8 * c9x.weight) / 25;
-  mode = c9x.mode;
-}
-
 t_Ersky9xTrainerMix::operator TrainerMix()
 {
   TrainerMix c9x;
@@ -95,15 +54,6 @@ t_Ersky9xTrainerData::t_Ersky9xTrainerData()
   memset(this, 0, sizeof(t_Ersky9xTrainerData));
 }
 
-t_Ersky9xTrainerData::t_Ersky9xTrainerData(TrainerData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xTrainerData));
-  for (int i=0; i<NUM_STICKS; i++) {
-    calib[i] = c9x.calib[i];
-    mix[i] = c9x.mix[i];
-  }
-}
-
 t_Ersky9xTrainerData::operator TrainerData ()
 {
   TrainerData c9x;
@@ -119,72 +69,6 @@ t_Ersky9xGeneral::t_Ersky9xGeneral()
   memset(this, 0, sizeof(t_Ersky9xGeneral));
 }
 
-t_Ersky9xGeneral::t_Ersky9xGeneral(GeneralSettings &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xGeneral));
-
-  myVers = ERSKY9X_MDVERS11;
-
-  for (int i=0; i<NUM_STICKSnPOTS; i++) {
-    calibMid[i] = c9x.calibMid[i];
-    calibSpanNeg[i] = c9x.calibSpanNeg[i];
-    calibSpanPos[i] = c9x.calibSpanPos[i];
-  }
-
-  uint16_t sum = 0;
-  for (int i=0; i<12; i++)
-    sum += calibMid[i];
-  chkSum = sum;
-
-  currModel = c9x.currModel;
-  contrast = c9x.contrast;
-  vBatWarn = c9x.vBatWarn;
-  vBatCalib = c9x.vBatCalib;
-
-  if (c9x.backlightMode == 4)
-    lightSw = 22;
-  if (c9x.backlightMode & 1)
-    lightAutoOff = c9x.backlightDelay;
-  if (c9x.backlightMode & 2)
-    lightOnStickMove = c9x.backlightDelay;
-
-  trainer = c9x.trainer;
-  view = c9x.view;
-  disableThrottleWarning = c9x.disableThrottleWarning;
-  disableSwitchWarning = (c9x.switchWarning != -1);
-  disableMemoryWarning = c9x.disableMemoryWarning;
-
-  if (c9x.beeperMode == e_quiet)
-    beeperVal = 0;
-  else if (c9x.beeperMode < e_all)
-    beeperVal = 1;
-  else
-    beeperVal = c9x.beeperLength + 4;
-
-  disableAlarmWarning = c9x.disableAlarmWarning;
-  stickMode = c9x.stickMode;
-  inactivityTimer = c9x.inactivityTimer - 10;
-  throttleReversed = c9x.throttleReversed;
-  minuteBeep = c9x.minuteBeep;
-  preBeep = c9x.preBeep;
-  flashBeep = c9x.flashBeep;
-  disableSplashScreen = c9x.splashMode;
-  disablePotScroll=(c9x.disablePotScroll ? 1 : 0);
-  disableBG=(c9x.disableBG ? 1 :0);
-  filterInput = c9x.filterInput;
-  templateSetup = c9x.templateSetup;
-  PPM_Multiplier = c9x.PPM_Multiplier;
-  setEEPROMString(ownerName, c9x.ownerName, sizeof(ownerName));
-  optrexDisplay = c9x.optrexDisplay;
-  speakerPitch = c9x.speakerPitch;
-  hapticStrength = c9x.hapticStrength;
-  speakerMode = c9x.speakerMode;
-  switchWarningStates =c9x.switchWarningStates;
-  volume = c9x.speakerVolume;
-  bright = c9x.backlightBright;
-  current_calib = c9x.currentCalib;
-}
-
 Ersky9xGeneral::operator GeneralSettings ()
 {
   GeneralSettings result;
@@ -237,7 +121,6 @@ Ersky9xGeneral::operator GeneralSettings ()
   result.disableAlarmWarning = disableAlarmWarning;
   result.stickMode = std::max((uint8_t)0, std::min(stickMode, (uint8_t)3));
   result.inactivityTimer = inactivityTimer + 10;
-  result.throttleReversed = throttleReversed;
   result.minuteBeep = minuteBeep;
   result.preBeep = preBeep;
   result.flashBeep = flashBeep;
@@ -264,15 +147,6 @@ t_Ersky9xLimitData::t_Ersky9xLimitData()
   memset(this, 0, sizeof(t_Ersky9xLimitData));
 }
 
-t_Ersky9xLimitData::t_Ersky9xLimitData(LimitData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xLimitData));
-  min = c9x.min+100;
-  max = c9x.max-100;
-  revert = c9x.revert;
-  offset = c9x.offset;
-}
-
 t_Ersky9xLimitData::operator LimitData ()
 {
   LimitData c9x;
@@ -288,65 +162,6 @@ t_Ersky9xMixData_v10::t_Ersky9xMixData_v10()
   memset(this, 0, sizeof(t_Ersky9xMixData_v10));
 }
 
-t_Ersky9xMixData_v10::t_Ersky9xMixData_v10(MixData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xMixData_v10));
-  destCh = c9x.destCh;
-  swtch = er9xFromSwitch(c9x.swtch);
-
-  if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-    srcRaw = 0;
-    swtch = 0;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-    srcRaw = 1 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("ersky9x doesn't have Rotary Encoders") + "\n";
-    srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-    srcRaw = 8; // MAX
-  }
-  /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-    srcRaw = 37;
-  } */
-  else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-    srcRaw = 9; // FULL
-    swtch = er9xFromSwitch(RawSwitch(c9x.srcRaw.index));
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-    srcRaw = 10 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-    srcRaw = 13 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-    srcRaw = 21 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-    EEPROMWarnings += ::QObject::tr("ersky9x doesn't have trims as source") + "\n";
-    srcRaw = 0; // use pots instead
-  }
-
-  weight = c9x.weight;
-  curve = c9x.curve;
-  delayUp = c9x.delayUp;
-  delayDown = c9x.delayDown;
-  speedUp = c9x.speedUp;
-  speedDown = c9x.speedDown;
-  if (c9x.carryTrim<0) {
-    EEPROMWarnings += ::QObject::tr("er9x doesn't have swappable trims") + "\n";
-    carryTrim=1;
-  } else {
-    carryTrim = c9x.carryTrim;
-  }
-  mltpx = (MltpxValue)c9x.mltpx;
-  mixWarn = c9x.mixWarn;
-  enableFmTrim=c9x.enableFmTrim;
-  sOffset = c9x.sOffset;
-}
-
 t_Ersky9xMixData_v10::operator MixData ()
 {
   MixData c9x;
@@ -390,7 +205,15 @@ t_Ersky9xMixData_v10::operator MixData ()
     c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-21);
   }
 
-  c9x.curve = curve;
+  if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
+
   c9x.delayUp = delayUp;
   c9x.delayDown = delayDown;
   c9x.speedUp = speedUp;
@@ -398,7 +221,7 @@ t_Ersky9xMixData_v10::operator MixData ()
   c9x.carryTrim = carryTrim;
   c9x.mltpx = (MltpxValue)mltpx;
   c9x.mixWarn = mixWarn;
-  c9x.enableFmTrim=enableFmTrim;
+  // c9x.enableFmTrim=enableFmTrim;
   c9x.sOffset = sOffset;
   return c9x;
 }
@@ -409,67 +232,6 @@ t_Ersky9xMixData_v11::t_Ersky9xMixData_v11()
   memset(this, 0, sizeof(t_Ersky9xMixData_v11));
 }
 
-t_Ersky9xMixData_v11::t_Ersky9xMixData_v11(MixData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xMixData_v11));
-  destCh = c9x.destCh;
-  swtch = ersky9xFromSwitch(c9x.swtch);
-  if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-    srcRaw = 0;
-    swtch = 0;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-    srcRaw = 1 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("ersky9x doesn't have Rotary Encoders") + "\n";
-    srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-    srcRaw = 8; // MAX
-  }
-  /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-    srcRaw = 45;
-  } */
-  else if (c9x.srcRaw.type == SOURCE_TYPE_GVAR) {
-    srcRaw = 46+c9x.srcRaw.index; // MAX
-  }    
-  else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-    srcRaw = 9; // FULL
-    swtch = ersky9xFromSwitch(RawSwitch(c9x.srcRaw.index));
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-    srcRaw = 10 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-    srcRaw = 13 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-    srcRaw = 21 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-    EEPROMWarnings += ::QObject::tr("ersky9x doesn't have trims as source") + "\n";
-    srcRaw = 0; // use pots instead
-  }
-
-  weight = c9x.weight;
-  curve = c9x.curve;
-  delayUp = c9x.delayUp;
-  delayDown = c9x.delayDown;
-  speedUp = c9x.speedUp;
-  speedDown = c9x.speedDown;
-  if (c9x.carryTrim<0) {
-    EEPROMWarnings += ::QObject::tr("er9x doesn't have swappable trims") + "\n";
-    carryTrim=1;
-  } else {
-    carryTrim = c9x.carryTrim;
-  }
-  mltpx = (MltpxValue)c9x.mltpx;
-  mixWarn = c9x.mixWarn;
-  enableFmTrim=c9x.enableFmTrim;
-  sOffset = c9x.sOffset;
-}
-
 t_Ersky9xMixData_v11::operator MixData ()
 {
   MixData c9x;
@@ -516,7 +278,15 @@ t_Ersky9xMixData_v11::operator MixData ()
     c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-21);
   }
 
-  c9x.curve = curve;
+  if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
+
   c9x.delayUp = delayUp;
   c9x.delayDown = delayDown;
   c9x.speedUp = speedUp;
@@ -524,60 +294,11 @@ t_Ersky9xMixData_v11::operator MixData ()
   c9x.carryTrim = carryTrim;
   c9x.mltpx = (MltpxValue)mltpx;
   c9x.mixWarn = mixWarn;
-  c9x.enableFmTrim=enableFmTrim;
+  // c9x.enableFmTrim=enableFmTrim;
   c9x.sOffset = sOffset;
   return c9x;
 }
 
-int8_t ersky9xFromSource_v10(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("er9x on this board doesn't have Rotary Encoders") + "\n";
-    v1 = 5+source.index;
-  }
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 8;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 0; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 10+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 13+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 21+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 36+source.index;
-  return v1;
-}
-
-int8_t ersky9xFromSource_v11(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("er9x on this board doesn't have Rotary Encoders") + "\n";
-    v1 = 5+source.index;
-  }
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 8;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 0; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 10+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 13+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 21+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 36+source.index;
-  return v1;
-}
-
-
 RawSource ersky9xToSource_v10(int8_t value)
 {
   if (value == 0) {
@@ -634,33 +355,6 @@ RawSource ersky9xToSource_v11(int8_t value)
   }
 }
 
-t_Ersky9xCustomSwData_v10::t_Ersky9xCustomSwData_v10(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = ersky9xFromSource_v10(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    v2 = ersky9xFromSource_v10(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = er9xFromSwitch(RawSwitch(c9x.val1));
-    v2 = er9xFromSwitch(RawSwitch(c9x.val2));
-  }
-
-  if (func>ERSKY9X_MAX_CSFUNC ) {
-    EEPROMWarnings += ::QObject::tr("ersky9x does not support Custom Switch function %1").arg(getFuncName(func)) + "\n";
-    func=0;
-    v1=0;
-    v2=0;
-  }
-}
-
 Ersky9xCustomSwData_v10::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -684,33 +378,6 @@ Ersky9xCustomSwData_v10::operator CustomSwData ()
   return c9x;
 }
 
-t_Ersky9xCustomSwData_v11::t_Ersky9xCustomSwData_v11(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = ersky9xFromSource_v11(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    v2 = ersky9xFromSource_v11(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = er9xFromSwitch(RawSwitch(c9x.val1));
-    v2 = er9xFromSwitch(RawSwitch(c9x.val2));
-  }
-
-  if (func>ERSKY9X_MAX_CSFUNC ) {
-    EEPROMWarnings += ::QObject::tr("ersky9x does not support Custom Switch function %1").arg(getFuncName(func)) + "\n";
-    func=0;
-    v1=0;
-    v2=0;
-  }
-}
-
 Ersky9xCustomSwData_v11::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -739,13 +406,6 @@ t_Ersky9xSafetySwData_v10::t_Ersky9xSafetySwData_v10()
   memset(this, 0, sizeof(t_Ersky9xSafetySwData_v10));
 }
 
-t_Ersky9xSafetySwData_v10::t_Ersky9xSafetySwData_v10(SafetySwData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xSafetySwData_v10));
-  swtch = er9xFromSwitch(c9x.swtch);
-  val = c9x.val;
-}
-
 t_Ersky9xSafetySwData_v10::operator SafetySwData ()
 {
   SafetySwData c9x;
@@ -759,13 +419,6 @@ t_Ersky9xSafetySwData_v11::t_Ersky9xSafetySwData_v11()
   memset(this, 0, sizeof(t_Ersky9xSafetySwData_v11));
 }
 
-t_Ersky9xSafetySwData_v11::t_Ersky9xSafetySwData_v11(SafetySwData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xSafetySwData_v11));
-  opt.ss.swtch = ersky9xFromSwitch(c9x.swtch);
-  opt.ss.val = c9x.val;
-}
-
 t_Ersky9xSafetySwData_v11::operator SafetySwData ()
 {
   SafetySwData c9x;
@@ -779,29 +432,6 @@ t_Ersky9xFrSkyChannelData_v10::t_Ersky9xFrSkyChannelData_v10()
   memset(this, 0, sizeof(t_Ersky9xFrSkyChannelData_v10));
 }
 
-t_Ersky9xFrSkyChannelData_v10::t_Ersky9xFrSkyChannelData_v10(FrSkyChannelData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xFrSkyChannelData_v10));
-  ratio = c9x.ratio;
-  alarms_value[0] = c9x.alarms[0].value;
-  alarms_value[1] = c9x.alarms[1].value;
-  alarms_level = (c9x.alarms[1].level << 2) + c9x.alarms[0].level;
-  alarms_greater = (c9x.alarms[1].greater << 1) + c9x.alarms[0].greater;
-  if (c9x.type==0) {
-    if (c9x.multiplier==0) {
-      type = 0;
-    } else if (c9x.multiplier==1) {
-      type = 2;
-    } else {
-      EEPROMWarnings += ::QObject::tr("er9x does not support this range for A1/A2") + "\n";
-    }      
-  } else if (c9x.type==1 || c9x.type==3) {
-    type=c9x.type;
-  } else {
-    EEPROMWarnings += ::QObject::tr("er9x does not support this telemetry units") + "\n";
-  }
-}
-
 t_Ersky9xFrSkyChannelData_v10::operator FrSkyChannelData ()
 {
   FrSkyChannelData c9x;
@@ -826,29 +456,6 @@ t_Ersky9xFrSkyChannelData_v11::t_Ersky9xFrSkyChannelData_v11()
   memset(this, 0, sizeof(t_Ersky9xFrSkyChannelData_v11));
 }
 
-t_Ersky9xFrSkyChannelData_v11::t_Ersky9xFrSkyChannelData_v11(FrSkyChannelData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xFrSkyChannelData_v11));
-  ratio = c9x.ratio;
-  alarms_value[0] = c9x.alarms[0].value;
-  alarms_value[1] = c9x.alarms[1].value;
-  alarms_level = (c9x.alarms[1].level << 2) + c9x.alarms[0].level;
-  alarms_greater = (c9x.alarms[1].greater << 1) + c9x.alarms[0].greater;
-  if (c9x.type==0) {
-    if (c9x.multiplier==0) {
-      type = 0;
-    } else if (c9x.multiplier==1) {
-      type = 2;
-    } else {
-      EEPROMWarnings += ::QObject::tr("er9x does not support this range for A1/A2") + "\n";
-    }      
-  } else if (c9x.type==1 || c9x.type==3) {
-    type=c9x.type;
-  } else {
-    EEPROMWarnings += ::QObject::tr("er9x does not support this telemetry units") + "\n";
-  }
-}
-
 t_Ersky9xFrSkyChannelData_v11::operator FrSkyChannelData ()
 {
   FrSkyChannelData c9x;
@@ -873,13 +480,6 @@ t_Ersky9xFrSkyData_v10::t_Ersky9xFrSkyData_v10()
   memset(this, 0, sizeof(t_Ersky9xFrSkyData_v10));
 }
 
-t_Ersky9xFrSkyData_v10::t_Ersky9xFrSkyData_v10(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xFrSkyData_v10));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1]; 
-}
-
 t_Ersky9xFrSkyData_v10::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -893,13 +493,6 @@ t_Ersky9xFrSkyData_v11::t_Ersky9xFrSkyData_v11()
   memset(this, 0, sizeof(t_Ersky9xFrSkyData_v11));
 }
 
-t_Ersky9xFrSkyData_v11::t_Ersky9xFrSkyData_v11(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xFrSkyData_v11));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1]; 
-}
-
 t_Ersky9xFrSkyData_v11::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -908,168 +501,6 @@ t_Ersky9xFrSkyData_v11::operator FrSkyData ()
   return c9x;
 }
 
-t_Ersky9xModelData_v10::t_Ersky9xModelData_v10(ModelData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xModelData_v10));
-
-  if (c9x.used) {
-    setEEPROMString(name, c9x.name, sizeof(name));
-    reserved_spare = 0;
-    spare21 = 0;
-    sparex = 0;
-    spare22 = 0;
-    for (int i=0; i<2; i++) {
-      timer[i].tmrModeA = setErSky9xTimerMode(c9x.timers[i].mode);
-      timer[i].tmrModeB = c9x.timers[i].modeB;
-      timer[i].tmrDir = c9x.timers[i].dir;
-      timer[i].tmrVal = c9x.timers[i].val;
-    }
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case PPM16:
-        protocol = 3;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += QObject::tr("Ersky9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    traineron = c9x.traineron;
-    // t2throttle = c9x.t2throttle;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    thrTrim = c9x.thrTrim;
-    thrExpo = c9x.thrExpo;
-    trimInc = c9x.trimInc;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    for (unsigned int i=0; i<C9X_MAX_CUSTOM_FUNCTIONS; i++)
-      if (c9x.funcSw[i].func == FuncInstantTrim && c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE) {
-        trimSw = er9xFromSwitch(c9x.funcSw[i].swtch);
-        break;
-      }
-    beepANACenter = (uint8_t)(c9x.beepANACenter &0x7F);
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    swashInvertELE = c9x.swashRingData.invertELE;
-    swashInvertAIL = c9x.swashRingData.invertAIL;
-    swashInvertCOL = c9x.swashRingData.invertCOL;
-    swashType = c9x.swashRingData.type;
-    swashCollectiveSource = ersky9xFromSource_v10(c9x.swashRingData.collectiveSource);
-    swashRingValue = c9x.swashRingData.value;
-    for (int i=0; i<ERSKY9X_MAX_MIXERS_V10; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<ERSKY9X_NUM_CHNOUT_V10; i++)
-      limitData[i] = c9x.limitData[i];
-
-    // expoData
-    for (unsigned int i=0; i<NUM_STICKS; i++) {
-      // first we find the switches
-      for (int e=0; e<C9X_MAX_EXPOS && c9x.expoData[e].mode; e++) {
-        if (c9x.expoData[e].chn == i) {
-          if (c9x.expoData[e].swtch.type!=SWITCH_TYPE_NONE) {
-            if (!expoData[i].drSw1)
-              expoData[i].drSw1 = -er9xFromSwitch(c9x.expoData[e].swtch);
-            else if (er9xFromSwitch(c9x.expoData[e].swtch) != -expoData[i].drSw1 && !expoData[i].drSw2) {
-              expoData[i].drSw2 = -er9xFromSwitch(c9x.expoData[e].swtch);
-            }
-          }
-        }
-      }
-
-      if (expoData[i].drSw1 && !expoData[i].drSw2) {
-        expoData[i].drSw1 = -expoData[i].drSw1;
-      }
-
-      for (int pos=0; pos<3; pos++) {
-        int swtch1=0, swtch2=0;
-        if (expoData[i].drSw1 && !expoData[i].drSw2) {
-          switch (pos) {
-            case 0:
-              swtch1 = -expoData[i].drSw1;
-              break;
-            case 1:
-              swtch1 = expoData[i].drSw1;
-              break;
-            default:
-              swtch1 = expoData[i].drSw1;
-              break;
-          }
-        }
-        else {
-          switch (pos) {
-            case 0:
-              swtch1 = -expoData[i].drSw1;
-              break;
-            case 1:
-              swtch1 = expoData[i].drSw1;
-              swtch2 = -expoData[i].drSw2;
-              break;
-            default:
-              swtch1 = expoData[i].drSw1;
-              swtch2 = expoData[i].drSw2;
-              break;
-          }
-        }
-        for (int mode=0; mode<2; mode++) {
-          for (int e=0; e<C9X_MAX_EXPOS && c9x.expoData[e].mode; e++) {
-            if (c9x.expoData[e].chn == i && !c9x.expoData[e].phases) {
-              if (c9x.expoData[e].swtch.type==SWITCH_TYPE_NONE || c9x.expoData[e].swtch == er9xToSwitch(swtch1) || c9x.expoData[e].swtch == er9xToSwitch(swtch2)) {
-                if (c9x.expoData[e].mode == 3 || (c9x.expoData[e].mode==2 && mode==0) || (c9x.expoData[e].mode==1 && mode==1)) {
-                  expoData[i].expo[pos][0][mode] = c9x.expoData[e].expo;
-                  expoData[i].expo[pos][1][mode] = c9x.expoData[e].weight - 100;
-                  break;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    for (int i=0; i<NUM_STICKS; i++)
-      trim[i] = std::max(-125, std::min(125, c9x.phaseData[0].trim[i]));
-    
-    for (int i=0; i<ERSKY9X_MAX_CURVE5; i++)
-      if  (c9x.curves[i].count==5) {
-        if  (c9x.curves[i].custom)
-          EEPROMWarnings += QObject::tr("ErSky9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1) + "\n";    
-        for (int j=0; j<5; j++)
-            curves5[i][j] = c9x.curves[i].points[j].y;
-      } else {
-        EEPROMWarnings += QObject::tr("ErSky9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i].count).arg(i+1) + "\n";
-      }   
-    for (int i=0; i<ERSKY9X_MAX_CURVE9; i++)
-      if  (c9x.curves[i+ERSKY9X_MAX_CURVE5].count==9) {
-        if  (c9x.curves[i+ERSKY9X_MAX_CURVE5].custom)
-          EEPROMWarnings += QObject::tr("ErSky9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1+ERSKY9X_MAX_CURVE5) + "\n";    
-        for (int j=0; j<9; j++)
-            curves9[i][j] = c9x.curves[i+ERSKY9X_MAX_CURVE5].points[j].y;
-      } else {
-        EEPROMWarnings += QObject::tr("ErSky9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i+ERSKY9X_MAX_CURVE5].count).arg(i+1+ERSKY9X_MAX_CURVE5) + "\n";
-      }   
-
-    for (int i=0; i<ERSKY9X_NUM_CSW_V10; i++)
-      customSw[i] = c9x.customSw[i];
-
-    for (int i=0; i<ERSKY9X_NUM_CHNOUT_V10; i++)
-      safetySw[i] = c9x.safetySw[i];
-    
-    frsky = c9x.frsky;
-    FrSkyUsrProto = c9x.frsky.usrProto;
-    FrSkyImperial = c9x.frsky.imperial;
-    FrSkyGpsAlt=c9x.frsky.FrSkyGpsAlt;
-  }
-}
-
 t_Ersky9xModelData_v10::operator ModelData ()
 {
   ModelData c9x;
@@ -1137,7 +568,10 @@ t_Ersky9xModelData_v10::operator ModelData ()
         c9x.expoData[e].swtch = er9xToSwitch(dr == 0 ? -expoData[ch].drSw1 : (dr == 1 ? -expoData[ch].drSw2 : 0));
       }
       c9x.expoData[e].chn = ch;
-      c9x.expoData[e].expo = expoData[ch].expo[pos][0][0];
+      if (expoData[ch].expo[pos][0][0]) {
+        c9x.expoData[e].curve.type = CurveReference::CURVE_REF_EXPO;
+        c9x.expoData[e].curve.value = expoData[ch].expo[pos][0][0];
+      }
       c9x.expoData[e].weight = 100 + expoData[ch].expo[pos][1][0];
       if (expoData[ch].expo[pos][0][0] == expoData[ch].expo[pos][0][1] && expoData[ch].expo[pos][1][0] == expoData[ch].expo[pos][1][1]) {
         c9x.expoData[e++].mode = 3;
@@ -1148,7 +582,10 @@ t_Ersky9xModelData_v10::operator ModelData ()
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
-          c9x.expoData[e].expo = expoData[ch].expo[pos][0][1];
+          if (expoData[ch].expo[pos][0][1]) {
+            c9x.expoData[e].curve.type = CurveReference::CURVE_REF_EXPO;
+            c9x.expoData[e].curve.value = expoData[ch].expo[pos][0][1];
+          }
           c9x.expoData[e++].weight = 100 + expoData[ch].expo[pos][1][1];
         }
       }
@@ -1159,7 +596,6 @@ t_Ersky9xModelData_v10::operator ModelData ()
     c9x.phaseData[0].trim[i] = trim[i];
 
   for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1167,7 +603,6 @@ t_Ersky9xModelData_v10::operator ModelData ()
     }
   }
   for (int i=0; i<ERSKY9X_MAX_CURVE9; i++) {
-    c9x.curves[ERSKY9X_MAX_CURVE5 + i].custom = false;
     c9x.curves[ERSKY9X_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[ERSKY9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1188,180 +623,6 @@ t_Ersky9xModelData_v10::operator ModelData ()
   return c9x;
 }
 
-t_Ersky9xModelData_v11::t_Ersky9xModelData_v11(ModelData &c9x)
-{
-  memset(this, 0, sizeof(t_Ersky9xModelData_v11));
-
-  if (c9x.used) {
-    setEEPROMString(name, c9x.name, sizeof(name));
-    sparex = 0;
-    spare22 = 0;
-    version=ERSKY9X_MDVERS11;
-    for (int i=0; i<2; i++) {
-      timer[i].tmrModeA = setErSky9xTimerMode(c9x.timers[i].mode);
-      timer[i].tmrModeB = c9x.timers[i].modeB;
-      timer[i].tmrDir = c9x.timers[i].dir;
-      timer[i].tmrVal = c9x.timers[i].val;
-    }
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case PPM16:
-        protocol = 3;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += QObject::tr("Ersky9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    traineron = c9x.traineron;
-    // t2throttle = c9x.t2throttle;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    thrTrim = c9x.thrTrim;
-    thrExpo = c9x.thrExpo;
-    trimInc = c9x.trimInc;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    for (unsigned int i=0; i<C9X_MAX_CUSTOM_FUNCTIONS; i++)
-      if (c9x.funcSw[i].func == FuncInstantTrim && c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE) {
-        trimSw = er9xFromSwitch(c9x.funcSw[i].swtch);
-        break;
-      }
-    beepANACenter = (uint8_t)(c9x.beepANACenter &0x7F);
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    swashInvertELE = c9x.swashRingData.invertELE;
-    swashInvertAIL = c9x.swashRingData.invertAIL;
-    swashInvertCOL = c9x.swashRingData.invertCOL;
-    swashType = c9x.swashRingData.type;
-    swashCollectiveSource = ersky9xFromSource_v11(c9x.swashRingData.collectiveSource);
-    swashRingValue = c9x.swashRingData.value;
-    for (int i=0; i<ERSKY9X_MAX_MIXERS_V11; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<ERSKY9X_NUM_CHNOUT_V11; i++)
-      limitData[i] = c9x.limitData[i];
-
-    // expoData
-    for (unsigned int i=0; i<4; i++) {
-      // first we find the switches
-      for (int e=0; e<C9X_MAX_EXPOS && c9x.expoData[e].mode; e++) {
-        if (c9x.expoData[e].chn == i) {
-          if (c9x.expoData[e].swtch.type!=SWITCH_TYPE_NONE) {
-            if (!expoData[i].drSw1)
-              expoData[i].drSw1 = -er9xFromSwitch(c9x.expoData[e].swtch);
-            else if (er9xFromSwitch(c9x.expoData[e].swtch) != -expoData[i].drSw1 && !expoData[i].drSw2) {
-              expoData[i].drSw2 = -er9xFromSwitch(c9x.expoData[e].swtch);
-            }
-          }
-        }
-      }
-
-      if (expoData[i].drSw1 && !expoData[i].drSw2) {
-        expoData[i].drSw1 = -expoData[i].drSw1;
-      }
-
-      for (int pos=0; pos<3; pos++) {
-        int swtch1=0, swtch2=0;
-        if (expoData[i].drSw1 && !expoData[i].drSw2) {
-          switch (pos) {
-            case 0:
-              swtch1 = -expoData[i].drSw1;
-              break;
-            case 1:
-              swtch1 = expoData[i].drSw1;
-              break;
-            default:
-              swtch1 = expoData[i].drSw1;
-              break;
-          }
-        }
-        else {
-          switch (pos) {
-            case 0:
-              swtch1 = -expoData[i].drSw1;
-              break;
-            case 1:
-              swtch1 = expoData[i].drSw1;
-              swtch2 = -expoData[i].drSw2;
-              break;
-            default:
-              swtch1 = expoData[i].drSw1;
-              swtch2 = expoData[i].drSw2;
-              break;
-          }
-        }
-        for (int mode=0; mode<2; mode++) {
-          for (int e=0; e<C9X_MAX_EXPOS && c9x.expoData[e].mode; e++) {
-            if (c9x.expoData[e].chn == i && !c9x.expoData[e].phases) {
-              if (c9x.expoData[e].swtch.type==SWITCH_TYPE_NONE || c9x.expoData[e].swtch == er9xToSwitch(swtch1) || c9x.expoData[e].swtch == er9xToSwitch(swtch2)) {
-                if (c9x.expoData[e].mode == 3 || (c9x.expoData[e].mode==2 && mode==0) || (c9x.expoData[e].mode==1 && mode==1)) {
-                  expoData[i].expo[pos][0][mode] = c9x.expoData[e].expo;
-                  expoData[i].expo[pos][1][mode] = c9x.expoData[e].weight - 100;
-                  break;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    for (int i=0; i<NUM_STICKS; i++)
-      trim[i] = std::max(-125, std::min(125, c9x.phaseData[0].trim[i]));
-    for (int i=0; i<18; i++)
-      curvexy[i]=0;
-    for (int i=0; i<ERSKY9X_MAX_CURVE5; i++)
-      if  (c9x.curves[i].count==5) {
-        if  (c9x.curves[i].custom)
-          EEPROMWarnings += QObject::tr("ErSky9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1) + "\n";    
-        for (int j=0; j<5; j++)
-            curves5[i][j] = c9x.curves[i].points[j].y;
-      } else {
-        EEPROMWarnings += QObject::tr("ErSky9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i].count).arg(i+1) + "\n";
-      }   
-    for (int i=0; i<ERSKY9X_MAX_CURVE9; i++)
-      if  (c9x.curves[i+ERSKY9X_MAX_CURVE5].count==9) {
-        if  (c9x.curves[i+ERSKY9X_MAX_CURVE5].custom)
-          EEPROMWarnings += QObject::tr("ErSky9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1+ERSKY9X_MAX_CURVE5) + "\n";    
-        for (int j=0; j<9; j++)
-            curves9[i][j] = c9x.curves[i+ERSKY9X_MAX_CURVE5].points[j].y;
-      } else {
-        EEPROMWarnings += QObject::tr("ErSky9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i+ERSKY9X_MAX_CURVE5].count).arg(i+1+ERSKY9X_MAX_CURVE5) + "\n";
-      }   
-
-    for (int i=0; i<ERSKY9X_NUM_CSW_V11; i++)
-      customSw[i] = c9x.customSw[i];
-
-    for (int i=0; i<ERSKY9X_NUM_CHNOUT_V11; i++)
-      safetySw[i] = c9x.safetySw[i];
-    
-    frsky = c9x.frsky;
-    FrSkyUsrProto = c9x.frsky.usrProto;
-    FrSkyImperial = c9x.frsky.imperial;
-    FrSkyGpsAlt=c9x.frsky.FrSkyGpsAlt;
-    for (int i=0; i<8; i++) {
-      frskyAlarms.alarmData[i].frskyAlarmLimit=c9x.frskyalarms[i].frskyAlarmLimit;
-      frskyAlarms.alarmData[i].frskyAlarmSound=c9x.frskyalarms[i].frskyAlarmSound;
-      frskyAlarms.alarmData[i].frskyAlarmType=c9x.frskyalarms[i].frskyAlarmType;
-    }
-    for (int i=0; i<8; i++) {
-        customDisplayIndex[i]=c9x.customdisplay[i];
-    }
-    for (int i=0; i<5;i++) {
-      gvars[i].gvar=c9x.phaseData[0].gvars[i];
-      gvars[i].gvsource=c9x.gvsource[i];
-    }
-  }
-}
-
 t_Ersky9xModelData_v11::operator ModelData ()
 {
   ModelData c9x;
@@ -1429,7 +690,10 @@ t_Ersky9xModelData_v11::operator ModelData ()
         c9x.expoData[e].swtch = er9xToSwitch(dr == 0 ? -expoData[ch].drSw1 : (dr == 1 ? -expoData[ch].drSw2 : 0));
       }
       c9x.expoData[e].chn = ch;
-      c9x.expoData[e].expo = expoData[ch].expo[pos][0][0];
+      if (expoData[ch].expo[pos][0][0]) {
+        c9x.expoData[e].curve.type = CurveReference::CURVE_REF_EXPO;
+        c9x.expoData[e].curve.value = expoData[ch].expo[pos][0][0];
+      }
       c9x.expoData[e].weight = 100 + expoData[ch].expo[pos][1][0];
       if (expoData[ch].expo[pos][0][0] == expoData[ch].expo[pos][0][1] && expoData[ch].expo[pos][1][0] == expoData[ch].expo[pos][1][1]) {
         c9x.expoData[e++].mode = 3;
@@ -1440,7 +704,10 @@ t_Ersky9xModelData_v11::operator ModelData ()
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
-          c9x.expoData[e].expo = expoData[ch].expo[pos][0][1];
+          if (expoData[ch].expo[pos][0][1]) {
+            c9x.expoData[e].curve.type = CurveReference::CURVE_REF_EXPO;
+            c9x.expoData[e].curve.value = expoData[ch].expo[pos][0][1];
+          }
           c9x.expoData[e++].weight = 100 + expoData[ch].expo[pos][1][1];
         }
       }
@@ -1451,7 +718,6 @@ t_Ersky9xModelData_v11::operator ModelData ()
     c9x.phaseData[0].trim[i] = trim[i];
 
   for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1459,7 +725,6 @@ t_Ersky9xModelData_v11::operator ModelData ()
     }
   }
   for (int i=0; i<ERSKY9X_MAX_CURVE9; i++) {
-    c9x.curves[ERSKY9X_MAX_CURVE5 + i].custom = false;
     c9x.curves[ERSKY9X_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[ERSKY9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1483,11 +748,11 @@ t_Ersky9xModelData_v11::operator ModelData ()
     c9x.frskyalarms[i].frskyAlarmType=frskyAlarms.alarmData[i].frskyAlarmType;
   }
   for (int i=0; i<8; i++) {
-        c9x.customdisplay[i]=customDisplayIndex[i];
+    c9x.customdisplay[i]=customDisplayIndex[i];
   }
   for (int i=0; i<5;i++) {
-      c9x.phaseData[0].gvars[i]=gvars[i].gvar;
-      c9x.gvsource[i]=gvars[i].gvsource;
+    c9x.phaseData[0].gvars[i]=gvars[i].gvar;
+    c9x.gvsource[i]=gvars[i].gvsource;
   }
   return c9x;
 }
diff --git a/companion/src/firmwares/ersky9x/ersky9xeeprom.h b/companion/src/firmwares/ersky9x/ersky9xeeprom.h
index 19877363a..3f2be94fc 100644
--- a/companion/src/firmwares/ersky9x/ersky9xeeprom.h
+++ b/companion/src/firmwares/ersky9x/ersky9xeeprom.h
@@ -51,8 +51,6 @@ PACK(typedef struct t_Ersky9xTrainerMix {
 
   operator TrainerMix();
   t_Ersky9xTrainerMix();
-  t_Ersky9xTrainerMix(TrainerMix&);
-
 }) Ersky9xTrainerMix; //
 
 PACK(typedef struct t_Ersky9xTrainerData {
@@ -61,8 +59,6 @@ PACK(typedef struct t_Ersky9xTrainerData {
 
   operator TrainerData();
   t_Ersky9xTrainerData();
-  t_Ersky9xTrainerData(TrainerData&);
-
 }) Ersky9xTrainerData;
 
 PACK(typedef struct t_Ersky9xGeneral {
@@ -122,8 +118,6 @@ PACK(typedef struct t_Ersky9xGeneral {
   uint8_t	 rotaryDivisor ;
   operator GeneralSettings();
   t_Ersky9xGeneral();
-  t_Ersky9xGeneral(GeneralSettings&);
-
 }) Ersky9xGeneral;
 
 PACK(typedef struct t_Ersky9xExpoData {
@@ -143,7 +137,6 @@ PACK(typedef struct t_Ersky9xLimitData {
 
   operator LimitData();
   t_Ersky9xLimitData() ;
-  t_Ersky9xLimitData(LimitData&);
 }) Ersky9xLimitData;
 
 #define MLTPX_ADD  0
@@ -170,7 +163,6 @@ PACK(typedef struct t_Ersky9xMixData_v10 {
 
   operator MixData();
   t_Ersky9xMixData_v10();
-  t_Ersky9xMixData_v10(MixData&);
 }) Ersky9xMixData_v10;
 
 PACK(typedef struct t_Ersky9xMixData_v11 {
@@ -192,7 +184,6 @@ PACK(typedef struct t_Ersky9xMixData_v11 {
   uint8_t  res[4];
   operator MixData();
   t_Ersky9xMixData_v11();
-  t_Ersky9xMixData_v11(MixData&);
 }) Ersky9xMixData_v11;
 
 PACK(typedef struct t_Ersky9xCustomSwData_v10 { // Custom Switches data
@@ -202,8 +193,6 @@ PACK(typedef struct t_Ersky9xCustomSwData_v10 { // Custom Switches data
 
   operator CustomSwData();
   t_Ersky9xCustomSwData_v10() { memset(this, 0, sizeof(t_Ersky9xCustomSwData_v10)); }
-  t_Ersky9xCustomSwData_v10(CustomSwData&);
-
 }) Ersky9xCustomSwData_v10;
 
 PACK(typedef struct t_Ersky9xCustomSwData_v11 { // Custom Switches data
@@ -215,8 +204,6 @@ PACK(typedef struct t_Ersky9xCustomSwData_v11 { // Custom Switches data
 
   operator CustomSwData();
   t_Ersky9xCustomSwData_v11() { memset(this, 0, sizeof(t_Ersky9xCustomSwData_v11)); }
-  t_Ersky9xCustomSwData_v11(CustomSwData&);
-
 }) Ersky9xCustomSwData_v11;
 
 PACK(typedef struct t_Ersky9xSafetySwData_v10 { // Custom Switches data
@@ -225,7 +212,6 @@ PACK(typedef struct t_Ersky9xSafetySwData_v10 { // Custom Switches data
 
   operator SafetySwData();
   t_Ersky9xSafetySwData_v10();
-  t_Ersky9xSafetySwData_v10(SafetySwData&);
 }) Ersky9xSafetySwData_v10;
 
 PACK(typedef struct t_Ersky9xSafetySwData_v11 { // Custom Switches data
@@ -246,7 +232,6 @@ PACK(typedef struct t_Ersky9xSafetySwData_v11 { // Custom Switches data
 
   operator SafetySwData();
   t_Ersky9xSafetySwData_v11();
-  t_Ersky9xSafetySwData_v11(SafetySwData&);
 }) Ersky9xSafetySwData_v11;
 
 PACK(typedef struct t_Ersky9xgvar {
@@ -281,7 +266,6 @@ PACK(typedef struct t_Ersky9xFrSkyChannelData_v10 {
 
   operator FrSkyChannelData();
   t_Ersky9xFrSkyChannelData_v10();
-  t_Ersky9xFrSkyChannelData_v10(FrSkyChannelData&);
 }) Ersky9xFrSkyChannelData_v10;
 
 PACK(typedef struct t_Ersky9xFrSkyData_v10 {
@@ -289,7 +273,6 @@ PACK(typedef struct t_Ersky9xFrSkyData_v10 {
 
   operator FrSkyData();
   t_Ersky9xFrSkyData_v10();
-  t_Ersky9xFrSkyData_v10(FrSkyData&);
 }) Ersky9xFrSkyData_v10;
 
 PACK(typedef struct t_Ersky9xFrSkyChannelData_v11 {
@@ -303,7 +286,6 @@ PACK(typedef struct t_Ersky9xFrSkyChannelData_v11 {
   
   operator FrSkyChannelData();
   t_Ersky9xFrSkyChannelData_v11();
-  t_Ersky9xFrSkyChannelData_v11(FrSkyChannelData&);
 }) Ersky9xFrSkyChannelData_v11;
 
 PACK(typedef struct t_Ersky9xFrSkyData_v11 {
@@ -311,7 +293,6 @@ PACK(typedef struct t_Ersky9xFrSkyData_v11 {
 
   operator FrSkyData();
   t_Ersky9xFrSkyData_v11();
-  t_Ersky9xFrSkyData_v11(FrSkyData&);
 }) Ersky9xFrSkyData_v11;
 
 PACK(typedef struct t_Ersky9xFrSkyalarms_v11 {
@@ -390,7 +371,6 @@ PACK(typedef struct t_Ersky9xModelData_v10 {
   Ersky9xTimerMode_v10 timer[2] ;
   operator ModelData();
   t_Ersky9xModelData_v10() { memset(this, 0, sizeof(t_Ersky9xModelData_v10)); }
-  t_Ersky9xModelData_v10(ModelData&);
 }) Ersky9xModelData_v10;
 
 PACK(typedef struct t_Ersky9xModelData_v11 {
@@ -449,8 +429,6 @@ PACK(typedef struct t_Ersky9xModelData_v11 {
 
   operator ModelData();
   t_Ersky9xModelData_v11() { memset(this, 0, sizeof(t_Ersky9xModelData_v11)); }
-  t_Ersky9xModelData_v11(ModelData&);
 }) Ersky9xModelData_v11;
 
 #endif
-/*eof*/
diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
index 412d13520..88129b997 100644
--- a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
+++ b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
@@ -228,33 +228,10 @@ bool Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esi
 
 int Ersky9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
 {
-  EEPROMWarnings.clear();
+  std::cout << "NO!\n";
+  // TODO an error
 
-  efile->EeFsCreate(eeprom, EESIZE_SKY9X, BOARD_SKY9X);
-
-  Ersky9xGeneral ersky9xGeneral(radioData.generalSettings);
-  int sz = efile->writeRlc2(FILE_GENERAL, FILE_TYP_GENERAL, (uint8_t*)&ersky9xGeneral, sizeof(Ersky9xGeneral));
-  if(sz != sizeof(Ersky9xGeneral)) {
-    return 0;
-  }
-
-  for (int i=0; i<getMaxModels(); i++) {
-    if (!radioData.models[i].isempty()) {
-      Ersky9xModelData_v11 ersky9xModel(radioData.models[i]);
-      applyStickModeToModel(ersky9xModel, radioData.generalSettings.stickMode+1);
-      sz = efile->writeRlc2(FILE_MODEL(i), FILE_TYP_MODEL, (uint8_t*)&ersky9xModel, sizeof(Ersky9xModelData_v11));
-      if(sz != sizeof(Ersky9xModelData_v11)) {
-        return 0;
-      }
-    }
-  }
-
-  if (!EEPROMWarnings.isEmpty())
-    QMessageBox::warning(NULL,
-        QObject::tr("Warning"),
-        QObject::tr("EEPROM saved with these warnings:") + "\n- " + EEPROMWarnings.remove(EEPROMWarnings.length()-1, 1).replace("\n", "\n- "));
-
-  return EESIZE_SKY9X;
+  return 0;
 }
 
 int Ersky9xInterface::getSize(ModelData &model)
@@ -272,12 +249,6 @@ int Ersky9xInterface::getCapability(const Capability capability)
   switch (capability) {
     case Mixes:
       return ERSKY9X_MAX_MIXERS_V11;
-    case NumCurves5:
-      return ERSKY9X_MAX_CURVE5;
-    case NumCurves9:
-      return ERSKY9X_MAX_CURVE9;
-    case MixFmTrim:
-      return 1;      
     case PPMExtCtrl:
       return 1;
     case ModelTrainerEnable:
@@ -306,10 +277,8 @@ int Ersky9xInterface::getCapability(const Capability capability)
       return 2;
     case Pots:
       return 3;
-    case GvarsNum:
+    case Gvars:
       return 7;
-    case GvarsOfsNum:
-      return 5;
     case Switches:
       return 7;
     case SwitchesPositions:
@@ -338,8 +307,6 @@ int Ersky9xInterface::getCapability(const Capability capability)
       return 1;
     case OptrexDisplay:
       return 1;
-    case TimerTriggerB:
-      return 2;
     case HasAltitudeSel:
     case HasCurrentCalibration:
     case HasVolume:
@@ -350,12 +317,8 @@ int Ersky9xInterface::getCapability(const Capability capability)
       return 125;
     case MaxVolume:
       return 23;
-    case Gvars:
     case GvarsHaveSources:
     case GvarsAsSources:
-    case GvarsAsWeight:
-      return 1;
-    case InstantTrimSW:
       return 1;
     case TelemetryMaxMultiplier:
       return 2;
diff --git a/companion/src/firmwares/gruvin9x/gruvin9xeeprom.cpp b/companion/src/firmwares/gruvin9x/gruvin9xeeprom.cpp
index c1c740efb..429899ab5 100644
--- a/companion/src/firmwares/gruvin9x/gruvin9xeeprom.cpp
+++ b/companion/src/firmwares/gruvin9x/gruvin9xeeprom.cpp
@@ -6,7 +6,6 @@
 
 #define EEPROM_VER       106
 
-extern void setEEPROMZString(char *dst, const char *src, int size);
 extern void getEEPROMZString(char *dst, const char *src, int size);
 
 RawSwitch gruvin9xToSwitch(int8_t sw)
@@ -19,18 +18,6 @@ RawSwitch gruvin9xToSwitch(int8_t sw)
     return RawSwitch(SWITCH_TYPE_VIRTUAL, sw > 0 ? sw-9 : sw+9);
 }
 
-int8_t gruvin9xFromSwitch(const RawSwitch & sw)
-{
-  switch (sw.type) {
-    case SWITCH_TYPE_SWITCH:
-      return sw.index;
-    case SWITCH_TYPE_VIRTUAL:
-      return sw.index > 0 ? (9 + sw.index) : (-9 + sw.index);
-    default:
-      return 0;
-  }
-}
-
 t_Gruvin9xTrainerMix_v103::operator TrainerMix()
 {
   TrainerMix c9x;
@@ -50,14 +37,6 @@ t_Gruvin9xTrainerMix_v104::operator TrainerMix()
   return c9x;
 }
 
-t_Gruvin9xTrainerMix_v104::t_Gruvin9xTrainerMix_v104(TrainerMix &c9x)
-{
-  memset(this, 0, sizeof(t_Gruvin9xTrainerMix_v104));
-  srcChn = c9x.src;
-  studWeight = c9x.weight;
-  mode = c9x.mode;
-}
-
 t_Gruvin9xTrainerData_v103::operator TrainerData ()
 {
   TrainerData c9x;
@@ -78,16 +57,6 @@ t_Gruvin9xTrainerData_v104::operator TrainerData ()
   return c9x;
 }
 
-t_Gruvin9xTrainerData_v104::t_Gruvin9xTrainerData_v104(TrainerData &c9x)
-{
-  memset(this, 0, sizeof(t_Gruvin9xTrainerData_v104));
-  for (int i=0; i<NUM_STICKS; i++) {
-    calib[i] = c9x.calib[i];
-    mix[i] = c9x.mix[i];
-  }
-}
-
-
 Gruvin9xGeneral_v103::operator GeneralSettings ()
 {
   GeneralSettings result;
@@ -134,7 +103,6 @@ Gruvin9xGeneral_v103::operator GeneralSettings ()
   result.disableAlarmWarning = disableAlarmWarning;
   result.stickMode = stickMode;
   result.inactivityTimer = inactivityTimer;
-  result.throttleReversed = throttleReversed;
   result.minuteBeep = minuteBeep;
   result.preBeep = preBeep;
   result.flashBeep = flashBeep;
@@ -147,60 +115,6 @@ Gruvin9xGeneral_v103::operator GeneralSettings ()
   return result;
 }
 
-t_Gruvin9xGeneral_v104::t_Gruvin9xGeneral_v104(GeneralSettings &c9x)
-{
-  memset(this, 0, sizeof(t_Gruvin9xGeneral_v104));
-
-  myVers = EEPROM_VER;
-
-  for (int i=0; i<NUM_STICKS+BOARD_9X_NUM_POTS; i++) {
-    calibMid[i] = c9x.calibMid[i];
-    calibSpanNeg[i] = c9x.calibSpanNeg[i];
-    calibSpanPos[i] = c9x.calibSpanPos[i];
-  }
-
-  uint16_t sum = 0;
-  for (int i=0; i<12; i++)
-    sum += calibMid[i];
-  chkSum = sum;
-
-  currModel = c9x.currModel;
-  contrast = c9x.contrast;
-  vBatWarn = c9x.vBatWarn;
-  vBatCalib = c9x.vBatCalib;
-
-  if (c9x.backlightMode == 4)
-    lightSw = 22;
-  if (c9x.backlightMode & 1)
-    lightAutoOff = c9x.backlightDelay;
-
-  trainer = c9x.trainer;
-  view = c9x.view;
-  disableThrottleWarning = c9x.disableThrottleWarning;
-  if (c9x.beeperMode == e_quiet)
-    beeperVal = 0;
-  else if (c9x.beeperMode < e_all)
-    beeperVal = 1;
-  else
-    beeperVal = std::min(4, c9x.beeperLength + 4);
-  switchWarning = c9x.switchWarning;
-  disableMemoryWarning = c9x.disableMemoryWarning;
-  disableAlarmWarning = c9x.disableAlarmWarning;
-  stickMode = c9x.stickMode;
-  inactivityTimer = c9x.inactivityTimer;
-  throttleReversed = c9x.throttleReversed;
-  minuteBeep = c9x.minuteBeep;
-  preBeep = c9x.preBeep;
-  flashBeep = c9x.flashBeep;
-  disableSplashScreen = c9x.splashMode;
-  enableTelemetryAlarm = c9x.enableTelemetryAlarm;
-  spare = 0;
-  filterInput = c9x.filterInput;
-  templateSetup = c9x.templateSetup;
-  PPM_Multiplier = c9x.PPM_Multiplier;
-  // TODO frskyRssiAlarms[2];
-}
-
 Gruvin9xGeneral_v104::operator GeneralSettings ()
 {
   GeneralSettings result;
@@ -234,7 +148,6 @@ Gruvin9xGeneral_v104::operator GeneralSettings ()
   result.disableAlarmWarning = disableAlarmWarning;
   result.stickMode = stickMode;
   result.inactivityTimer = inactivityTimer;
-  result.throttleReversed = throttleReversed;
   result.minuteBeep = minuteBeep;
   result.preBeep = preBeep;
   result.flashBeep = flashBeep;
@@ -252,69 +165,11 @@ t_Gruvin9xExpoData::t_Gruvin9xExpoData()
   memset(this, 0, sizeof(t_Gruvin9xExpoData));
 }
 
-t_Gruvin9xExpoData::t_Gruvin9xExpoData(ExpoData &c9x)
-{
-  mode = c9x.mode;
-  chn = c9x.chn;
-  if (c9x.curveMode==1) {
-    curve = c9x.curveParam;
-  } else {
-    curve=0;
-  }
-  swtch = gruvin9xFromSwitch(c9x.swtch);
-  int zeros=0;
-  int ones=0;
-  int phtemp=c9x.phases;
-  for (int i=0; i<G9X_MAX_PHASES; i++) {
-    if (phtemp & 1) {
-      ones++;
-    } else {
-      zeros++;
-    }
-    phtemp >>=1;
-  }
-  if (zeros==G9X_MAX_PHASES || zeros==0) {
-    phase=0;
-    negPhase=0;
-  } else if (zeros==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<G9X_MAX_PHASES; i++) {
-      if ((phtemp & 1)==0) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=ph+1;
-    negPhase=0;
-  } else if (ones==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<G9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=(ph+1);
-    negPhase=1;
-  } else {
-    phase=0;
-    EEPROMWarnings += ::QObject::tr("Flight modes settings on expos not exported") + "\n";
-  }
-  weight = c9x.weight;
-  expo = c9x.expo;
-}
-
 t_Gruvin9xExpoData::operator ExpoData ()
 {
   ExpoData c9x;
   c9x.mode = mode;
   c9x.chn = chn;
-  c9x.curveParam = curve;
-  c9x.curveMode=1;
   c9x.swtch = gruvin9xToSwitch(swtch);
   if (negPhase) {
     c9x.phases= 1 << (phase -1);
@@ -325,7 +180,18 @@ t_Gruvin9xExpoData::operator ExpoData ()
     c9x.phases &= ~(1 << (phase -1));
   }  
   c9x.weight = weight;
-  c9x.expo = expo;
+  if (expo) {
+    c9x.curve.type = CurveReference::CURVE_REF_EXPO;
+    c9x.curve.value = expo;
+  }
+  else if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
   return c9x;
 }
 
@@ -334,14 +200,6 @@ t_Gruvin9xLimitData::t_Gruvin9xLimitData()
   memset(this, 0, sizeof(t_Gruvin9xLimitData));
 }
 
-t_Gruvin9xLimitData::t_Gruvin9xLimitData(LimitData &c9x)
-{
-  min = c9x.min+100;
-  max = c9x.max-100;
-  revert = c9x.revert;
-  offset = c9x.offset;
-}
-
 t_Gruvin9xLimitData::operator LimitData ()
 {
   LimitData c9x;
@@ -352,67 +210,11 @@ t_Gruvin9xLimitData::operator LimitData ()
   return c9x;
 }
 
-
 t_Gruvin9xMixData::t_Gruvin9xMixData()
 {
   memset(this, 0, sizeof(t_Gruvin9xMixData));
 }
 
-t_Gruvin9xMixData::t_Gruvin9xMixData(MixData &c9x)
-{
-  destCh = c9x.destCh;
-  mixWarn = c9x.mixWarn;
-  swtch = gruvin9xFromSwitch(c9x.swtch);
-
-  if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-    srcRaw = 0;
-    swtch = 0;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-    srcRaw = 1 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("Open9x on this board doesn't have Rotary Encoders") + "\n";
-    srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-    srcRaw = 8; // MAX
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-    srcRaw = 9; // FULL
-    swtch = c9x.srcRaw.index+1;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-    srcRaw = 10 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-    srcRaw = 13 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-    srcRaw = 21 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-    EEPROMWarnings += ::QObject::tr("gruvin9x doesn't have trims as source") + "\n";
-    srcRaw = 0; // use pots instead
-  }
-
-  weight = c9x.weight;
-  curve = c9x.curve;
-  delayUp = c9x.delayUp;
-  delayDown = c9x.delayDown;
-  speedUp = c9x.speedUp;
-  speedDown = c9x.speedDown;
-  if (c9x.carryTrim<0) {
-    EEPROMWarnings += ::QObject::tr("gruvin9x doesn't have swappable trims") + "\n";
-    carryTrim=1;
-  } else {
-    carryTrim = c9x.carryTrim;
-  }
-  mltpx = (MltpxValue)c9x.mltpx;
-//  phase = c9x.phase;
-  sOffset = c9x.sOffset;
-}
-
 t_Gruvin9xMixData::operator MixData ()
 {
   MixData c9x;
@@ -450,7 +252,6 @@ t_Gruvin9xMixData::operator MixData ()
     c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-21);
   }
 
-  c9x.curve = curve;
   c9x.delayUp = delayUp;
   c9x.delayDown = delayDown;
   c9x.speedUp = speedUp;
@@ -458,34 +259,18 @@ t_Gruvin9xMixData::operator MixData ()
   c9x.carryTrim = carryTrim;
   c9x.mltpx = (MltpxValue)mltpx;
   c9x.mixWarn = mixWarn;
-  // c9x.phase = phase;
   c9x.sOffset = sOffset;
-  return c9x;
-}
 
-
-int8_t gruvin9xFromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("gruvin9x on this board doesn't have Rotary Encoders") + "\n";
-    v1 = 5+source.index;
+  if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
   }
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 8;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 0; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 10+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 13+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 21+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 36+source.index;
-  return v1;
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
+
+  return c9x;
 }
 
 RawSource gruvin9xToSource(int8_t value)
@@ -516,33 +301,6 @@ RawSource gruvin9xToSource(int8_t value)
   }
 }
 
-t_Gruvin9xCustomSwData::t_Gruvin9xCustomSwData(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = gruvin9xFromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    v2 = gruvin9xFromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = gruvin9xFromSwitch(RawSwitch(c9x.val1));
-    v2 = gruvin9xFromSwitch(RawSwitch(c9x.val2));
-  }
-
-  if (func>GR9X_MAX_CSFUNC ) {
-    EEPROMWarnings += ::QObject::tr("gruvin9x does not support Custom Switch function %1").arg(getFuncName(func)) + "\n";
-    func=0;
-    v1=0;
-    v2=0;
-  }  
-}
-
 Gruvin9xCustomSwData::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -566,12 +324,6 @@ Gruvin9xCustomSwData::operator CustomSwData ()
   return c9x;
 }
 
-t_Gruvin9xFuncSwData::t_Gruvin9xFuncSwData(FuncSwData &c9x)
-{
-  swtch = gruvin9xFromSwitch(c9x.swtch);
-  func = c9x.func - G9X_NUM_CHNOUT;
-}
-
 Gruvin9xFuncSwData::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -580,12 +332,6 @@ Gruvin9xFuncSwData::operator FuncSwData ()
   return c9x;
 }
 
-t_Gruvin9xSafetySwData::t_Gruvin9xSafetySwData(SafetySwData &c9x)
-{
-  swtch = gruvin9xFromSwitch(c9x.swtch);
-  val = c9x.val;
-}
-
 t_Gruvin9xSafetySwData::operator SafetySwData ()
 {
   SafetySwData c9x;
@@ -599,16 +345,6 @@ t_Gruvin9xSwashRingData::t_Gruvin9xSwashRingData()
   memset(this, 0, sizeof(t_Gruvin9xSwashRingData));
 }
 
-t_Gruvin9xSwashRingData::t_Gruvin9xSwashRingData(SwashRingData &c9x)
-{
-  invertELE = c9x.invertELE;
-  invertAIL = c9x.invertAIL;
-  invertCOL = c9x.invertCOL;
-  type = c9x.type;
-  collectiveSource = gruvin9xFromSource(c9x.collectiveSource);
-  value = c9x.value;
-}
-
 t_Gruvin9xSwashRingData::operator SwashRingData ()
 {
   SwashRingData c9x;
@@ -645,21 +381,7 @@ t_Gruvin9xPhaseData_v106::operator PhaseData ()
   return c9x;
 }
 
-t_Gruvin9xPhaseData_v106::t_Gruvin9xPhaseData_v106(PhaseData &c9x)
-{
-  trim_ext = 0;
-  for (int i=0; i<NUM_STICKS; i++) {
-    trim[i] = (int8_t)(c9x.trim[i] >> 2);
-    trim_ext = (trim_ext & ~(0x03 << (2*i))) + (((c9x.trim[i] & 0x03) << (2*i)));
-  }
-  swtch = gruvin9xFromSwitch(c9x.swtch);
-  setEEPROMZString(name, c9x.name, sizeof(name));
-  fadeIn = c9x.fadeIn;
-  fadeOut = c9x.fadeOut;
-}
-
 extern TimerMode getEr9xTimerMode(int mode);
-extern int setEr9xTimerMode(TimerMode mode);
 
 t_Gruvin9xTimerData::operator TimerData ()
 {
@@ -670,29 +392,11 @@ t_Gruvin9xTimerData::operator TimerData ()
   return c9x;
 }
 
-t_Gruvin9xTimerData::t_Gruvin9xTimerData(TimerData &c9x)
-{
-  mode = setEr9xTimerMode(c9x.mode);
-  val = c9x.val;
-  dir = c9x.dir;
-}
-
 t_Gruvin9xFrSkyChannelData::t_Gruvin9xFrSkyChannelData()
 {
   memset(this, 0, sizeof(t_Gruvin9xFrSkyChannelData));
 }
 
-t_Gruvin9xFrSkyChannelData::t_Gruvin9xFrSkyChannelData(FrSkyChannelData &c9x)
-{
-  memset(this, 0, sizeof(t_Gruvin9xFrSkyChannelData));
-  ratio = c9x.ratio;
-  alarms_value[0] = c9x.alarms[0].value;
-  alarms_value[1] = c9x.alarms[1].value;
-  alarms_level = (c9x.alarms[1].level << 2) + c9x.alarms[0].level;
-  alarms_greater = (c9x.alarms[1].greater << 1) + c9x.alarms[0].greater;
-  type = c9x.type;
-}
-
 t_Gruvin9xFrSkyChannelData::operator FrSkyChannelData ()
 {
   FrSkyChannelData c9x;
@@ -707,19 +411,11 @@ t_Gruvin9xFrSkyChannelData::operator FrSkyChannelData ()
   return c9x;
 }
 
-
 t_Gruvin9xFrSkyData::t_Gruvin9xFrSkyData()
 {
   memset(this, 0, sizeof(t_Gruvin9xFrSkyData));
 }
 
-t_Gruvin9xFrSkyData::t_Gruvin9xFrSkyData(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Gruvin9xFrSkyData));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-}
-
 t_Gruvin9xFrSkyData::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -728,7 +424,6 @@ t_Gruvin9xFrSkyData::operator FrSkyData ()
   return c9x;
 }
 
-
 t_Gruvin9xModelData_v102::operator ModelData ()
 {
   ModelData c9x;
@@ -778,7 +473,6 @@ t_Gruvin9xModelData_v102::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<G9X_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -786,7 +480,6 @@ t_Gruvin9xModelData_v102::operator ModelData ()
     }
   }
   for (int i=0; i<G9X_MAX_CURVE9; i++) {
-    c9x.curves[G9X_MAX_CURVE5 + i].custom = false;
     c9x.curves[G9X_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[G9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -851,7 +544,6 @@ t_Gruvin9xModelData_v103::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<G9X_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -859,7 +551,6 @@ t_Gruvin9xModelData_v103::operator ModelData ()
     }
   }
   for (int i=0; i<G9X_MAX_CURVE9; i++) {
-    c9x.curves[G9X_MAX_CURVE5 + i].custom = false;
     c9x.curves[G9X_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[G9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -941,7 +632,6 @@ t_Gruvin9xModelData_v105::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<G9X_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -949,7 +639,6 @@ t_Gruvin9xModelData_v105::operator ModelData ()
     }
   }
   for (int i=0; i<G9X_MAX_CURVE9; i++) {
-    c9x.curves[G9X_MAX_CURVE5 + i].custom = false;
     c9x.curves[G9X_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[G9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1027,7 +716,6 @@ t_Gruvin9xModelData_v106::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<G9X_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1035,7 +723,6 @@ t_Gruvin9xModelData_v106::operator ModelData ()
     }
   }
   for (int i=0; i<G9X_MAX_CURVE9; i++) {
-    c9x.curves[G9X_MAX_CURVE5 + i].custom = false;
     c9x.curves[G9X_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[G9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1055,99 +742,3 @@ t_Gruvin9xModelData_v106::operator ModelData ()
   return c9x;
 }
 
-t_Gruvin9xModelData_v106::t_Gruvin9xModelData_v106(ModelData &c9x)
-{
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    timer1 = c9x.timers[0];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case SILV_A:
-        protocol = 3;
-        break;
-      case SILV_B:
-        protocol = 4;
-        break;
-      case SILV_C:
-        protocol = 5;
-        break;
-      case CTP1009:
-        protocol = 6;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += QObject::tr("Er9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    thrTrim = c9x.thrTrim;
-    thrExpo = c9x.thrExpo;
-    trimInc = c9x.trimInc;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    timer2 = c9x.timers[1];
-    for (int i=0; i<G9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<G9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<G9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[G9X_MAX_EXPOS].mode)
-      EEPROMWarnings += QObject::tr("gruvin9x only accepts %1 expos").arg(G9X_MAX_EXPOS) + "\n";
-    for (int i=0; i<G9X_MAX_CURVE5; i++)
-      if  (c9x.curves[i].count==5) {
-        if  (c9x.curves[i].custom)
-          EEPROMWarnings += QObject::tr("gruvin9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1) + "\n";    
-        for (int j=0; j<5; j++)
-            curves5[i][j] = c9x.curves[i].points[j].y;
-      } else {
-        EEPROMWarnings += QObject::tr("gruvin9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i].count).arg(i+1) + "\n";
-      }   
-    for (int i=0; i<G9X_MAX_CURVE9; i++)
-      if  (c9x.curves[i+G9X_MAX_CURVE5].count==9) {
-        if  (c9x.curves[i+G9X_MAX_CURVE5].custom)
-          EEPROMWarnings += QObject::tr("gruvin9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1+G9X_MAX_CURVE5) + "\n";    
-        for (int j=0; j<9; j++)
-            curves9[i][j] = c9x.curves[i+G9X_MAX_CURVE5].points[j].y;
-      } else {
-        EEPROMWarnings += QObject::tr("gruvin9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i+G9X_MAX_CURVE5].count).arg(i+1+G9X_MAX_CURVE5) + "\n";
-      }   
-    for (int i=0; i<G9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    for (int i=0; i<G9X_NUM_FSW; i++)
-      funcSw[i] = c9x.funcSw[i];
-    for (int i=0; i<G9X_NUM_CHNOUT; i++)
-      safetySw[i] = c9x.safetySw[i];
-    swashR = c9x.swashRingData;
-    for (int i=0; i<G9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-  }
-  else {
-    memset(this, 0, sizeof(t_Gruvin9xModelData_v106));
-  }
-}
-
diff --git a/companion/src/firmwares/gruvin9x/gruvin9xeeprom.h b/companion/src/firmwares/gruvin9x/gruvin9xeeprom.h
index f2e0cf1e2..410e96e08 100644
--- a/companion/src/firmwares/gruvin9x/gruvin9xeeprom.h
+++ b/companion/src/firmwares/gruvin9x/gruvin9xeeprom.h
@@ -38,8 +38,6 @@ PACK(typedef struct t_Gruvin9xTrainerMix_v104 {
 
   operator TrainerMix();
   t_Gruvin9xTrainerMix_v104() { memset(this, 0, sizeof(t_Gruvin9xTrainerMix_v104)); }
-  t_Gruvin9xTrainerMix_v104(TrainerMix&);
-
 }) Gruvin9xTrainerMix_v104; //
 
 PACK(typedef struct t_Gruvin9xTrainerData_v103 {
@@ -55,8 +53,6 @@ PACK(typedef struct t_Gruvin9xTrainerData_v104 {
 
   operator TrainerData();
   t_Gruvin9xTrainerData_v104() { memset(this, 0, sizeof(t_Gruvin9xTrainerData_v104)); }
-  t_Gruvin9xTrainerData_v104(TrainerData&);
-
 }) Gruvin9xTrainerData_v104;
 
 PACK(typedef struct t_Gruvin9xFrSkyRSSIAlarm {
@@ -136,8 +132,6 @@ PACK(typedef struct t_Gruvin9xGeneral_v104 {
 
   operator GeneralSettings();
   t_Gruvin9xGeneral_v104() { memset(this, 0, sizeof(t_Gruvin9xGeneral_v104)); }
-  t_Gruvin9xGeneral_v104(GeneralSettings&);
-
 }) Gruvin9xGeneral_v104;
 
 typedef Gruvin9xGeneral_v104 Gruvin9xGeneral;
@@ -156,8 +150,6 @@ PACK(typedef struct t_Gruvin9xExpoData {
 
   operator ExpoData();
   t_Gruvin9xExpoData();
-  t_Gruvin9xExpoData(ExpoData&);
-
 }) Gruvin9xExpoData;
 
 PACK(typedef struct t_Gruvin9xLimitData {
@@ -168,8 +160,6 @@ PACK(typedef struct t_Gruvin9xLimitData {
 
   operator LimitData();
   t_Gruvin9xLimitData();
-  t_Gruvin9xLimitData(LimitData&);
-
 }) Gruvin9xLimitData;
 
 #define MLTPX_ADD  0
@@ -194,8 +184,6 @@ PACK(typedef struct t_Gruvin9xMixData {
 
   operator MixData();
   t_Gruvin9xMixData();
-  t_Gruvin9xMixData(MixData&);
-
 }) Gruvin9xMixData;
 
 PACK(typedef struct t_Gruvin9xCustomSwData { // Custom Switches data
@@ -205,8 +193,6 @@ PACK(typedef struct t_Gruvin9xCustomSwData { // Custom Switches data
 
   operator CustomSwData();
   t_Gruvin9xCustomSwData() { memset(this, 0, sizeof(t_Gruvin9xCustomSwData)); }
-  t_Gruvin9xCustomSwData(CustomSwData&);
-
 }) Gruvin9xCustomSwData;
 
 PACK(typedef struct t_Gruvin9xSafetySwData { // Safety Switches data
@@ -215,8 +201,6 @@ PACK(typedef struct t_Gruvin9xSafetySwData { // Safety Switches data
 
   operator SafetySwData();
   t_Gruvin9xSafetySwData() { memset(this, 0, sizeof(t_Gruvin9xSafetySwData)); }
-  t_Gruvin9xSafetySwData(SafetySwData&);
-
 }) Gruvin9xSafetySwData;
 
 PACK(typedef struct t_Gruvin9xFuncSwData { // Function Switches data
@@ -225,8 +209,6 @@ PACK(typedef struct t_Gruvin9xFuncSwData { // Function Switches data
 
   operator FuncSwData();
   t_Gruvin9xFuncSwData() { memset(this, 0, sizeof(t_Gruvin9xFuncSwData)); }
-  t_Gruvin9xFuncSwData(FuncSwData&);
-
 }) Gruvin9xFuncSwData;
 
 PACK(typedef struct t_Gruvin9xFrSkyChannelData {
@@ -242,17 +224,13 @@ PACK(typedef struct t_Gruvin9xFrSkyChannelData {
 
   operator FrSkyChannelData();
   t_Gruvin9xFrSkyChannelData();
-  t_Gruvin9xFrSkyChannelData(FrSkyChannelData&);
-
 }) Gruvin9xFrSkyChannelData;
 
 PACK(typedef struct t_Gruvin9xFrSkyData {
-	Gruvin9xFrSkyChannelData channels[2];
-
-	operator FrSkyData();
-	t_Gruvin9xFrSkyData();
-	t_Gruvin9xFrSkyData(FrSkyData&);
+  Gruvin9xFrSkyChannelData channels[2];
 
+  operator FrSkyData();
+  t_Gruvin9xFrSkyData();
 }) Gruvin9xFrSkyData;
 
 PACK(typedef struct t_Gruvin9xSwashRingData { // Swash Ring data
@@ -265,8 +243,6 @@ PACK(typedef struct t_Gruvin9xSwashRingData { // Swash Ring data
 
   operator SwashRingData();
   t_Gruvin9xSwashRingData();
-  t_Gruvin9xSwashRingData(SwashRingData&);
-
 }) Gruvin9xSwashRingData;
 
 PACK(typedef struct t_Gruvin9xPhaseData_v102 {
@@ -291,7 +267,6 @@ PACK(typedef struct t_Gruvin9xPhaseData_v106 {
 
   operator PhaseData();
   t_Gruvin9xPhaseData_v106() { memset(this, 0, sizeof(t_Gruvin9xPhaseData_v106)); }
-  t_Gruvin9xPhaseData_v106(PhaseData &eepe);
 }) Gruvin9xPhaseData_v106;
 
 PACK(typedef struct t_Gruvin9xTimerData {
@@ -301,7 +276,6 @@ PACK(typedef struct t_Gruvin9xTimerData {
 
   operator TimerData();
   t_Gruvin9xTimerData() { memset(this, 0, sizeof(t_Gruvin9xTimerData)); }
-  t_Gruvin9xTimerData(TimerData &eepe);
 }) Gruvin9xTimerData;
 
 #define G9X_MAX_PHASES 5
@@ -410,8 +384,6 @@ PACK(typedef struct t_Gruvin9xModelData_v105 {
 
   operator ModelData();
   t_Gruvin9xModelData_v105() { memset(this, 0, sizeof(t_Gruvin9xModelData_v105)); }
-  t_Gruvin9xModelData_v105(ModelData&);
-
 }) Gruvin9xModelData_v105;
 
 PACK(typedef struct t_Gruvin9xModelData_v106 {
@@ -443,11 +415,8 @@ PACK(typedef struct t_Gruvin9xModelData_v106 {
 
   operator ModelData();
   t_Gruvin9xModelData_v106() { memset(this, 0, sizeof(t_Gruvin9xModelData_v106)); }
-  t_Gruvin9xModelData_v106(ModelData&);
-
 }) Gruvin9xModelData_v106;
 
 typedef Gruvin9xModelData_v106 Gruvin9xModelData;
 
 #endif
-/*eof*/
diff --git a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
index 114fd3bee..cdb6d4124 100644
--- a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
+++ b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
@@ -200,62 +200,20 @@ bool Gruvin9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int es
 
 int Gruvin9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
 {
-  EEPROMWarnings.clear();
+  std::cout << "NO!\n";
+  // TODO an error
 
-  int size = getEEpromSize();
-
-  efile->EeFsCreate(eeprom, size, BOARD_STOCK);
-
-  Gruvin9xGeneral gruvin9xGeneral(radioData.generalSettings);
-  int sz = efile->writeRlc2(FILE_GENERAL, FILE_TYP_GENERAL, (uint8_t*)&gruvin9xGeneral, sizeof(Gruvin9xGeneral));
-  if(sz != sizeof(Gruvin9xGeneral)) {
-    return 0;
-  }
-
-  for (int i=0; i<getMaxModels(); i++) {
-    if (!radioData.models[i].isempty()) {
-      ModelData model = radioData.models[i];
-      if (1/*version < */) {
-        applyStickModeToModel(model, radioData.generalSettings.stickMode+1);
-      }
-      Gruvin9xModelData gruvin9xModel(model);
-      sz = efile->writeRlc2(FILE_MODEL(i), FILE_TYP_MODEL, (uint8_t*)&gruvin9xModel, sizeof(Gruvin9xModelData));
-      if(sz != sizeof(Gruvin9xModelData)) {
-        return 0;
-      }
-    }
-  }
-
-  return size;
+  return 0;
 }
 
 int Gruvin9xInterface::getSize(ModelData &model)
 {
-  if (model.isempty())
-    return 0;
-
-  uint8_t tmp[EESIZE_GRUVIN9X];
-  efile->EeFsCreate(tmp, EESIZE_GRUVIN9X, BOARD_STOCK);
-
-  Gruvin9xModelData gruvin9xModel(model);
-  int sz = efile->writeRlc2(0, FILE_TYP_MODEL, (uint8_t*)&gruvin9xModel, sizeof(Gruvin9xModelData));
-  if(sz != sizeof(Gruvin9xModelData)) {
-     return -1;
-  }
-  return efile->size(0);
+  return 0;
 }
 
 int Gruvin9xInterface::getSize(GeneralSettings &settings)
 {
-  uint8_t tmp[EESIZE_GRUVIN9X];
-  efile->EeFsCreate(tmp, EESIZE_GRUVIN9X, BOARD_STOCK);
-
-  Gruvin9xGeneral gruvin9xGeneral(settings);
-  int sz = efile->writeRlc1(0, FILE_TYP_GENERAL, (uint8_t*)&gruvin9xGeneral, sizeof(gruvin9xGeneral));
-  if(sz != sizeof(gruvin9xGeneral)) {
-    return -1;
-  }
-  return efile->size(0);
+  return 0;
 }
 
 int Gruvin9xInterface::getCapability(const Capability capability)
@@ -263,10 +221,6 @@ int Gruvin9xInterface::getCapability(const Capability capability)
   switch (capability) {
     case OwnerName:
       return 0;
-    case NumCurves5:
-      return G9X_MAX_CURVE5;
-    case NumCurves9:
-      return G9X_MAX_CURVE9;
     case Mixes:
       return G9X_MAX_MIXERS;
     case FlightPhases:
@@ -297,7 +251,6 @@ int Gruvin9xInterface::getCapability(const Capability capability)
       return true;
     case OffsetWeight:
       return 125;
-    case HasExpoCurves:
     case HasContrast:
       return true;           
     case Telemetry:
diff --git a/companion/src/firmwares/opentx/open9xGruvin9xeeprom.cpp b/companion/src/firmwares/opentx/open9xGruvin9xeeprom.cpp
index 74d4d0074..d18939827 100644
--- a/companion/src/firmwares/opentx/open9xGruvin9xeeprom.cpp
+++ b/companion/src/firmwares/opentx/open9xGruvin9xeeprom.cpp
@@ -5,10 +5,7 @@
 #include <QObject>
 #include <QMessageBox>
 
-extern void setEEPROMZString(char *dst, const char *src, int size);
 extern void getEEPROMZString(char *dst, const char *src, int size);
-
-extern int8_t open9xStockFromSwitch(const RawSwitch & sw);
 extern RawSwitch open9xStockToSwitch(int8_t sw);
 
 t_Open9xGruvin9xPhaseData_v207::operator PhaseData ()
@@ -25,21 +22,6 @@ t_Open9xGruvin9xPhaseData_v207::operator PhaseData ()
   return c9x;
 }
 
-t_Open9xGruvin9xPhaseData_v207::t_Open9xGruvin9xPhaseData_v207(PhaseData &c9x)
-{
-  trim_ext = 0;
-  for (int i=0; i<NUM_STICKS; i++) {
-    trim[i] = (int8_t)(c9x.trim[i] >> 2);
-    trim_ext = (trim_ext & ~(0x03 << (2*i))) + (((c9x.trim[i] & 0x03) << (2*i)));
-  }
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  setEEPROMZString(name, c9x.name, sizeof(name));
-  fadeIn = c9x.fadeIn;
-  fadeOut = c9x.fadeOut;
-  for (int i=0; i<2; i++)
-    rotaryEncoders[i] = c9x.rotaryEncoders[i];
-}
-
 t_Open9xGruvin9xPhaseData_v208::operator PhaseData ()
 {
   PhaseData c9x;
@@ -54,107 +36,6 @@ t_Open9xGruvin9xPhaseData_v208::operator PhaseData ()
   return c9x;
 }
 
-t_Open9xGruvin9xPhaseData_v208::t_Open9xGruvin9xPhaseData_v208(PhaseData &c9x)
-{
-  for (int i=0; i<NUM_STICKS; i++)
-    trim[i] = c9x.trim[i];
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  setEEPROMZString(name, c9x.name, sizeof(name));
-  fadeIn = c9x.fadeIn;
-  fadeOut = c9x.fadeOut;
-  for (int i=0; i<2; i++)
-    rotaryEncoders[i] = c9x.rotaryEncoders[i];
-}
-
-t_Open9xGruvin9xMixData_v207::t_Open9xGruvin9xMixData_v207(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xStockFromSwitch(c9x.swtch);
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-      srcRaw = 8 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 10;
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 11;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 11 + open9xStockFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 33 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 36 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 44 + c9x.srcRaw.index;
-    }
-    weight = c9x.weight;
-    differential = c9x.differential/2;
-    curve = c9x.curve;
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    mltpx = (MltpxValue)c9x.mltpx;
-    int zeros=0;
-    int ones=0;
-    int phtemp=c9x.phases;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ones++;
-      } else {
-        zeros++;
-      }
-      phtemp >>=1;
-    }
-    if (zeros==O9X_MAX_PHASES || zeros==0) {
-      phase=0;
-    } else if (zeros==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_MAX_PHASES; i++) {
-        if ((phtemp & 1)==0) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=ph+1;
-    } else if (ones==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_MAX_PHASES; i++) {
-        if (phtemp & 1) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=-(ph+1);
-    } else {
-      phase=0;
-      EEPROMWarnings += ::QObject::tr("Flight mode settings on mixers not exported") + "\n";
-    }
-    sOffset = c9x.sOffset;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v207));
-  }
-}
-
 t_Open9xGruvin9xMixData_v207::operator MixData ()
 {
   MixData c9x;
@@ -188,9 +69,15 @@ t_Open9xGruvin9xMixData_v207::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-44);
     }
     c9x.weight = weight;
-    c9x.differential = differential*2;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
     c9x.swtch = open9xStockToSwitch(swtch);
-    c9x.curve = curve;
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -198,12 +85,14 @@ t_Open9xGruvin9xMixData_v207::operator MixData ()
     c9x.carryTrim = carryTrim;
     c9x.mltpx = (MltpxValue)mltpx;
     c9x.mixWarn = mixWarn;
-//    c9x.phase = phase;
+
     if (phase<0) {
       c9x.phases= 1 << (-phase -1);
-    } else if (phase==0) {
+    }
+    else if (phase==0) {
       c9x.phases=0;
-    } else {
+    }
+    else {
       c9x.phases=63;
       c9x.phases &= ~(1 << (phase -1));
     }
@@ -212,98 +101,6 @@ t_Open9xGruvin9xMixData_v207::operator MixData ()
   return c9x;
 }
 
-t_Open9xGruvin9xMixData_v209::t_Open9xGruvin9xMixData_v209(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xStockFromSwitch(c9x.swtch);
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-      srcRaw = 8 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-      srcRaw = 10 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 14;
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 15;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 15 + open9xStockFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 37 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 40 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 48 + c9x.srcRaw.index;
-    }
-    weight = c9x.weight;
-    differential = c9x.differential/2;
-    curve = c9x.curve;
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    mltpx = (MltpxValue)c9x.mltpx;
-    int zeros=0;
-    int ones=0;
-    int phtemp=c9x.phases;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ones++;
-      } else {
-        zeros++;
-      }
-      phtemp >>=1;
-    }
-    if (zeros==O9X_MAX_PHASES || zeros==0) {
-      phase=0;
-    } else if (zeros==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_MAX_PHASES; i++) {
-        if ((phtemp & 1)==0) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=ph+1;
-    } else if (ones==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_MAX_PHASES; i++) {
-        if (phtemp & 1) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=-(ph+1);
-    } else {
-      phase=0;
-      EEPROMWarnings += ::QObject::tr("Flight mode settings on mixers not exported") + "\n";
-    }
-    sOffset = c9x.sOffset;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v207));
-  }
-}
-
 t_Open9xGruvin9xMixData_v209::operator MixData ()
 {
   MixData c9x;
@@ -340,9 +137,15 @@ t_Open9xGruvin9xMixData_v209::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-48);
     }
     c9x.weight = weight;
-    c9x.differential = differential*2;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
     c9x.swtch = open9xStockToSwitch(swtch);
-    c9x.curve = curve;
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -350,12 +153,14 @@ t_Open9xGruvin9xMixData_v209::operator MixData ()
     c9x.carryTrim = carryTrim;
     c9x.mltpx = (MltpxValue)mltpx;
     c9x.mixWarn = mixWarn;
-    // c9x.phase = phase;
+
     if (phase<0) {
       c9x.phases= 1 << (-phase -1);
-    } else if (phase==0) {
+    }
+    else if (phase==0) {
       c9x.phases=0;
-    } else {
+    }
+    else {
       c9x.phases=63;
       c9x.phases &= ~(1 << (phase -1));
     }    
@@ -364,66 +169,6 @@ t_Open9xGruvin9xMixData_v209::operator MixData ()
   return c9x;
 }
 
-t_Open9xGruvin9xMixData_v211::t_Open9xGruvin9xMixData_v211(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xStockFromSwitch(c9x.swtch);
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-      srcRaw = 8 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-      srcRaw = 10 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 14;
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 15;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 15 + open9xStockFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 37 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 40 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 48 + c9x.srcRaw.index;
-    }
-    weight = c9x.weight;
-    if (c9x.curve==0) {
-      curveMode=0;
-      curveParam=c9x.differential;
-    } else {
-      curveMode=1;
-      curveParam = c9x.curve;
-    }
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    noExpo = c9x.noExpo;
-    mltpx = (MltpxValue)c9x.mltpx;
-    phases = c9x.phases;
-    sOffset = c9x.sOffset;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v211));
-  }
-}
-
 t_Open9xGruvin9xMixData_v211::operator MixData ()
 {
   MixData c9x;
@@ -461,12 +206,14 @@ t_Open9xGruvin9xMixData_v211::operator MixData ()
     }
     c9x.weight = weight;
     c9x.swtch = open9xStockToSwitch(swtch);
+
     if (curveMode==0) {
-      c9x.differential = curveParam;
-      c9x.curve=0;
-    } else {
-      c9x.curve=curveParam;
-    }    
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, curveParam);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -481,28 +228,6 @@ t_Open9xGruvin9xMixData_v211::operator MixData ()
   return c9x;
 }
 
-int8_t open9xV4207FromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER)
-    v1 = 8+source.index;
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 10;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 11; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 12+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 15+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 23+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 38+source.index;
-  return v1;
-}
-
 RawSource open9xV4207ToSource(int8_t value)
 {
   if (value == 0) {
@@ -534,30 +259,6 @@ RawSource open9xV4207ToSource(int8_t value)
   }
 }
 
-int8_t open9xV4209FromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER)
-    v1 = 8+source.index;
-  if (source.type == SOURCE_TYPE_TRIM)
-    v1 = 10+source.index;
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 14;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 15; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 16+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 19+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 27+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 42+source.index;
-  return v1;
-}
-
 RawSource open9xV4209ToSource(int8_t value)
 {
   if (value == 0) {
@@ -592,33 +293,6 @@ RawSource open9xV4209ToSource(int8_t value)
   }
 }
 
-t_Open9xGruvin9xCustomSwData_v207::t_Open9xGruvin9xCustomSwData_v207(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = open9xV4207FromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    v2 = open9xV4207FromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = open9xStockFromSwitch(RawSwitch(c9x.val1));
-    v2 = open9xStockFromSwitch(RawSwitch(c9x.val2));
-  }
-
-  if (func>O9X_V4_MAX_CSFUNCOLD ) {
-    EEPROMWarnings += ::QObject::tr("This version of open9x does not support Custom Switch function %1").arg(getFuncName(func)) + "\n";
-    func=0;
-    v1=0;
-    v2=0;
-  }  
-}
-
 Open9xGruvin9xCustomSwData_v207::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -642,26 +316,6 @@ Open9xGruvin9xCustomSwData_v207::operator CustomSwData ()
   return c9x;
 }
 
-t_Open9xGruvin9xCustomSwData_v209::t_Open9xGruvin9xCustomSwData_v209(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = open9xV4209FromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL  && c9x.func <= CS_FN_ELESS) {
-    v2 = open9xV4209FromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = open9xStockFromSwitch(RawSwitch(c9x.val1));
-    v2 = open9xStockFromSwitch(RawSwitch(c9x.val2));
-  }
-}
-
 Open9xGruvin9xCustomSwData_v209::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -685,45 +339,6 @@ Open9xGruvin9xCustomSwData_v209::operator CustomSwData ()
   return c9x;
 }
 
-t_Open9xGruvin9xFuncSwData_v203::t_Open9xGruvin9xFuncSwData_v203(FuncSwData &c9x)
-{
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  if (c9x.func <= FuncSafetyCh16) {
-    param = ((c9x.param>>1)<<1);
-    param |=(c9x.enabled & 0x01);
-    func = c9x.func;
-  } else {
-    param = c9x.param;
-    if (c9x.func <= FuncTrainerAIL)
-      func = 16 + c9x.func - FuncTrainer;
-    else if (c9x.func == FuncInstantTrim)
-      func = 21;
-    else if (c9x.func == FuncPlaySound)
-      func = 22;
-    else if (c9x.func == FuncPlayHaptic)
-      func = 23;
-    else if (c9x.func == FuncReset)
-      func = 24;
-    else if (c9x.func == FuncVario)
-      func = 25;
-    else if (c9x.func == FuncPlayPrompt)
-      func = 26;
-    else if (c9x.func == FuncPlayValue)
-      func = 27;
-    else if (c9x.func == FuncLogs)
-      func = 28;
-    else if (c9x.func == FuncBacklight)
-      func = 29;
-    else if (c9x.func >= FuncAdjustGV1 && c9x.func <= FuncAdjustGV5)
-      func = 30 + c9x.func - FuncAdjustGV1;
-    else {
-      swtch = 0;
-      func = 0;
-      param = 0;
-    }
-  }
-}
-
 t_Open9xGruvin9xFuncSwData_v203::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -763,37 +378,6 @@ t_Open9xGruvin9xFuncSwData_v203::operator FuncSwData ()
   return c9x;
 }
 
-t_Open9xGruvin9xFuncSwData_v210::t_Open9xGruvin9xFuncSwData_v210(FuncSwData &c9x)
-{
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  param = c9x.param;
-  if (c9x.func <= FuncInstantTrim) {
-    func = (uint8_t)c9x.func;
-    delay = c9x.enabled;
-  }
-  else if (c9x.func == FuncPlaySound)
-    func = 22;
-  else if (c9x.func == FuncPlayHaptic)
-    func = 23;
-  else if (c9x.func == FuncReset)
-    func = 24;
-  else if (c9x.func == FuncVario)
-    func = 25;
-  else if (c9x.func == FuncPlayPrompt)
-    func = 26;
-  else if (c9x.func == FuncPlayValue)
-    func = 27;
-  else if (c9x.func == FuncLogs)
-    func = 28;
-  else if (c9x.func == FuncBacklight)
-    func = 29;
-  else {
-    swtch = 0;
-    func = 0;
-    param = 0;
-  }
-}
-
 t_Open9xGruvin9xFuncSwData_v210::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -823,16 +407,6 @@ t_Open9xGruvin9xFuncSwData_v210::operator FuncSwData ()
   return c9x;
 }
 
-t_Open9xGruvin9xSwashRingData_v208::t_Open9xGruvin9xSwashRingData_v208(SwashRingData &c9x)
-{
-  invertELE = c9x.invertELE;
-  invertAIL = c9x.invertAIL;
-  invertCOL = c9x.invertCOL;
-  type = c9x.type;
-  collectiveSource = open9xV4207FromSource(c9x.collectiveSource);
-  value = c9x.value;
-}
-
 t_Open9xGruvin9xSwashRingData_v208::operator SwashRingData ()
 {
   SwashRingData c9x;
@@ -845,16 +419,6 @@ t_Open9xGruvin9xSwashRingData_v208::operator SwashRingData ()
   return c9x;
 }
 
-t_Open9xGruvin9xSwashRingData_v209::t_Open9xGruvin9xSwashRingData_v209(SwashRingData &c9x)
-{
-  invertELE = c9x.invertELE;
-  invertAIL = c9x.invertAIL;
-  invertCOL = c9x.invertCOL;
-  type = c9x.type;
-  collectiveSource = open9xV4209FromSource(c9x.collectiveSource);
-  value = c9x.value;
-}
-
 t_Open9xGruvin9xSwashRingData_v209::operator SwashRingData ()
 {
   SwashRingData c9x;
@@ -915,7 +479,6 @@ t_Open9xGruvin9xModelData_v207::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -923,7 +486,6 @@ t_Open9xGruvin9xModelData_v207::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -950,109 +512,6 @@ t_Open9xGruvin9xModelData_v207::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_207 761
-t_Open9xGruvin9xModelData_v207::t_Open9xGruvin9xModelData_v207(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_207) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_207));
-  }
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case PPM16:
-        protocol = 3;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    spare1 = 0;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-/*    for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j];*/
-    for (int i=0; i<O9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyLinesXtra=0;
-    for (int j=0; j<4; j++) {
-      frskyLines[j] = 0;
-      for (int k=0; k<2; k++) {
-        int value = c9x.frsky.screens[1].body.lines[j].source[k];
-        frskyLines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-        frskyLinesXtra |= (value / 16) << (4*j+2*k);
-      }
-    }
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v207));
-  }
-}
-
-
 t_Open9xGruvin9xModelData_v208::operator ModelData ()
 {
   ModelData c9x;
@@ -1104,7 +563,6 @@ t_Open9xGruvin9xModelData_v208::operator ModelData ()
   for (int i=0; i<O9X_MAX_EXPOS; i++)
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1112,7 +570,6 @@ t_Open9xGruvin9xModelData_v208::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1144,117 +601,6 @@ t_Open9xGruvin9xModelData_v208::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_208 794
-t_Open9xGruvin9xModelData_v208::t_Open9xGruvin9xModelData_v208(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_208) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_208));
-  }
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-/* TODO    for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-    for (int i=0; i<O9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    varioSource = c9x.frsky.varioSource;
-    varioSpeedUpMin = c9x.frsky.varioCenterMax;
-    varioSpeedDownMin = c9x.frsky.varioCenterMin;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyLinesXtra=0;
-    for (int j=0; j<4; j++) {
-      frskyLines[j] = 0;
-      for (int k=0; k<2; k++) {
-        int value = c9x.frsky.screens[1].body.lines[j].source[k];
-        frskyLines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-        frskyLinesXtra |= (value / 16) << (4*j+2*k);
-      }
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v208));
-  }
-}
-
 t_Open9xGruvin9xModelData_v209::operator ModelData ()
 {
   ModelData c9x;
@@ -1306,7 +652,6 @@ t_Open9xGruvin9xModelData_v209::operator ModelData ()
   for (int i=0; i<O9X_MAX_EXPOS; i++)
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1314,7 +659,6 @@ t_Open9xGruvin9xModelData_v209::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1347,118 +691,6 @@ t_Open9xGruvin9xModelData_v209::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_209 795
-t_Open9xGruvin9xModelData_v209::t_Open9xGruvin9xModelData_v209(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_209) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_209));
-  }
-
-  memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v209));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-    /* TODO for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-    for (int i=0; i<O9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    varioSource = c9x.frsky.varioSource;
-    varioSpeedUpMin = c9x.frsky.varioCenterMax;
-    varioSpeedDownMin = c9x.frsky.varioCenterMin;
-    switchWarningStates = c9x.switchWarningStates;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyLinesXtra=0;
-    for (int j=0; j<4; j++) {
-      frskyLines[j] = 0;
-      for (int k=0; k<2; k++) {
-        int value = c9x.frsky.screens[1].body.lines[j].source[k];
-        frskyLines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-        frskyLinesXtra |= (value / 16) << (4*j+2*k);
-      }
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-}
-
-
 t_Open9xGruvin9xModelData_v210::operator ModelData ()
 {
   ModelData c9x;
@@ -1511,7 +743,7 @@ t_Open9xGruvin9xModelData_v210::operator ModelData ()
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_MAX_CURVES; i++) {
     CurveInfo crvinfo = curveinfo(this, i);
-    c9x.curves[i].custom = crvinfo.custom;
+    c9x.curves[i].type = (crvinfo.custom ? CurveData::CURVE_TYPE_CUSTOM : CurveData::CURVE_TYPE_STANDARD);
     c9x.curves[i].count = crvinfo.points;
     for (int j=0; j<crvinfo.points; j++)
       c9x.curves[i].points[j].y = crvinfo.crv[j];
@@ -1543,119 +775,6 @@ t_Open9xGruvin9xModelData_v210::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_210 796
-t_Open9xGruvin9xModelData_v210::t_Open9xGruvin9xModelData_v210(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_210) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_210));
-  }
-
-  memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v210));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-
-    int8_t * cur = &points[0];
-    int offset = 0;
-    for (int i=0; i<O9X_MAX_CURVES; i++) {
-      offset += (c9x.curves[i].custom ? c9x.curves[i].count * 2 - 2 : c9x.curves[i].count) - 5;
-      if (offset > O9X_NUM_POINTS - 5 * O9X_MAX_CURVES) {
-        EEPROMWarnings += ::QObject::tr("open9x only accepts %1 points in all curves").arg(O9X_NUM_POINTS) + "\n";
-        break;
-      }
-      curves[i] = offset;
-      for (int j=0; j<c9x.curves[i].count; j++) {
-        *cur++ = c9x.curves[i].points[j].y;
-      }
-      if (c9x.curves[i].custom) {
-        for (int j=1; j<c9x.curves[i].count-1; j++) {
-          *cur++ = c9x.curves[i].points[j].x;
-        }
-      }
-    }
-
-    for (int i=0; i<O9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    switchWarningStates = c9x.switchWarningStates;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-}
-
 t_Open9xGruvin9xModelData_v211::operator ModelData ()
 {
   ModelData c9x;
@@ -1711,7 +830,7 @@ t_Open9xGruvin9xModelData_v211::operator ModelData ()
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_MAX_CURVES; i++) {
     CurveInfo crvinfo = curveinfo(this, i);
-    c9x.curves[i].custom = crvinfo.custom;
+    c9x.curves[i].type = (crvinfo.custom ? CurveData::CURVE_TYPE_CUSTOM : CurveData::CURVE_TYPE_STANDARD);
     c9x.curves[i].count = crvinfo.points;
     for (int j=0; j<crvinfo.points; j++)
       c9x.curves[i].points[j].y = crvinfo.crv[j];
@@ -1738,117 +857,3 @@ t_Open9xGruvin9xModelData_v211::operator ModelData ()
   c9x.modelId = modelId;
   return c9x;
 }
-
-#define MODEL_DATA_SIZE_V4_211 784
-t_Open9xGruvin9xModelData_v211::t_Open9xGruvin9xModelData_v211(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_V4_211) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_V4_211));
-  }
-
-  memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v211));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++) {
-      timers[i] = c9x.timers[i];
-      timersXtra[i].value=c9x.timers[i].val;
-      timersXtra[i].remanent=c9x.timers[i].persistent;
-    }
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare1 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-
-    int8_t * cur = &points[0];
-    int offset = 0;
-    for (int i=0; i<O9X_MAX_CURVES; i++) {
-      offset += (c9x.curves[i].custom ? c9x.curves[i].count * 2 - 2 : c9x.curves[i].count) - 5;
-      if (offset > O9X_NUM_POINTS - 5 * O9X_MAX_CURVES) {
-        EEPROMWarnings += ::QObject::tr("open9x only accepts %1 points in all curves").arg(O9X_NUM_POINTS) + "\n";
-        break;
-      }
-      curves[i] = offset;
-      for (int j=0; j<c9x.curves[i].count; j++) {
-        *cur++ = c9x.curves[i].points[j].y;
-      }
-      if (c9x.curves[i].custom) {
-        for (int j=1; j<c9x.curves[i].count-1; j++) {
-          *cur++ = c9x.curves[i].points[j].x;
-        }
-      }
-    }
-
-    for (int i=0; i<O9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    switchWarningStates = c9x.switchWarningStates;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-  }
-}
-
diff --git a/companion/src/firmwares/opentx/open9xGruvin9xeeprom.h b/companion/src/firmwares/opentx/open9xGruvin9xeeprom.h
index a37ed3d9d..c95dc6742 100644
--- a/companion/src/firmwares/opentx/open9xGruvin9xeeprom.h
+++ b/companion/src/firmwares/opentx/open9xGruvin9xeeprom.h
@@ -32,7 +32,6 @@ PACK(typedef struct t_Open9xGruvin9xPhaseData_v207 {
   int16_t rotaryEncoders[2];
   operator PhaseData();
   t_Open9xGruvin9xPhaseData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xPhaseData_v207)); }
-  t_Open9xGruvin9xPhaseData_v207(PhaseData &eepe);
 }) Open9xGruvin9xPhaseData_v207;
 
 PACK(typedef struct t_Open9xGruvin9xPhaseData_v208 {
@@ -44,7 +43,6 @@ PACK(typedef struct t_Open9xGruvin9xPhaseData_v208 {
   int16_t rotaryEncoders[2];
   operator PhaseData();
   t_Open9xGruvin9xPhaseData_v208() { memset(this, 0, sizeof(t_Open9xGruvin9xPhaseData_v208)); }
-  t_Open9xGruvin9xPhaseData_v208(PhaseData &eepe);
 }) Open9xGruvin9xPhaseData_v208;
 
 PACK(typedef struct t_Open9xGruvin9xMixData_v207 {
@@ -66,8 +64,6 @@ PACK(typedef struct t_Open9xGruvin9xMixData_v207 {
 
  operator MixData();
   t_Open9xGruvin9xMixData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v207)); }
-  t_Open9xGruvin9xMixData_v207(MixData&);
-
 }) Open9xGruvin9xMixData_v207;
 
 PACK(typedef struct t_Open9xGruvin9xMixData_v209 {
@@ -89,8 +85,6 @@ PACK(typedef struct t_Open9xGruvin9xMixData_v209 {
 
  operator MixData();
   t_Open9xGruvin9xMixData_v209() { memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v209)); }
-  t_Open9xGruvin9xMixData_v209(MixData&);
-
 }) Open9xGruvin9xMixData_v209;
 
 PACK(typedef struct t_Open9xGruvin9xMixData_v211 {
@@ -114,8 +108,6 @@ PACK(typedef struct t_Open9xGruvin9xMixData_v211 {
 
  operator MixData();
   t_Open9xGruvin9xMixData_v211() { memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v211)); }
-  t_Open9xGruvin9xMixData_v211(MixData&);
-
 }) Open9xGruvin9xMixData_v211;
 
 PACK(typedef struct t_Open9xGruvin9xCustomSwData_v207 { // Custom Switches data
@@ -125,10 +117,8 @@ PACK(typedef struct t_Open9xGruvin9xCustomSwData_v207 { // Custom Switches data
 
   operator CustomSwData();
   t_Open9xGruvin9xCustomSwData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xCustomSwData_v207)); }
-  t_Open9xGruvin9xCustomSwData_v207(CustomSwData&);
   int8_t fromSource(RawSource source);
   RawSource toSource(int8_t value);
-
 }) Open9xGruvin9xCustomSwData_v207;
 
 PACK(typedef struct t_Open9xGruvin9xCustomSwData_v209 { // Custom Switches data
@@ -138,10 +128,8 @@ PACK(typedef struct t_Open9xGruvin9xCustomSwData_v209 { // Custom Switches data
 
   operator CustomSwData();
   t_Open9xGruvin9xCustomSwData_v209() { memset(this, 0, sizeof(t_Open9xGruvin9xCustomSwData_v209)); }
-  t_Open9xGruvin9xCustomSwData_v209(CustomSwData&);
   int8_t fromSource(RawSource source);
   RawSource toSource(int8_t value);
-
 }) Open9xGruvin9xCustomSwData_v209;
 
 PACK(typedef struct t_Open9xGruvin9xFuncSwData_v203 { // Function Switches data
@@ -151,8 +139,6 @@ PACK(typedef struct t_Open9xGruvin9xFuncSwData_v203 { // Function Switches data
 
   operator FuncSwData();
   t_Open9xGruvin9xFuncSwData_v203() { memset(this, 0, sizeof(t_Open9xGruvin9xFuncSwData_v203)); }
-  t_Open9xGruvin9xFuncSwData_v203(FuncSwData&);
-
 }) Open9xGruvin9xFuncSwData_v203;
 
 PACK(typedef struct t_Open9xGruvin9xFuncSwData_v210 { // Function Switches data
@@ -163,8 +149,6 @@ PACK(typedef struct t_Open9xGruvin9xFuncSwData_v210 { // Function Switches data
 
   operator FuncSwData();
   t_Open9xGruvin9xFuncSwData_v210() { memset(this, 0, sizeof(t_Open9xGruvin9xFuncSwData_v210)); }
-  t_Open9xGruvin9xFuncSwData_v210(FuncSwData&);
-
 }) Open9xGruvin9xFuncSwData_v210;
 
 PACK(typedef struct t_Open9xGruvin9xSwashRingData_v208 { // Swash Ring data
@@ -177,8 +161,6 @@ PACK(typedef struct t_Open9xGruvin9xSwashRingData_v208 { // Swash Ring data
 
   operator SwashRingData();
   t_Open9xGruvin9xSwashRingData_v208() { memset(this, 0, sizeof(t_Open9xGruvin9xSwashRingData_v208)); }
-  t_Open9xGruvin9xSwashRingData_v208(SwashRingData&);
-
 }) Open9xGruvin9xSwashRingData_v208;
 
 PACK(typedef struct t_Open9xGruvin9xSwashRingData_v209 { // Swash Ring data
@@ -191,8 +173,6 @@ PACK(typedef struct t_Open9xGruvin9xSwashRingData_v209 { // Swash Ring data
 
   operator SwashRingData();
   t_Open9xGruvin9xSwashRingData_v209() { memset(this, 0, sizeof(t_Open9xGruvin9xSwashRingData_v209)); }
-  t_Open9xGruvin9xSwashRingData_v209(SwashRingData&);
-
 }) Open9xGruvin9xSwashRingData_v209;
 
 PACK(typedef struct t_Open9xGruvin9xModelData_v207 {
@@ -227,8 +207,6 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v207 {
 
   operator ModelData();
   t_Open9xGruvin9xModelData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v207)); }
-  t_Open9xGruvin9xModelData_v207(ModelData&);
-
 }) Open9xGruvin9xModelData_v207;
 
 PACK(typedef struct t_Open9xGruvin9xModelData_v208 {
@@ -268,8 +246,6 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v208 {
 
   operator ModelData();
   t_Open9xGruvin9xModelData_v208() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v208)); }
-  t_Open9xGruvin9xModelData_v208(ModelData&);
-
 }) Open9xGruvin9xModelData_v208;
 
 PACK(typedef struct t_Open9xGruvin9xModelData_v209 {
@@ -310,8 +286,6 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v209 {
 
   operator ModelData();
   t_Open9xGruvin9xModelData_v209() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v209)); }
-  t_Open9xGruvin9xModelData_v209(ModelData&);
-
 }) Open9xGruvin9xModelData_v209;
 
 PACK(typedef struct t_Open9xGruvin9xModelData_v210 {
@@ -350,8 +324,6 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v210 {
 
   operator ModelData();
   t_Open9xGruvin9xModelData_v210() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v210)); }
-  t_Open9xGruvin9xModelData_v210(ModelData&);
-
 }) Open9xGruvin9xModelData_v210;
 
 PACK(typedef struct t_Open9xGruvin9xModelData_v211 {
@@ -388,8 +360,6 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v211 {
 
   operator ModelData();
   t_Open9xGruvin9xModelData_v211() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v211)); }
-  t_Open9xGruvin9xModelData_v211(ModelData&);
-
 }) Open9xGruvin9xModelData_v211;
 
 #endif
diff --git a/companion/src/firmwares/opentx/open9xSky9xeeprom.cpp b/companion/src/firmwares/opentx/open9xSky9xeeprom.cpp
index afa897700..524d55fee 100644
--- a/companion/src/firmwares/opentx/open9xSky9xeeprom.cpp
+++ b/companion/src/firmwares/opentx/open9xSky9xeeprom.cpp
@@ -5,31 +5,8 @@
 #include <QObject>
 #include <QMessageBox>
 
-extern void setEEPROMZString(char *dst, const char *src, int size);
 extern void getEEPROMZString(char *dst, const char *src, int size);
 
-int8_t open9xArmFromSwitch(const RawSwitch & sw)
-{
-  switch (sw.type) {
-    case SWITCH_TYPE_SWITCH:
-      return sw.index;
-    case SWITCH_TYPE_VIRTUAL:
-      return sw.index > 0 ? (9 + sw.index) : (-9 + sw.index);
-    case SWITCH_TYPE_ON:
-      return 42;
-    case SWITCH_TYPE_OFF:
-      return -42;
-    case SWITCH_TYPE_MOMENT_SWITCH:
-      return sw.index > 0 ? (42 + sw.index) : (-42 + sw.index);
-    case SWITCH_TYPE_MOMENT_VIRTUAL:
-      return sw.index > 0 ? (51 + sw.index) : (-51 + sw.index);
-    case SWITCH_TYPE_ONM:
-      return 84;
-    default:
-      return 0;
-  }
-}
-
 RawSwitch open9xArmToSwitch(int8_t sw)
 {
   uint8_t swa = abs(sw);
@@ -51,30 +28,6 @@ RawSwitch open9xArmToSwitch(int8_t sw)
     return RawSwitch(SWITCH_TYPE_MOMENT_VIRTUAL, sw > 0 ? sw-42-9 : sw+42+9);
 }
 
-int8_t open9xArm208FromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("Open9x on this board doesn't have Rotary Encoders") + "\n";
-    v1 = 5+source.index;
-  }
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 8;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 9; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 10+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 13+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 21+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 52+source.index;
-  return v1;
-}
-
 RawSource open9xArm208ToSource(int8_t value)
 {
   if (value == 0) {
@@ -103,32 +56,6 @@ RawSource open9xArm208ToSource(int8_t value)
   }
 }
 
-int8_t open9xArm209FromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("Open9x on this board doesn't have Rotary Encoders") + "\n";
-    v1 = 5+source.index;
-  }
-  else if (source.type == SOURCE_TYPE_TRIM)
-    v1 = 8 + source.index;
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 12;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 13; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 14+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 17+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 25+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 56+source.index;
-  return v1;
-}
-
 RawSource open9xArm209ToSource(int8_t value)
 {
   if (value == 0) {
@@ -160,30 +87,6 @@ RawSource open9xArm209ToSource(int8_t value)
   }
 }
 
-int8_t open9xArm210FromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER)
-    v1 = 8;
-  else if (source.type == SOURCE_TYPE_TRIM)
-    v1 = 9 + source.index;
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 13;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 14; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 15+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 18+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 26+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 57+source.index;
-  return v1;
-}
-
 RawSource open9xArm210ToSource(int8_t value)
 {
   if (value == 0) {
@@ -239,88 +142,6 @@ t_Open9xArmTimerData_v202::operator TimerData ()
   return c9x;
 }
 
-t_Open9xArmTimerData_v202::t_Open9xArmTimerData_v202(TimerData &c9x)
-{
-  val = c9x.val;
-
-  if (c9x.mode >= TMRMODE_OFF && c9x.mode <= TMRMODE_THt)
-    mode = 0+c9x.mode-TMRMODE_OFF;
-  else if (c9x.mode >= TMRMODE_FIRST_MOMENT_SWITCH)
-    mode = 46+c9x.mode-TMRMODE_FIRST_MOMENT_SWITCH;
-  else if (c9x.mode >= TMRMODE_FIRST_SWITCH)
-    mode = 5+c9x.mode-TMRMODE_FIRST_SWITCH;
-  else if (c9x.mode <= TMRMODE_FIRST_NEG_MOMENT_SWITCH)
-    mode = -42+c9x.mode-TMRMODE_FIRST_NEG_MOMENT_SWITCH;
-  else if (c9x.mode <= TMRMODE_FIRST_NEG_SWITCH)
-    mode = -1+c9x.mode-TMRMODE_FIRST_NEG_SWITCH;
-  else
-    mode = 0;
-}
-
-t_Open9xArmExpoData_v208::t_Open9xArmExpoData_v208(ExpoData &c9x)
-{
-  mode = c9x.mode;
-  chn = c9x.chn;
-  // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
-  curve = 0;
-  expo = 0;
-  if (c9x.curveMode==1) {
-    if (c9x.curveParam >=0 && c9x.curveParam <= 10)
-      curve = c9x.curveParam;
-    else if (c9x.curveParam >= 15 && c9x.curveParam <= 19)
-      curve = c9x.curveParam - 4;
-    else
-      EEPROMWarnings += ::QObject::tr("Open9x doesn't allow Curve%1 in expos").arg(c9x.curveParam-6) + "\n";
-  }
-  else {
-    expo=c9x.curveParam;
-  }
-
-  swtch = open9xArmFromSwitch(c9x.swtch);
-  int zeros=0;
-  int ones=0;
-  int phtemp=c9x.phases;
-  for (int i=0; i<O9X_MAX_PHASES; i++) {
-    if (phtemp & 1) {
-      ones++;
-    } else {
-      zeros++;
-    }
-    phtemp >>=1;
-  }
-  if (zeros==O9X_MAX_PHASES || zeros==0) {
-    phase=0;
-  } else if (zeros==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if ((phtemp & 1)==0) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=ph+1;
-  } else if (ones==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=-(ph+1);
-  } else {
-    phase=0;
-    EEPROMWarnings += ::QObject::tr("Flight modes settings on expos not exported") + "\n";
-  }
-
-  weight = c9x.weight;
-  expo = c9x.expo;
-}
-
 t_Open9xArmExpoData_v208::operator ExpoData ()
 {
   ExpoData c9x;
@@ -332,14 +153,10 @@ t_Open9xArmExpoData_v208::operator ExpoData ()
   }
   else {
     if (curve == 0) {
-        c9x.curveMode=0;
-        c9x.curveParam=expo;
-    } else {
-        c9x.curveMode=1;
-        if (curve <= 10)
-          c9x.curveParam = curve;
-        else
-          c9x.curveParam = curve + 4;
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_EXPO, expo);
+    }
+    else {
+      // TODO
     }
   }
   c9x.swtch = open9xArmToSwitch(swtch);
@@ -355,70 +172,6 @@ t_Open9xArmExpoData_v208::operator ExpoData ()
   return c9x;
 }
 
-t_Open9xArmExpoData_v210::t_Open9xArmExpoData_v210(ExpoData &c9x)
-{
-  mode = c9x.mode;
-  chn = c9x.chn;
-  // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
-  curve = 0;
-  expo = 0;
-  if (c9x.curveMode==1) {
-    if (c9x.curveParam >=0 && c9x.curveParam <= 10)
-      curve = c9x.curveParam;
-    else if (c9x.curveParam >= 15 && c9x.curveParam <= 19)
-      curve = c9x.curveParam - 4;
-    else
-      EEPROMWarnings += ::QObject::tr("Open9x doesn't allow Curve%1 in expos").arg(c9x.curveParam-6) + "\n";
-  }
-  else {
-      expo=c9x.curveParam;
-  }
-
-  swtch = open9xArmFromSwitch(c9x.swtch);
-  int zeros=0;
-  int ones=0;
-  int phtemp=c9x.phases;
-  for (int i=0; i<O9X_MAX_PHASES; i++) {
-    if (phtemp & 1) {
-      ones++;
-    } else {
-      zeros++;
-    }
-    phtemp >>=1;
-  }
-  if (zeros==O9X_MAX_PHASES || zeros==0) {
-    phase=0;
-  } else if (zeros==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if ((phtemp & 1)==0) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=ph+1;
-  } else if (ones==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=-(ph+1);
-  } else {
-    phase=0;
-    EEPROMWarnings += ::QObject::tr("Flight modes settings on expos not exported") + "\n";
-  }
-  weight = c9x.weight;
-  expo = c9x.expo;
-  setEEPROMZString(name, c9x.name, sizeof(name));
-}
-
 t_Open9xArmExpoData_v210::operator ExpoData ()
 {
   ExpoData c9x;
@@ -430,53 +183,36 @@ t_Open9xArmExpoData_v210::operator ExpoData ()
   }
   else {
     if (curve == 0) {
-      c9x.curveMode=0;
-      c9x.curveParam=expo;
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_EXPO, expo);
     }
     else {
-      c9x.curveMode=1;
-      if (curve <= 10)
-        c9x.curveParam = curve;
-      else
-        c9x.curveParam = curve + 4;
+      // TODO
     }
   }
   c9x.swtch = open9xArmToSwitch(swtch);
   if (phase<0) {
     c9x.phases= 1 << (-phase -1);
-  } else if (phase==0) {
+  }
+  else if (phase==0) {
     c9x.phases=0;
-  } else {
+  }
+  else {
     c9x.phases=63;
     c9x.phases &= ~(1 << (phase -1));
   }  
   c9x.weight = weight;
-  c9x.expo = expo;
   getEEPROMZString(c9x.name, name, sizeof(name));
   return c9x;
 }
 
-t_Open9xArmExpoData_v212::t_Open9xArmExpoData_v212(ExpoData &c9x)
-{
-  mode = c9x.mode;
-  chn = c9x.chn;
-  // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
-  curveParam=c9x.curveParam;
-  curveMode=c9x.curveMode;
-  swtch = open9xArmFromSwitch(c9x.swtch);
-  phases=c9x.phases;
-  weight = c9x.weight;
-  setEEPROMZString(name, c9x.name, sizeof(name));
-}
-
 t_Open9xArmExpoData_v212::operator ExpoData ()
 {
   ExpoData c9x;
   c9x.mode = mode;
   c9x.chn = chn;
 
-  c9x.curveMode=curveMode;
-  c9x.curveParam=curveParam;
+  // TODO c9x.curveMode=curveMode;
+  // c9x.curveParam=curveParam;
   c9x.swtch = open9xArmToSwitch(swtch);
   c9x.phases= phases;
   c9x.weight = weight;
@@ -496,16 +232,6 @@ t_Open9xArmPhaseData_v208::operator PhaseData ()
   return c9x;
 }
 
-t_Open9xArmPhaseData_v208::t_Open9xArmPhaseData_v208(PhaseData &c9x)
-{
-  for (int i=0; i<NUM_STICKS; i++)
-    trim[i] = c9x.trim[i];
-  swtch = open9xArmFromSwitch(c9x.swtch);
-  setEEPROMZString(name, c9x.name, sizeof(name));
-  fadeIn = c9x.fadeIn;
-  fadeOut = c9x.fadeOut;
-}
-
 t_Open9xArmPhaseData_v212::operator PhaseData ()
 {
   PhaseData c9x;
@@ -519,103 +245,6 @@ t_Open9xArmPhaseData_v212::operator PhaseData ()
   return c9x;
 }
 
-t_Open9xArmPhaseData_v212::t_Open9xArmPhaseData_v212(PhaseData &c9x)
-{
-  for (int i=0; i<NUM_STICKS; i++)
-    trim[i] = c9x.trim[i];
-  swtch = open9xArmFromSwitch(c9x.swtch);
-  setEEPROMZString(name, c9x.name, sizeof(name));
-  fadeIn = c9x.fadeIn;
-  fadeOut = c9x.fadeOut;
-  rotaryEncoders[0] = c9x.rotaryEncoders[0];
-}
-
-t_Open9xArmMixData_v208::t_Open9xArmMixData_v208(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xArmFromSwitch(c9x.swtch);
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 8;
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 9;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 9 + open9xArmFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 10+9+O9X_ARM_NUM_CSW + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 10+9+O9X_ARM_NUM_CSW+NUM_CYC + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 10+9+O9X_ARM_NUM_CSW+NUM_CYC+NUM_PPM + c9x.srcRaw.index;
-    }
-    weight = c9x.weight;
-    differential = c9x.differential/2;
-    curve = c9x.curve;
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    mltpx = (MltpxValue)c9x.mltpx;
-    int zeros=0;
-    int ones=0;
-    int phtemp=c9x.phases;
-    for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ones++;
-      } else {
-        zeros++;
-      }
-      phtemp >>=1;
-    }
-    if (zeros==O9X_ARM_MAX_PHASES || zeros==0) {
-      phase=0;
-    } else if (zeros==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-        if ((phtemp & 1)==0) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=ph+1;
-    } else if (ones==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-        if (phtemp & 1) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=-(ph+1);
-    } else {
-      phase=0;
-      EEPROMWarnings += ::QObject::tr("Flight modes settings on mixers not exported") + "\n";
-    }
-    sOffset = c9x.sOffset;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xArmMixData_v208));
-  }
-}
-
 t_Open9xArmMixData_v208::operator MixData ()
 {
   MixData c9x;
@@ -646,9 +275,15 @@ t_Open9xArmMixData_v208::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-10-9-O9X_ARM_NUM_CSW-NUM_CYC-NUM_PPM);
     }
     c9x.weight = weight;
-    c9x.differential = differential*2;
     c9x.swtch = open9xArmToSwitch(swtch);
-    c9x.curve = curve;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -656,109 +291,23 @@ t_Open9xArmMixData_v208::operator MixData ()
     c9x.carryTrim = carryTrim;
     c9x.mltpx = (MltpxValue)mltpx;
     c9x.mixWarn = mixWarn;
-//    c9x.phase = phase;
+
     if (phase<0) {
       c9x.phases= 1 << (-phase -1);
-    } else if (phase==0) {
+    }
+    else if (phase==0) {
       c9x.phases=0;
-    } else {
+    }
+    else {
       c9x.phases=511;
       c9x.phases &= ~(1 << (phase -1));
-    }    
+    }
+
     c9x.sOffset = sOffset;
   }
   return c9x;
 }
 
-t_Open9xArmMixData_v209::t_Open9xArmMixData_v209(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xArmFromSwitch(c9x.swtch);
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 8;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-      srcRaw = 9 + c9x.srcRaw.index;
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 13;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 13 + open9xArmFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 14+9+O9X_ARM_NUM_CSW + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 14+9+O9X_ARM_NUM_CSW+NUM_CYC + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 14+9+O9X_ARM_NUM_CSW+NUM_CYC+NUM_PPM + c9x.srcRaw.index;
-    }
-    weight = c9x.weight;
-    differential = c9x.differential/2;
-    curve = c9x.curve;
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    mltpx = (MltpxValue)c9x.mltpx;
-    int zeros=0;
-    int ones=0;
-    int phtemp=c9x.phases;
-    for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ones++;
-      } else {
-        zeros++;
-      }
-      phtemp >>=1;
-    }
-    if (zeros==O9X_ARM_MAX_PHASES || zeros==0) {
-      phase=0;
-    } else if (zeros==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-        if ((phtemp & 1)==0) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=ph+1;
-    } else if (ones==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-        if (phtemp & 1) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=-(ph+1);
-    } else {
-      phase=0;
-      EEPROMWarnings += ::QObject::tr("Flight modes settings on mixers not exported") + "\n";
-    }
-    sOffset = c9x.sOffset;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xArmMixData_v209));
-  }
-}
-
 t_Open9xArmMixData_v209::operator MixData ()
 {
   MixData c9x;
@@ -792,9 +341,15 @@ t_Open9xArmMixData_v209::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-14-9-O9X_ARM_NUM_CSW-NUM_CYC-NUM_PPM);
     }
     c9x.weight = weight;
-    c9x.differential = differential*2;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
     c9x.swtch = open9xArmToSwitch(swtch);
-    c9x.curve = curve;
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -802,110 +357,23 @@ t_Open9xArmMixData_v209::operator MixData ()
     c9x.carryTrim = carryTrim;
     c9x.mltpx = (MltpxValue)mltpx;
     c9x.mixWarn = mixWarn;
-   // c9x.phase = phase;
+
     if (phase<0) {
       c9x.phases= 1 << (-phase -1);
-    } else if (phase==0) {
+    }
+    else if (phase==0) {
       c9x.phases=0;
-    } else {
+    }
+    else {
       c9x.phases=511;
       c9x.phases &= ~(1 << (phase -1));
-    }    
+    }
+
     c9x.sOffset = sOffset;
   }
   return c9x;
 }
 
-t_Open9xArmMixData_v210::t_Open9xArmMixData_v210(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xArmFromSwitch(c9x.swtch);
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-      srcRaw = 8 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 12;
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 13;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 13 + open9xArmFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 14+9+O9X_ARM_NUM_CSW + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 14+9+O9X_ARM_NUM_CSW+NUM_CYC + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 14+9+O9X_ARM_NUM_CSW+NUM_CYC+NUM_PPM + c9x.srcRaw.index;
-    }
-    weight = c9x.weight;
-    differential = c9x.differential/2;
-    curve = c9x.curve;
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    mltpx = (MltpxValue)c9x.mltpx;
-    int zeros=0;
-    int ones=0;
-    int phtemp=c9x.phases;
-    for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ones++;
-      } else {
-        zeros++;
-      }
-      phtemp >>=1;
-    }
-    if (zeros==O9X_ARM_MAX_PHASES || zeros==0) {
-      phase=0;
-    } else if (zeros==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-        if ((phtemp & 1)==0) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=ph+1;
-    } else if (ones==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-        if (phtemp & 1) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=-(ph+1);
-    } else {
-      phase=0;
-      EEPROMWarnings += ::QObject::tr("Flight modes settings on mixers not exported") + "\n";
-    }
-    sOffset = c9x.sOffset;
-    setEEPROMZString(name, c9x.name, sizeof(name));
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xArmMixData_v210));
-  }
-}
-
 t_Open9xArmMixData_v210::operator MixData ()
 {
   MixData c9x;
@@ -939,9 +407,15 @@ t_Open9xArmMixData_v210::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-14-9-O9X_ARM_NUM_CSW-NUM_CYC-NUM_PPM);
     }
     c9x.weight = weight;
-    c9x.differential = differential*2;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
     c9x.swtch = open9xArmToSwitch(swtch);
-    c9x.curve = curve;
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -949,82 +423,24 @@ t_Open9xArmMixData_v210::operator MixData ()
     c9x.carryTrim = carryTrim;
     c9x.mltpx = (MltpxValue)mltpx;
     c9x.mixWarn = mixWarn;
-  //  c9x.phase = phase;
+
     if (phase<0) {
       c9x.phases= 1 << (-phase -1);
-    } else if (phase==0) {
+    }
+    else if (phase==0) {
       c9x.phases=0;
-    } else {
+    }
+    else {
       c9x.phases=511;
       c9x.phases &= ~(1 << (phase -1));
     }
+
     c9x.sOffset = sOffset;
     getEEPROMZString(c9x.name, name, sizeof(name));
   }
   return c9x;
 }
 
-t_Open9xArmMixData_v212::t_Open9xArmMixData_v212(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xArmFromSwitch(c9x.swtch);
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-      srcRaw = 8;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-      srcRaw = 9 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 13;
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 14;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 14 + open9xArmFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 15+9+O9X_ARM_NUM_CSW + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 15+9+O9X_ARM_NUM_CSW+NUM_CYC + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 15+9+O9X_ARM_NUM_CSW+NUM_CYC+NUM_PPM + c9x.srcRaw.index;
-    }
-    weight = c9x.weight;
-    if (c9x.curve==0) {
-      curveMode=0;
-      curveParam=c9x.differential;
-    } else {
-      curveMode=1;
-      curveParam = c9x.curve;
-    }
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    noExpo = c9x.noExpo;
-    mltpx = (MltpxValue)c9x.mltpx;
-    phases = c9x.phases;
-    sOffset = c9x.sOffset;
-    setEEPROMZString(name, c9x.name, sizeof(name));
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xArmMixData_v210));
-  }
-}
-
 t_Open9xArmMixData_v212::operator MixData ()
 {
   MixData c9x;
@@ -1061,12 +477,14 @@ t_Open9xArmMixData_v212::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-15-9-O9X_ARM_NUM_CSW-NUM_CYC-NUM_PPM);
     }
     c9x.weight = weight;
+
     if (curveMode==0) {
-      c9x.differential = curveParam;
-      c9x.curve=0;
-    } else {
-      c9x.curve=curveParam;
-    }    
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, curveParam);
+    }
+    else {
+      // TODO
+    }
+
     c9x.swtch = open9xArmToSwitch(swtch);
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
@@ -1083,33 +501,6 @@ t_Open9xArmMixData_v212::operator MixData ()
   return c9x;
 }
 
-t_Open9xArmCustomSwData_v208::t_Open9xArmCustomSwData_v208(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = open9xArm208FromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    v2 = open9xArm208FromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = open9xArmFromSwitch(RawSwitch(c9x.val1));
-    v2 = open9xArmFromSwitch(RawSwitch(c9x.val2));
-  }
-  
-  if (func>O9X_ARM_MAX_CSFUNCOLD ) {
-    EEPROMWarnings += ::QObject::tr("This version of open9x does not support Custom Switch function %1").arg(getFuncName(func)) + "\n";
-    func=0;
-    v1=0;
-    v2=0;
-  }    
-}
-
 t_Open9xArmCustomSwData_v208::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -1133,33 +524,6 @@ t_Open9xArmCustomSwData_v208::operator CustomSwData ()
   return c9x;
 }
 
-t_Open9xArmCustomSwData_v209::t_Open9xArmCustomSwData_v209(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = open9xArm209FromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    v2 = open9xArm209FromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = open9xArmFromSwitch(RawSwitch(c9x.val1));
-    v2 = open9xArmFromSwitch(RawSwitch(c9x.val2));
-  }
-  
-  if (func>O9X_ARM_MAX_CSFUNCOLD ) {
-    EEPROMWarnings += ::QObject::tr("This version of open9x does not support Custom Switch function %1").arg(getFuncName(func)) + "\n";
-    func=0;
-    v1=0;
-    v2=0;
-  }    
-}
-
 t_Open9xArmCustomSwData_v209::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -1183,28 +547,6 @@ t_Open9xArmCustomSwData_v209::operator CustomSwData ()
   return c9x;
 }
 
-t_Open9xArmCustomSwData_v210::t_Open9xArmCustomSwData_v210(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  delay = c9x.delay;
-  duration = c9x.duration;
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = open9xArm210FromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL && c9x.func <= CS_FN_ELESS) {
-    v2 = open9xArm210FromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = open9xArmFromSwitch(RawSwitch(c9x.val1));
-    v2 = open9xArmFromSwitch(RawSwitch(c9x.val2));
-  }
-}
-
 t_Open9xArmCustomSwData_v210::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -1230,21 +572,6 @@ t_Open9xArmCustomSwData_v210::operator CustomSwData ()
   return c9x;
 }
 
-t_Open9xArmFuncSwData_v208::t_Open9xArmFuncSwData_v208(FuncSwData &c9x)
-{
-  swtch = open9xArmFromSwitch(c9x.swtch);
-  if (c9x.func <= FuncSafetyCh16) {
-    param = ((c9x.param>>1)<<1);
-    param |=(c9x.enabled & 0x01);
-  } else {
-    param = c9x.param;
-    if ((c9x.func == FuncPlayValue || c9x.func == FuncVolume) && param > 7) {
-      param -= -2;
-    }
-  }
-  func = c9x.func;  
-}
-
 t_Open9xArmFuncSwData_v208::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -1263,29 +590,6 @@ t_Open9xArmFuncSwData_v208::operator FuncSwData ()
   return c9x;
 }
 
-t_Open9xArmFuncSwData_v210::t_Open9xArmFuncSwData_v210(FuncSwData &c9x)
-{
-  swtch = open9xArmFromSwitch(c9x.swtch);
-  uint32_t value;
-  if (c9x.func <= FuncInstantTrim) {
-    value = ((c9x.param>>1)<<1);
-    value |=(c9x.enabled & 0x01);
-  }
-  else {
-    if (c9x.func == FuncPlayPrompt || c9x.func == FuncBackgroundMusic) {
-      memcpy(param, c9x.paramarm, sizeof(param));
-    }
-    else {
-     value = c9x.param;
-     if ((c9x.func == FuncPlayValue || c9x.func == FuncVolume) && value > 7) {
-       value-=2;
-     }
-     *((uint32_t *)param) = value;
-    }
-  }
-  func = c9x.func;
-}
-
 t_Open9xArmFuncSwData_v210::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -1310,30 +614,6 @@ t_Open9xArmFuncSwData_v210::operator FuncSwData ()
   return c9x;
 }
 
-t_Open9xArmFuncSwData_v211::t_Open9xArmFuncSwData_v211(FuncSwData &c9x)
-{
-  swtch = open9xArmFromSwitch(c9x.swtch);
-  uint32_t value;
-  if (c9x.func <= FuncInstantTrim) {
-     value = c9x.param;
-     *((uint32_t *)param) = value;
-    delay=(c9x.enabled & 0x01);
-  }
-  else {
-    if (c9x.func == FuncPlayPrompt || c9x.func == FuncBackgroundMusic) {
-      memcpy(param, c9x.paramarm, sizeof(param));
-    }
-    else {
-      value = c9x.param;
-      if ((c9x.func == FuncPlayValue || c9x.func == FuncVolume || (c9x.func >= FuncAdjustGV1 && c9x.func <= FuncAdjustGV5)) && value > 7) {
-        value--;
-      }
-      *((uint32_t *)param) = value;
-    }
-  }
-  func = c9x.func;
-}
-
 t_Open9xArmFuncSwData_v211::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -1350,7 +630,7 @@ t_Open9xArmFuncSwData_v211::operator FuncSwData ()
     }
     else {
       c9x.param = value;
-      if ((c9x.func == FuncPlayValue || c9x.func == FuncVolume || (c9x.func >= FuncAdjustGV1 && c9x.func <= FuncAdjustGV5)) && value > 7) {
+      if ((c9x.func == FuncPlayValue || c9x.func == FuncVolume || (c9x.func >= FuncAdjustGV1 && c9x.func <= FuncAdjustGVLast)) && value > 7) {
         c9x.param++;
       } 
     }
@@ -1358,16 +638,6 @@ t_Open9xArmFuncSwData_v211::operator FuncSwData ()
   return c9x;
 }
 
-t_Open9xArmSwashRingData_v208::t_Open9xArmSwashRingData_v208(SwashRingData &c9x)
-{
-  invertELE = c9x.invertELE;
-  invertAIL = c9x.invertAIL;
-  invertCOL = c9x.invertCOL;
-  type = c9x.type;
-  collectiveSource = open9xArm208FromSource(c9x.collectiveSource);
-  value = c9x.value;
-}
-
 t_Open9xArmSwashRingData_v208::operator SwashRingData ()
 {
   SwashRingData c9x;
@@ -1380,16 +650,6 @@ t_Open9xArmSwashRingData_v208::operator SwashRingData ()
   return c9x;
 }
 
-t_Open9xArmSwashRingData_v209::t_Open9xArmSwashRingData_v209(SwashRingData &c9x)
-{
-  invertELE = c9x.invertELE;
-  invertAIL = c9x.invertAIL;
-  invertCOL = c9x.invertCOL;
-  type = c9x.type;
-  collectiveSource = open9xArm209FromSource(c9x.collectiveSource);
-  value = c9x.value;
-}
-
 t_Open9xArmSwashRingData_v209::operator SwashRingData ()
 {
   SwashRingData c9x;
@@ -1402,16 +662,6 @@ t_Open9xArmSwashRingData_v209::operator SwashRingData ()
   return c9x;
 }
 
-t_Open9xArmSwashRingData_v210::t_Open9xArmSwashRingData_v210(SwashRingData &c9x)
-{
-  invertELE = c9x.invertELE;
-  invertAIL = c9x.invertAIL;
-  invertCOL = c9x.invertCOL;
-  type = c9x.type;
-  collectiveSource = open9xArm210FromSource(c9x.collectiveSource);
-  value = c9x.value;
-}
-
 t_Open9xArmSwashRingData_v210::operator SwashRingData ()
 {
   SwashRingData c9x;
@@ -1452,31 +702,6 @@ t_Open9xArmFrSkyData_v210::operator FrSkyData ()
   return c9x;
 }
 
-t_Open9xArmFrSkyData_v210::t_Open9xArmFrSkyData_v210(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xArmFrSkyData_v210));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-  usrProto = c9x.usrProto;
-  voltsSource = c9x.voltsSource;
-  blades = c9x.blades;
-  currentSource=c9x.currentSource;
-  for (int i=0; i<4; i++) {
-    bars[i].source = c9x.screens[0].body.bars[i].source;
-    bars[i].barMin = c9x.screens[0].body.bars[i].barMin;
-    bars[i].barMax = c9x.screens[0].body.bars[i].barMax;
-  }
-  for (int line=0; line<4; line++) {
-    for (int col=0; col<2; col++) {
-      int i=line*2+col;
-      lines[i]=c9x.screens[1].body.lines[line].source[col];
-    }
-  }
-  rssiAlarms[0] = Open9xFrSkyRSSIAlarm(0, c9x.rssiAlarms[0]);
-  rssiAlarms[1] = Open9xFrSkyRSSIAlarm(1, c9x.rssiAlarms[1]);
-}
-
-
 t_Open9xArmFrSkyData_v211::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -1509,33 +734,6 @@ t_Open9xArmFrSkyData_v211::operator FrSkyData ()
   return c9x;
 }
 
-t_Open9xArmFrSkyData_v211::t_Open9xArmFrSkyData_v211(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xArmFrSkyData_v211));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-  usrProto = c9x.usrProto;
-  voltsSource = c9x.voltsSource;
-  blades = c9x.blades;
-  currentSource=c9x.currentSource;
-  for (int i=0; i<4; i++) {
-    bars[i].source = c9x.screens[0].body.bars[i].source;
-    bars[i].barMin = c9x.screens[0].body.bars[i].barMin;
-    bars[i].barMax = c9x.screens[0].body.bars[i].barMax;
-  }
-  for (int line=0; line<4; line++) {
-    for (int col=0; col<2; col++) {
-      int i=line*2+col;
-      lines[i]=c9x.screens[1].body.lines[line].source[col];
-    }
-  }
-  rssiAlarms[0] = Open9xFrSkyRSSIAlarm(0, c9x.rssiAlarms[0]);
-  rssiAlarms[1] = Open9xFrSkyRSSIAlarm(1, c9x.rssiAlarms[1]);
-  varioSource = c9x.varioSource;
-  varioSpeedUpMin = c9x.varioCenterMax;
-  varioSpeedDownMin = c9x.varioCenterMin;
-}
-
 t_Open9xArmModelData_v208::operator ModelData ()
 {
   ModelData c9x;
@@ -1587,7 +785,6 @@ t_Open9xArmModelData_v208::operator ModelData ()
   for (int i=0; i<O9X_ARM_MAX_EXPOS; i++)
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1595,7 +792,6 @@ t_Open9xArmModelData_v208::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1627,116 +823,6 @@ t_Open9xArmModelData_v208::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_208 1882
-t_Open9xArmModelData_v208::t_Open9xArmModelData_v208(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_208) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_208));
-  }
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<C9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_ARM_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-/* TODO   for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-    for (int i=0; i<O9X_ARM_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_ARM_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xArmFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    varioSource = c9x.frsky.varioSource;
-    varioSpeedUpMin = c9x.frsky.varioCenterMax;
-    varioSpeedDownMin = c9x.frsky.varioCenterMin;
-
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyLinesXtra=0;
-    for (int j=0; j<4; j++) {
-      frskyLines[j] = 0;
-      for (int k=0; k<2; k++) {
-        int value = c9x.frsky.screens[1].body.lines[j].source[k];
-        frskyLines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-        frskyLinesXtra |= (value / 16) << (4*j+2*k);
-      }
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xArmModelData_v208));
-  }
-}
-
 t_Open9xArmModelData_v209::operator ModelData ()
 {
   ModelData c9x;
@@ -1788,7 +874,6 @@ t_Open9xArmModelData_v209::operator ModelData ()
   for (int i=0; i<O9X_ARM_MAX_EXPOS; i++)
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1796,7 +881,6 @@ t_Open9xArmModelData_v209::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1829,117 +913,6 @@ t_Open9xArmModelData_v209::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_209 1883
-t_Open9xArmModelData_v209::t_Open9xArmModelData_v209(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_209) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_209));
-  }
-
-  memset(this, 0, sizeof(t_Open9xArmModelData_v209));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<C9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_ARM_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    /* TODO for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-    for (int i=0; i<O9X_ARM_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_ARM_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xArmFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    varioSource = c9x.frsky.varioSource;
-    varioSpeedUpMin = c9x.frsky.varioCenterMax;
-    varioSpeedDownMin = c9x.frsky.varioCenterMin;
-    switchWarningStates = c9x.switchWarningStates;
-    
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyLinesXtra=0;
-    for (int j=0; j<4; j++) {
-      frskyLines[j] = 0;
-      for (int k=0; k<2; k++) {
-        int value = c9x.frsky.screens[1].body.lines[j].source[k];
-        frskyLines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-        frskyLinesXtra |= (value / 16) << (4*j+2*k);
-      }
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-}
-
-
 t_Open9xArmModelData_v210::operator ModelData ()
 {
   ModelData c9x;
@@ -1991,7 +964,6 @@ t_Open9xArmModelData_v210::operator ModelData ()
   for (int i=0; i<O9X_ARM_MAX_EXPOS; i++)
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1999,7 +971,6 @@ t_Open9xArmModelData_v210::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -2026,108 +997,6 @@ t_Open9xArmModelData_v210::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_210 3085
-t_Open9xArmModelData_v210::t_Open9xArmModelData_v210(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_210) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_210));
-  }
-
-  memset(this, 0, sizeof(t_Open9xArmModelData_v210));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<C9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_ARM_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    /* TODO for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-    for (int i=0; i<O9X_ARM_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_ARM_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xArmFromSwitch(c9x.safetySw[i].swtch);
-        *((uint32_t *)funcSw[count].param) = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    varioSource = c9x.frsky.varioSource;
-    varioSpeedUpMin = c9x.frsky.varioCenterMax;
-    varioSpeedDownMin = c9x.frsky.varioCenterMin;
-    switchWarningStates = c9x.switchWarningStates;
-
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-}
-
 t_Open9xArmModelData_v211::operator ModelData ()
 {
   ModelData c9x;
@@ -2180,7 +1049,7 @@ t_Open9xArmModelData_v211::operator ModelData ()
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_ARM_MAX_CURVES; i++) {
     CurveInfo crvinfo = curveinfo(this, i);
-    c9x.curves[i].custom = crvinfo.custom;
+    c9x.curves[i].type = (crvinfo.custom ? CurveData::CURVE_TYPE_CUSTOM : CurveData::CURVE_TYPE_STANDARD);
     c9x.curves[i].count = crvinfo.points;
     for (int j=0; j<crvinfo.points; j++)
       c9x.curves[i].points[j].y = crvinfo.crv[j];
@@ -2212,119 +1081,6 @@ t_Open9xArmModelData_v211::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_ARM_211 3585
-t_Open9xArmModelData_v211::t_Open9xArmModelData_v211(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_ARM_211) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_ARM_211));
-  }
-
-  memset(this, 0, sizeof(t_Open9xArmModelData_v211));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<C9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_ARM_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-
-    int8_t * cur = &points[0];
-    int offset = 0;
-    for (int i=0; i<O9X_ARM_MAX_CURVES; i++) {
-      offset += (c9x.curves[i].custom ? c9x.curves[i].count * 2 - 2 : c9x.curves[i].count) - 5;
-      if (offset > O9X_ARM_NUM_POINTS - 5 * O9X_ARM_MAX_CURVES) {
-        EEPROMWarnings += ::QObject::tr("open9x only accepts %1 points in all curves").arg(O9X_ARM_NUM_POINTS) + "\n";
-        break;
-      }
-      curves[i] = offset;
-      for (int j=0; j<c9x.curves[i].count; j++) {
-        *cur++ = c9x.curves[i].points[j].y;
-      }
-      if (c9x.curves[i].custom) {
-        for (int j=1; j<c9x.curves[i].count-1; j++) {
-          *cur++ = c9x.curves[i].points[j].x;
-        }
-      }
-    }
-
-    for (int i=0; i<O9X_ARM_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_ARM_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xArmFromSwitch(c9x.safetySw[i].swtch);
-        *((uint32_t *)funcSw[count].param) = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    switchWarningStates = c9x.switchWarningStates;
-
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-}
-
 t_Open9xArmModelData_v212::operator ModelData ()
 {
   ModelData c9x;
@@ -2380,7 +1136,7 @@ t_Open9xArmModelData_v212::operator ModelData ()
     c9x.expoData[i] = expoData[i];
   for (int i=0; i<O9X_ARM_MAX_CURVES; i++) {
     CurveInfo crvinfo = curveinfo(this, i);
-    c9x.curves[i].custom = crvinfo.custom;
+    c9x.curves[i].type = (crvinfo.custom ? CurveData::CURVE_TYPE_CUSTOM : CurveData::CURVE_TYPE_STANDARD);
     c9x.curves[i].count = crvinfo.points;
     for (int j=0; j<crvinfo.points; j++)
       c9x.curves[i].points[j].y = crvinfo.crv[j];
@@ -2407,115 +1163,3 @@ t_Open9xArmModelData_v212::operator ModelData ()
   c9x.modelId = modelId;
   return c9x;
 }
-
-#define MODEL_DATA_SIZE_212 3159
-t_Open9xArmModelData_v212::t_Open9xArmModelData_v212(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_212) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_212));
-  }
-
-  memset(this, 0, sizeof(t_Open9xArmModelData_v212));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++) {
-      timers[i] = c9x.timers[i];
-      timersXtra[i].value=c9x.timers[i].val;
-      timersXtra[i].remanent=c9x.timers[i].persistent;
-    }
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare1 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = c9x.beepANACenter;
-    for (int i=0; i<C9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_ARM_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-
-    int8_t * cur = &points[0];
-    int offset = 0;
-    for (int i=0; i<O9X_ARM_MAX_CURVES; i++) {
-      offset += (c9x.curves[i].custom ? c9x.curves[i].count * 2 - 2 : c9x.curves[i].count) - 5;
-      if (offset > O9X_ARM_NUM_POINTS - 5 * O9X_ARM_MAX_CURVES) {
-        EEPROMWarnings += ::QObject::tr("open9x only accepts %1 points in all curves").arg(O9X_ARM_NUM_POINTS) + "\n";
-        break;
-      }
-      curves[i] = offset;
-      for (int j=0; j<c9x.curves[i].count; j++) {
-        *cur++ = c9x.curves[i].points[j].y;
-      }
-      if (c9x.curves[i].custom) {
-        for (int j=1; j<c9x.curves[i].count-1; j++) {
-          *cur++ = c9x.curves[i].points[j].x;
-        }
-      }
-    }
-
-    for (int i=0; i<O9X_ARM_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_ARM_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_ARM_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xArmFromSwitch(c9x.safetySw[i].swtch);
-        *((uint32_t *)funcSw[count].param) = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_ARM_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    switchWarningStates = c9x.switchWarningStates;
-
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-  }
-}
diff --git a/companion/src/firmwares/opentx/open9xSky9xeeprom.h b/companion/src/firmwares/opentx/open9xSky9xeeprom.h
index 1c28d6d18..b313169b8 100644
--- a/companion/src/firmwares/opentx/open9xSky9xeeprom.h
+++ b/companion/src/firmwares/opentx/open9xSky9xeeprom.h
@@ -36,7 +36,6 @@ PACK(typedef struct t_Open9xArmTimerData_v202 {
 
   operator TimerData();
   t_Open9xArmTimerData_v202() { memset(this, 0, sizeof(t_Open9xArmTimerData_v202)); }
-  t_Open9xArmTimerData_v202(TimerData &eepe);
 }) Open9xArmTimerData_v202;
 
 PACK(typedef struct t_Open9xArmExpoData_v208 {
@@ -50,8 +49,6 @@ PACK(typedef struct t_Open9xArmExpoData_v208 {
 
   operator ExpoData();
   t_Open9xArmExpoData_v208() { memset(this, 0, sizeof(t_Open9xArmExpoData_v208)); }
-  t_Open9xArmExpoData_v208(ExpoData&);
-
 }) Open9xArmExpoData_v208;
 
 PACK(typedef struct t_Open9xArmExpoData_v210 {
@@ -67,8 +64,6 @@ PACK(typedef struct t_Open9xArmExpoData_v210 {
 
   operator ExpoData();
   t_Open9xArmExpoData_v210() { memset(this, 0, sizeof(t_Open9xArmExpoData_v210)); }
-  t_Open9xArmExpoData_v210(ExpoData&);
-
 }) Open9xArmExpoData_v210;
 
 PACK(typedef struct t_Open9xArmExpoData_v212 {
@@ -83,8 +78,6 @@ PACK(typedef struct t_Open9xArmExpoData_v212 {
 
   operator ExpoData();
   t_Open9xArmExpoData_v212() { memset(this, 0, sizeof(t_Open9xArmExpoData_v212)); }
-  t_Open9xArmExpoData_v212(ExpoData&);
-
 }) Open9xArmExpoData_v212;
 
 PACK(typedef struct t_Open9xArmMixData_v208 {
@@ -106,8 +99,6 @@ PACK(typedef struct t_Open9xArmMixData_v208 {
 
  operator MixData();
   t_Open9xArmMixData_v208() { memset(this, 0, sizeof(t_Open9xArmMixData_v208)); }
-  t_Open9xArmMixData_v208(MixData&);
-
 }) Open9xArmMixData_v208;
 
 PACK(typedef struct t_Open9xArmMixData_v209 {
@@ -129,8 +120,6 @@ PACK(typedef struct t_Open9xArmMixData_v209 {
 
  operator MixData();
   t_Open9xArmMixData_v209() { memset(this, 0, sizeof(t_Open9xArmMixData_v209)); }
-  t_Open9xArmMixData_v209(MixData&);
-
 }) Open9xArmMixData_v209;
 
 PACK(typedef struct t_Open9xArmMixData_v210 {
@@ -154,8 +143,6 @@ PACK(typedef struct t_Open9xArmMixData_v210 {
 
  operator MixData();
   t_Open9xArmMixData_v210() { memset(this, 0, sizeof(t_Open9xArmMixData_v210)); }
-  t_Open9xArmMixData_v210(MixData&);
-
 }) Open9xArmMixData_v210;
 
 PACK(typedef struct t_Open9xArmMixData_v212 {
@@ -180,8 +167,6 @@ PACK(typedef struct t_Open9xArmMixData_v212 {
 
  operator MixData();
   t_Open9xArmMixData_v212() { memset(this, 0, sizeof(t_Open9xArmMixData_v212)); }
-  t_Open9xArmMixData_v212(MixData&);
-
 }) Open9xArmMixData_v212;
 
 PACK(typedef struct t_Open9xArmPhaseData_v208 {
@@ -192,7 +177,6 @@ PACK(typedef struct t_Open9xArmPhaseData_v208 {
   uint8_t fadeOut:4;
   operator PhaseData();
   t_Open9xArmPhaseData_v208() { memset(this, 0, sizeof(t_Open9xArmPhaseData_v208)); }
-  t_Open9xArmPhaseData_v208(PhaseData &eepe);
 }) Open9xArmPhaseData_v208;
 
 PACK(typedef struct t_Open9xArmPhaseData_v212 {
@@ -204,7 +188,6 @@ PACK(typedef struct t_Open9xArmPhaseData_v212 {
   int16_t rotaryEncoders[1];
   operator PhaseData();
   t_Open9xArmPhaseData_v212() { memset(this, 0, sizeof(t_Open9xArmPhaseData_v212)); }
-  t_Open9xArmPhaseData_v212(PhaseData &eepe);
 }) Open9xArmPhaseData_v212;
 
 PACK(typedef struct t_Open9xArmCustomSwData_v208 { // Custom Switches data
@@ -214,7 +197,6 @@ PACK(typedef struct t_Open9xArmCustomSwData_v208 { // Custom Switches data
 
   operator CustomSwData();
   t_Open9xArmCustomSwData_v208() { memset(this, 0, sizeof(t_Open9xArmCustomSwData_v208)); }
-  t_Open9xArmCustomSwData_v208(CustomSwData&);
 }) Open9xArmCustomSwData_v208;
 
 PACK(typedef struct t_Open9xArmCustomSwData_v209 { // Custom Switches data
@@ -224,7 +206,6 @@ PACK(typedef struct t_Open9xArmCustomSwData_v209 { // Custom Switches data
 
   operator CustomSwData();
   t_Open9xArmCustomSwData_v209() { memset(this, 0, sizeof(t_Open9xArmCustomSwData_v209)); }
-  t_Open9xArmCustomSwData_v209(CustomSwData&);
 }) Open9xArmCustomSwData_v209;
 
 PACK(typedef struct t_Open9xArmCustomSwData_v210 { // Custom Switches data
@@ -236,7 +217,6 @@ PACK(typedef struct t_Open9xArmCustomSwData_v210 { // Custom Switches data
 
   operator CustomSwData();
   t_Open9xArmCustomSwData_v210() { memset(this, 0, sizeof(t_Open9xArmCustomSwData_v210)); }
-  t_Open9xArmCustomSwData_v210(CustomSwData&);
 }) Open9xArmCustomSwData_v210;
 
 PACK(typedef struct t_Open9xArmFuncSwData_v208 { // Function Switches data
@@ -246,8 +226,6 @@ PACK(typedef struct t_Open9xArmFuncSwData_v208 { // Function Switches data
 
   operator FuncSwData();
   t_Open9xArmFuncSwData_v208() { memset(this, 0, sizeof(t_Open9xArmFuncSwData_v208)); }
-  t_Open9xArmFuncSwData_v208(FuncSwData&);
-
 }) Open9xArmFuncSwData_v208;
 
 PACK(typedef struct t_Open9xArmFuncSwData_v210 { // Function Switches data
@@ -257,8 +235,6 @@ PACK(typedef struct t_Open9xArmFuncSwData_v210 { // Function Switches data
 
   operator FuncSwData();
   t_Open9xArmFuncSwData_v210() { memset(this, 0, sizeof(t_Open9xArmFuncSwData_v210)); }
-  t_Open9xArmFuncSwData_v210(FuncSwData&);
-
 }) Open9xArmFuncSwData_v210;
 
 PACK(typedef struct t_Open9xArmFuncSwData_v211 { // Function Switches data
@@ -270,8 +246,6 @@ PACK(typedef struct t_Open9xArmFuncSwData_v211 { // Function Switches data
 
   operator FuncSwData();
   t_Open9xArmFuncSwData_v211() { memset(this, 0, sizeof(t_Open9xArmFuncSwData_v211)); }
-  t_Open9xArmFuncSwData_v211(FuncSwData&);
-
 }) Open9xArmFuncSwData_v211;
 
 PACK(typedef struct t_Open9xArmSwashRingData_v208 { // Swash Ring data
@@ -284,8 +258,6 @@ PACK(typedef struct t_Open9xArmSwashRingData_v208 { // Swash Ring data
 
   operator SwashRingData();
   t_Open9xArmSwashRingData_v208() { memset(this, 0, sizeof(t_Open9xArmSwashRingData_v208)); }
-  t_Open9xArmSwashRingData_v208(SwashRingData&);
-
 }) Open9xArmSwashRingData_v208;
 
 PACK(typedef struct t_Open9xArmSwashRingData_v209 { // Swash Ring data
@@ -298,8 +270,6 @@ PACK(typedef struct t_Open9xArmSwashRingData_v209 { // Swash Ring data
 
   operator SwashRingData();
   t_Open9xArmSwashRingData_v209() { memset(this, 0, sizeof(t_Open9xArmSwashRingData_v209)); }
-  t_Open9xArmSwashRingData_v209(SwashRingData&);
-
 }) Open9xArmSwashRingData_v209;
 
 PACK(typedef struct t_Open9xArmSwashRingData_v210 { // Swash Ring data
@@ -312,8 +282,6 @@ PACK(typedef struct t_Open9xArmSwashRingData_v210 { // Swash Ring data
 
   operator SwashRingData();
   t_Open9xArmSwashRingData_v210() { memset(this, 0, sizeof(t_Open9xArmSwashRingData_v210)); }
-  t_Open9xArmSwashRingData_v210(SwashRingData&);
-
 }) Open9xArmSwashRingData_v210;
 
 
@@ -336,7 +304,6 @@ PACK(typedef struct t_Open9xArmFrSkyData_v210 {
 
   operator FrSkyData();
   t_Open9xArmFrSkyData_v210() { memset(this, 0, sizeof(t_Open9xArmFrSkyData_v210)); }
-  t_Open9xArmFrSkyData_v210(FrSkyData&);
 }) Open9xArmFrSkyData_v210;
 
 PACK(typedef struct t_Open9xArmFrSkyData_v211 {
@@ -355,7 +322,6 @@ PACK(typedef struct t_Open9xArmFrSkyData_v211 {
 
   operator FrSkyData();
   t_Open9xArmFrSkyData_v211() { memset(this, 0, sizeof(t_Open9xArmFrSkyData_v211)); }
-  t_Open9xArmFrSkyData_v211(FrSkyData&);
 }) Open9xArmFrSkyData_v211;
 
 PACK(typedef struct t_Open9xArmModelData_v208 {
@@ -395,8 +361,6 @@ PACK(typedef struct t_Open9xArmModelData_v208 {
 
   operator ModelData();
   t_Open9xArmModelData_v208() { memset(this, 0, sizeof(t_Open9xArmModelData_v208)); }
-  t_Open9xArmModelData_v208(ModelData&);
-
 }) Open9xArmModelData_v208;
 
 PACK(typedef struct t_Open9xArmModelData_v209 {
@@ -437,8 +401,6 @@ PACK(typedef struct t_Open9xArmModelData_v209 {
 
   operator ModelData();
   t_Open9xArmModelData_v209() { memset(this, 0, sizeof(t_Open9xArmModelData_v209)); }
-  t_Open9xArmModelData_v209(ModelData&);
-
 }) Open9xArmModelData_v209;
 
 PACK(typedef struct t_Open9xArmModelData_v210 {
@@ -477,7 +439,6 @@ PACK(typedef struct t_Open9xArmModelData_v210 {
 
   operator ModelData();
   t_Open9xArmModelData_v210() { memset(this, 0, sizeof(t_Open9xArmModelData_v210)); }
-  t_Open9xArmModelData_v210(ModelData&);
 
 }) Open9xArmModelData_v210;
 
@@ -517,8 +478,6 @@ PACK(typedef struct t_Open9xArmModelData_v211 {
 
   operator ModelData();
   t_Open9xArmModelData_v211() { memset(this, 0, sizeof(t_Open9xArmModelData_v211)); }
-  t_Open9xArmModelData_v211(ModelData&);
-
 }) Open9xArmModelData_v211;
 
 PACK(typedef struct t_Open9xArmModelData_v212 {
@@ -555,8 +514,6 @@ PACK(typedef struct t_Open9xArmModelData_v212 {
   
   operator ModelData();
   t_Open9xArmModelData_v212() { memset(this, 0, sizeof(t_Open9xArmModelData_v212)); }
-  t_Open9xArmModelData_v212(ModelData&);
-
 }) Open9xArmModelData_v212;
 
 #endif
diff --git a/companion/src/firmwares/opentx/open9xStockeeprom.cpp b/companion/src/firmwares/opentx/open9xStockeeprom.cpp
index 274e91be9..0fc602e04 100644
--- a/companion/src/firmwares/opentx/open9xStockeeprom.cpp
+++ b/companion/src/firmwares/opentx/open9xStockeeprom.cpp
@@ -62,28 +62,6 @@ void getEEPROMZString(char *dst, const char *src, int size)
   }
 }
 
-int8_t open9xStockFromSwitch(const RawSwitch & sw)
-{
-  switch (sw.type) {
-    case SWITCH_TYPE_SWITCH:
-      return sw.index;
-    case SWITCH_TYPE_VIRTUAL:
-      return sw.index > 0 ? (9 + sw.index) : (-9 + sw.index);
-    case SWITCH_TYPE_ON:
-      return 22;
-    case SWITCH_TYPE_OFF:
-      return -22;
-    case SWITCH_TYPE_MOMENT_SWITCH:
-      return sw.index > 0 ? (22 + sw.index) : (-22 + sw.index);
-    case SWITCH_TYPE_MOMENT_VIRTUAL:
-      return sw.index > 0 ? (31 + sw.index) : (-31 + sw.index);
-    case SWITCH_TYPE_ONM:
-      return 44;
-    default:
-      return 0;
-  }
-}
-
 RawSwitch open9xStockToSwitch(int8_t sw)
 {
   uint8_t swa = abs(sw);
@@ -105,70 +83,6 @@ RawSwitch open9xStockToSwitch(int8_t sw)
     return RawSwitch(SWITCH_TYPE_MOMENT_VIRTUAL, sw > 0 ? sw-22-9 : sw+22+9);
 }
 
-t_Open9xExpoData_v201::t_Open9xExpoData_v201(ExpoData &c9x)
-{
-  mode = c9x.mode;
-  chn = c9x.chn;
-  // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
-  curve = 0;
-  expo = 0;
-  if (c9x.curveMode == 1) {
-    if (c9x.curveParam >=0 && c9x.curveParam <= 10)
-      curve = c9x.curveParam;
-    else if (c9x.curveParam >= 15 && c9x.curveParam <= 19)
-      curve = c9x.curveParam - 4;
-    else
-      EEPROMWarnings += ::QObject::tr("Open9x doesn't allow Curve%1 in expos").arg(c9x.curveParam-6) + "\n";
-  }
-  else {
-    expo=c9x.expo;
-  }
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  int zeros=0;
-  int ones=0;
-  int phtemp=c9x.phases;
-  for (int i=0; i<O9X_MAX_PHASES; i++) {
-    if (phtemp & 1) {
-      ones++;
-    } else {
-      zeros++;
-    }
-    phtemp >>=1;
-  }
-  if (zeros==O9X_MAX_PHASES || zeros==0) {
-    phase=0;
-    negPhase=0;
-  } else if (zeros==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if ((phtemp & 1)==0) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=ph+1;
-    negPhase=0;
-  } else if (ones==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=(ph+1);
-    negPhase=1;
-  } else {
-    phase=0;
-    EEPROMWarnings += ::QObject::tr("Flight modes settings on expos not exported") + "\n";
-  }
-  weight = c9x.weight;
-}
-
 t_Open9xExpoData_v201::operator ExpoData ()
 {
   ExpoData c9x;
@@ -179,15 +93,10 @@ t_Open9xExpoData_v201::operator ExpoData ()
   }
   else {
     if (curve == 0) {
-      c9x.curveMode = 0;
-      c9x.curveParam = expo;
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_EXPO, expo);
     }
     else {
-      c9x.curveMode = 1;
-      if (curve <= 10)
-        c9x.curveParam = curve;
-      else
-        c9x.curveParam = curve + 4;
+      // TODO
     }
   }
   c9x.swtch = open9xStockToSwitch(swtch);
@@ -205,40 +114,18 @@ t_Open9xExpoData_v201::operator ExpoData ()
   return c9x;
 }
 
-t_Open9xExpoData_v211::t_Open9xExpoData_v211(ExpoData &c9x)
-{
-  mode = c9x.mode;
-  chn = c9x.chn;
-  // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
-
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  phases = c9x.phases;
-  weight = c9x.weight;
-  curveMode = c9x.curveMode;
-  curveParam = c9x.curveParam;
-}
-
 t_Open9xExpoData_v211::operator ExpoData ()
 {
   ExpoData c9x;
   c9x.mode = mode;
   c9x.chn = chn;
-  c9x.curveMode = curveMode;
-  c9x.curveParam = curveParam;
+  // TODO c9x.curve
   c9x.swtch = open9xStockToSwitch(swtch);
   c9x.phases = phases;
   c9x.weight = weight;
   return c9x;
 }
 
-t_Open9xLimitData_v201::t_Open9xLimitData_v201(LimitData &c9x)
-{
-  min = c9x.min+100;
-  max = c9x.max-100;
-  revert = c9x.revert;
-  offset = c9x.offset;
-}
-
 t_Open9xLimitData_v201::operator LimitData ()
 {
   LimitData c9x;
@@ -249,16 +136,6 @@ t_Open9xLimitData_v201::operator LimitData ()
   return c9x;
 }
 
-t_Open9xLimitData_v211::t_Open9xLimitData_v211(LimitData &c9x)
-{
-  min = c9x.min+100;
-  max = c9x.max-100;
-  revert = c9x.revert;
-  offset = c9x.offset;
-  ppmCenter = c9x.ppmCenter;
-  symetrical = c9x.symetrical;
-}
-
 t_Open9xLimitData_v211::operator LimitData ()
 {
   LimitData c9x;
@@ -271,90 +148,6 @@ t_Open9xLimitData_v211::operator LimitData ()
   return c9x;
 }
 
-t_Open9xMixData_v201::t_Open9xMixData_v201(MixData &c9x)
-{
-  destCh = c9x.destCh;
-  mixWarn = c9x.mixWarn;
-  swtch = open9xStockFromSwitch(c9x.swtch);
-
-  if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-    srcRaw = 0;
-    swtch = 0;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-    srcRaw = 1 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("open9x on this board doesn't have Rotary Encoders") + "\n";
-    srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-    srcRaw = 8; // MAX
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-    srcRaw = 9; // FULL
-    swtch = open9xStockFromSwitch(RawSwitch(c9x.srcRaw.index));
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-    srcRaw = 10 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-    srcRaw = 13 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-    srcRaw = 21 + c9x.srcRaw.index;
-  }
-
-  weight = c9x.weight;
-  curve = c9x.curve;
-  delayUp = c9x.delayUp;
-  delayDown = c9x.delayDown;
-  speedUp = c9x.speedUp;
-  speedDown = c9x.speedDown;
-  carryTrim = c9x.carryTrim;
-  mltpx = (MltpxValue)c9x.mltpx;
-  int zeros=0;
-  int ones=0;
-  int phtemp=c9x.phases;
-  for (int i=0; i<O9X_MAX_PHASES; i++) {
-    if (phtemp & 1) {
-      ones++;
-    } else {
-      zeros++;
-    }
-    phtemp >>=1;
-  }
-  if (zeros==O9X_MAX_PHASES || zeros==0) {
-    phase=0;
-  } else if (zeros==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if ((phtemp & 1)==0) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=ph+1;
-  } else if (ones==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=-(ph+1);
-  } else {
-    phase=0;
-    EEPROMWarnings += ::QObject::tr("Flight modes settings on mixers not exported") + "\n";
-  }
-  sOffset = c9x.sOffset;
-}
-
 t_Open9xMixData_v201::operator MixData ()
 {
   MixData c9x;
@@ -395,7 +188,7 @@ t_Open9xMixData_v201::operator MixData ()
     c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-21);
   }
 
-  c9x.curve = curve;
+  // TODO c9x.curve = curve;
   c9x.delayUp = delayUp;
   c9x.delayDown = delayDown;
   c9x.speedUp = speedUp;
@@ -403,7 +196,7 @@ t_Open9xMixData_v201::operator MixData ()
   c9x.carryTrim = carryTrim;
   c9x.mltpx = (MltpxValue)mltpx;
   c9x.mixWarn = mixWarn;
-//  c9x.phase = phase;
+
   if (phase<0) {
     c9x.phases= 1 << (-phase -1);
   } else if (phase==0) {
@@ -416,90 +209,6 @@ t_Open9xMixData_v201::operator MixData ()
   return c9x;
 }
 
-t_Open9xMixData_v203::t_Open9xMixData_v203(MixData &c9x)
-{
-  destCh = c9x.destCh;
-  mixWarn = c9x.mixWarn;
-  swtch = open9xStockFromSwitch(c9x.swtch);
-
-  if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-    srcRaw = 0;
-    swtch = 0;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-    srcRaw = 1 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("open9x on this board doesn't have Rotary Encoders") + "\n";
-    srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-    srcRaw = 8; // MAX
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-    srcRaw = 9; // FULL
-    swtch = open9xStockFromSwitch(RawSwitch(c9x.srcRaw.index));
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-    srcRaw = 10 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-    srcRaw = 13 + c9x.srcRaw.index;
-  }
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-    srcRaw = 21 + c9x.srcRaw.index;
-  }
-
-  weight = c9x.weight;
-  curve = c9x.curve;
-  delayUp = c9x.delayUp;
-  delayDown = c9x.delayDown;
-  speedUp = c9x.speedUp;
-  speedDown = c9x.speedDown;
-  carryTrim = c9x.carryTrim;
-  mltpx = (MltpxValue)c9x.mltpx;
-  int zeros=0;
-  int ones=0;
-  int phtemp=c9x.phases;
-  for (int i=0; i<O9X_MAX_PHASES; i++) {
-    if (phtemp & 1) {
-      ones++;
-    } else {
-      zeros++;
-    }
-    phtemp >>=1;
-  }
-  if (zeros==O9X_MAX_PHASES || zeros==0) {
-    phase=0;
-  } else if (zeros==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if ((phtemp & 1)==0) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=ph+1;
-  } else if (ones==1) {
-    int phtemp=c9x.phases;
-    int ph=0;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ph=i;
-        break;
-      }
-      phtemp >>=1;
-    }
-    phase=-(ph+1);
-  } else {
-    phase=0;
-    EEPROMWarnings += ::QObject::tr("Flight modes settings on mixers not exported") + "\n";
-  }
-  sOffset = c9x.sOffset;
-}
-
 t_Open9xMixData_v203::operator MixData ()
 {
   MixData c9x;
@@ -540,7 +249,7 @@ t_Open9xMixData_v203::operator MixData ()
     c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-21);
   }
 
-  c9x.curve = curve;
+  // TODO c9x.curve = curve;
   c9x.delayUp = delayUp;
   c9x.delayDown = delayDown;
   c9x.speedUp = speedUp;
@@ -548,7 +257,7 @@ t_Open9xMixData_v203::operator MixData ()
   c9x.carryTrim = carryTrim;
   c9x.mltpx = (MltpxValue)mltpx;
   c9x.mixWarn = mixWarn;
-  // c9x.phase = phase;
+
   if (phase<0) {
     c9x.phases= 1 << (-phase -1);
   } else if (phase==0) {
@@ -561,98 +270,6 @@ t_Open9xMixData_v203::operator MixData ()
   return c9x;
 }
 
-t_Open9xMixData_v205::t_Open9xMixData_v205(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xStockFromSwitch(c9x.swtch);
-
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-      EEPROMWarnings += ::QObject::tr("Open9x on this board doesn't have Rotary Encoders") + "\n";
-      srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 8; // MAX
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 9;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 9 + open9xStockFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 31 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 34 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 42 + c9x.srcRaw.index;
-    }
-
-    weight = c9x.weight;
-    differential = c9x.differential/2;
-    curve = c9x.curve;
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    mltpx = (MltpxValue)c9x.mltpx;
-    int zeros=0;
-    int ones=0;
-    int phtemp=c9x.phases;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ones++;
-      } else {
-        zeros++;
-      }
-      phtemp >>=1;
-    }
-    if (zeros==O9X_MAX_PHASES || zeros==0) {
-      phase=0;
-    } else if (zeros==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_MAX_PHASES; i++) {
-        if ((phtemp & 1)==0) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=ph+1;
-    } else if (ones==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_MAX_PHASES; i++) {
-        if (phtemp & 1) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=-(ph+1);
-    } else {
-      phase=0;
-      EEPROMWarnings += ::QObject::tr("Flight modes settings on mixers not exported") + "\n";
-    }
-    sOffset = c9x.sOffset;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xMixData_v205));
-  }
-}
-
 t_Open9xMixData_v205::operator MixData ()
 {
   MixData c9x;
@@ -686,8 +303,14 @@ t_Open9xMixData_v205::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-42);
     }
     c9x.weight = weight;
-    c9x.differential = differential*2;
-    c9x.curve = curve;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -695,12 +318,14 @@ t_Open9xMixData_v205::operator MixData ()
     c9x.carryTrim = carryTrim;
     c9x.mltpx = (MltpxValue)mltpx;
     c9x.mixWarn = mixWarn;
-    // c9x.phase = phase;
+
     if (phase<0) {
       c9x.phases= 1 << (-phase -1);
-    } else if (phase==0) {
+    }
+    else if (phase==0) {
       c9x.phases=0;
-    } else {
+    }
+    else {
       c9x.phases=63;
       c9x.phases &= ~(1 << (phase -1));
     }
@@ -709,101 +334,6 @@ t_Open9xMixData_v205::operator MixData ()
   return c9x;
 }
 
-t_Open9xMixData_v209::t_Open9xMixData_v209(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xStockFromSwitch(c9x.swtch);
-
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-      EEPROMWarnings += ::QObject::tr("Open9x on this board doesn't have Rotary Encoders") + "\n";
-      srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-      srcRaw = 8 + c9x.srcRaw.index; // use pots instead
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 12; // MAX
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 13;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 13 + open9xStockFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 35 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 38 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 46 + c9x.srcRaw.index;
-    }
-
-    weight = c9x.weight;
-    differential = c9x.differential/2;
-    curve = c9x.curve;
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    mltpx = (MltpxValue)c9x.mltpx;
-    int zeros=0;
-    int ones=0;
-    int phtemp=c9x.phases;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      if (phtemp & 1) {
-        ones++;
-      } else {
-        zeros++;
-      }
-      phtemp >>=1;
-    }
-    if (zeros==O9X_MAX_PHASES || zeros==0) {
-      phase=0;
-    } else if (zeros==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_MAX_PHASES; i++) {
-        if ((phtemp & 1)==0) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=ph+1;
-    } else if (ones==1) {
-      int phtemp=c9x.phases;
-      int ph=0;
-      for (int i=0; i<O9X_MAX_PHASES; i++) {
-        if (phtemp & 1) {
-          ph=i;
-          break;
-        }
-        phtemp >>=1;
-      }
-      phase=-(ph+1);
-    } else {
-      phase=0;
-      EEPROMWarnings += ::QObject::tr("Flight modes settings on mixers not exported") + "\n";
-    }
-    sOffset = c9x.sOffset;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xMixData_v209));
-  }
-}
-
 t_Open9xMixData_v209::operator MixData ()
 {
   MixData c9x;
@@ -840,8 +370,14 @@ t_Open9xMixData_v209::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-46);
     }
     c9x.weight = weight;
-    c9x.differential = differential*2;
-    c9x.curve = curve;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -849,12 +385,14 @@ t_Open9xMixData_v209::operator MixData ()
     c9x.carryTrim = carryTrim;
     c9x.mltpx = (MltpxValue)mltpx;
     c9x.mixWarn = mixWarn;
-    // c9x.phase = phase;
+
     if (phase<0) {
       c9x.phases= 1 << (-phase -1);
-    } else if (phase==0) {
+    }
+    else if (phase==0) {
       c9x.phases=0;
-    } else {
+    }
+    else {
       c9x.phases=63;
       c9x.phases &= ~(1 << (phase -1));
     }
@@ -863,70 +401,6 @@ t_Open9xMixData_v209::operator MixData ()
   return c9x;
 }
 
-t_Open9xMixData_v211::t_Open9xMixData_v211(MixData &c9x)
-{
-  if (c9x.destCh) {
-    destCh = c9x.destCh-1;
-    mixWarn = c9x.mixWarn;
-    swtch = open9xStockFromSwitch(c9x.swtch);
-
-    if (c9x.srcRaw.type == SOURCE_TYPE_NONE) {
-      srcRaw = 0;
-      swtch = 0;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_STICK) {
-      srcRaw = 1 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_ROTARY_ENCODER) {
-      EEPROMWarnings += ::QObject::tr("Open9x on this board doesn't have Rotary Encoders") + "\n";
-      srcRaw = 5 + c9x.srcRaw.index; // use pots instead
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_TRIM) {
-      srcRaw = 8 + c9x.srcRaw.index; // use pots instead
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_MAX) {
-      srcRaw = 12; // MAX
-    }
-    /* else if (c9x.srcRaw.type == SOURCE_TYPE_3POS) {
-      srcRaw = 13;
-    } */
-    else if (c9x.srcRaw.type == SOURCE_TYPE_SWITCH) {
-      srcRaw = 13 + open9xStockFromSwitch(RawSwitch(c9x.srcRaw.index));
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CYC) {
-      srcRaw = 35 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_PPM) {
-      srcRaw = 38 + c9x.srcRaw.index;
-    }
-    else if (c9x.srcRaw.type == SOURCE_TYPE_CH) {
-      srcRaw = 46 + c9x.srcRaw.index;
-    }
-
-    weight = c9x.weight;
-    if (c9x.curve==0) {
-      curveMode = 0;
-      curveParam = c9x.differential;
-    }
-    else {
-      curveMode = 1;
-      curveParam = c9x.curve;
-    }
-    delayUp = c9x.delayUp;
-    delayDown = c9x.delayDown;
-    speedUp = c9x.speedUp;
-    speedDown = c9x.speedDown;
-    carryTrim = c9x.carryTrim;
-    noExpo = c9x.noExpo;
-    mltpx = (MltpxValue)c9x.mltpx;
-    phases = c9x.phases;
-    sOffset = c9x.sOffset;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xMixData_v211));
-  }
-}
-
 t_Open9xMixData_v211::operator MixData ()
 {
   MixData c9x;
@@ -963,12 +437,14 @@ t_Open9xMixData_v211::operator MixData ()
       c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-46);
     }
     c9x.weight = weight;
+
     if (curveMode==0) {
-      c9x.differential = curveParam;
-      c9x.curve=0;
-    } else {
-      c9x.curve=curveParam;
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, curveParam);
+    }
+    else {
+      // TODO c9x.curve = curve;
     }    
+
     c9x.delayUp = delayUp;
     c9x.delayDown = delayDown;
     c9x.speedUp = speedUp;
@@ -983,30 +459,6 @@ t_Open9xMixData_v211::operator MixData ()
   return c9x;
 }
 
-int8_t open9x208FromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("Open9x on this board doesn't have Rotary Encoders") + "\n";
-    v1 = 5+source.index;
-  }
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 8;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 9; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 10+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 13+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 21+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 36+source.index;
-  return v1;
-}
-
 RawSource open9x208ToSource(int8_t value)
 {
   if (value == 0) {
@@ -1035,32 +487,6 @@ RawSource open9x208ToSource(int8_t value)
   }
 }
 
-int8_t open9xStock209FromSource(RawSource source)
-{
-  int v1 = 0;
-  if (source.type == SOURCE_TYPE_STICK)
-    v1 = 1+source.index;
-  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("Open9x on this board doesn't have Rotary Encoders") + "\n";
-    v1 = 5+source.index;
-  }
-  else if (source.type == SOURCE_TYPE_TRIM)
-    v1 = 8+source.index;
-  else if (source.type == SOURCE_TYPE_MAX)
-    v1 = 12;
-  /* else if (source.type == SOURCE_TYPE_3POS)
-    v1 = 13; */
-  else if (source.type == SOURCE_TYPE_CYC)
-    v1 = 14+source.index;
-  else if (source.type == SOURCE_TYPE_PPM)
-    v1 = 17+source.index;
-  else if (source.type == SOURCE_TYPE_CH)
-    v1 = 25+source.index;
-  else if (source.type == SOURCE_TYPE_TELEMETRY)
-    v1 = 40+source.index;
-  return v1;
-}
-
 RawSource open9xStock209ToSource(int8_t value)
 {
   if (value == 0) {
@@ -1092,33 +518,6 @@ RawSource open9xStock209ToSource(int8_t value)
   }
 }
 
-t_Open9xCustomSwData_v208::t_Open9xCustomSwData_v208(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = open9x208FromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    v2 = open9x208FromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = open9xStockFromSwitch(RawSwitch(c9x.val1));
-    v2 = open9xStockFromSwitch(RawSwitch(c9x.val2));
-  }
-
-  if (func>O9X_MAX_CSFUNCOLD ) {
-    EEPROMWarnings += ::QObject::tr("This version of open9x does not support Custom Switch function %1").arg(getFuncName(func)) + "\n";
-    func=0;
-    v1=0;
-    v2=0;
-  }
-}
-
 Open9xCustomSwData_v208::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -1142,26 +541,6 @@ Open9xCustomSwData_v208::operator CustomSwData ()
   return c9x;
 }
 
-t_Open9xCustomSwData_v209::t_Open9xCustomSwData_v209(CustomSwData &c9x)
-{
-  func = c9x.func;
-  v1 = c9x.val1;
-  v2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    v1 = open9xStock209FromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL && c9x.func <= CS_FN_ELESS) {
-    v2 = open9xStock209FromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    v1 = open9xStockFromSwitch(RawSwitch(c9x.val1));
-    v2 = open9xStockFromSwitch(RawSwitch(c9x.val2));
-  }
-}
-
 Open9xCustomSwData_v209::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -1185,12 +564,6 @@ Open9xCustomSwData_v209::operator CustomSwData ()
   return c9x;
 }
 
-t_Open9xFuncSwData_v201::t_Open9xFuncSwData_v201(FuncSwData &c9x)
-{
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  func = c9x.func - O9X_NUM_CHNOUT;
-}
-
 t_Open9xFuncSwData_v201::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -1225,37 +598,6 @@ enum Functions {
   FUNC_MAX
 };
 
-t_Open9xFuncSwData_v203::t_Open9xFuncSwData_v203(FuncSwData &c9x)
-{
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  if (c9x.func <= FuncSafetyCh16) {
-    param = ((c9x.param>>1)<<1);
-    param |=(c9x.enabled & 0x01);
-    func = c9x.func;
-  } else {
-    param = c9x.param;;
-    if (c9x.func <= FuncTrainerAIL)
-      func = 16 + c9x.func - FuncTrainer;
-    else if (c9x.func == FuncInstantTrim)
-      func = 21;
-    else if (c9x.func == FuncPlaySound)
-      func = 22;
-    else if (c9x.func == FuncPlayHaptic)
-      func = 23;
-    else if (c9x.func == FuncReset)
-      func = 24;
-    else if (c9x.func == FuncVario)
-      func = 25;
-    else if (c9x.func == FuncBacklight)
-      func = 26;    
-    else {
-      swtch = 0;
-      func = 0;
-      param = 0;
-    }
-  }
-}
-
 t_Open9xFuncSwData_v203::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -1286,38 +628,6 @@ t_Open9xFuncSwData_v203::operator FuncSwData ()
   return c9x; 
 }
 
-t_Open9xFuncSwData_v210::t_Open9xFuncSwData_v210(FuncSwData &c9x)
-{
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  param = c9x.param;
-  if (c9x.func <= FuncInstantTrim) {
-    delay = c9x.enabled;
-    func = (uint8_t)c9x.func;
-  }
-  else if (c9x.func == FuncPlaySound)
-    func = 22;
-  else if (c9x.func == FuncPlayHaptic)
-    func = 23;
-  else if (c9x.func == FuncReset)
-    func = 24;
-  else if (c9x.func == FuncVario)
-    func = 25;
-  else if (c9x.func == FuncPlayPrompt)
-    func = 26;
-  else if (c9x.func == FuncPlayValue) {
-    func = 27;
-    if (c9x.param > 7) {
-       param -= 2;
-    }
-  } else if (c9x.func == FuncBacklight)
-    func = 28;
-  else {
-    swtch = 0;
-    func = 0;
-    param = 0;
-  }
-}
-
 t_Open9xFuncSwData_v210::operator FuncSwData ()
 {
   FuncSwData c9x;
@@ -1352,12 +662,6 @@ t_Open9xFuncSwData_v210::operator FuncSwData ()
   return c9x;
 }
 
-t_Open9xSafetySwData::t_Open9xSafetySwData(SafetySwData &c9x)
-{
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  val = c9x.val;
-}
-
 t_Open9xSafetySwData::operator SafetySwData ()
 {
   SafetySwData c9x;
@@ -1366,16 +670,6 @@ t_Open9xSafetySwData::operator SafetySwData ()
   return c9x;
 }
 
-t_Open9xSwashRingData_v208::t_Open9xSwashRingData_v208(SwashRingData &c9x)
-{
-  invertELE = c9x.invertELE;
-  invertAIL = c9x.invertAIL;
-  invertCOL = c9x.invertCOL;
-  type = c9x.type;
-  collectiveSource = open9x208FromSource(c9x.collectiveSource);
-  value = c9x.value;
-}
-
 t_Open9xSwashRingData_v208::operator SwashRingData ()
 {
   SwashRingData c9x;
@@ -1388,16 +682,6 @@ t_Open9xSwashRingData_v208::operator SwashRingData ()
   return c9x;
 }
 
-t_Open9xSwashRingData_v209::t_Open9xSwashRingData_v209(SwashRingData &c9x)
-{
-  invertELE = c9x.invertELE;
-  invertAIL = c9x.invertAIL;
-  invertCOL = c9x.invertCOL;
-  type = c9x.type;
-  collectiveSource = open9xStock209FromSource(c9x.collectiveSource);
-  value = c9x.value;
-}
-
 t_Open9xSwashRingData_v209::operator SwashRingData ()
 {
   SwashRingData c9x;
@@ -1422,19 +706,6 @@ t_Open9xPhaseData_v201::operator PhaseData ()
   return c9x;
 }
 
-t_Open9xPhaseData_v201::t_Open9xPhaseData_v201(PhaseData &c9x)
-{
-  trim_ext = 0;
-  for (int i=0; i<NUM_STICKS; i++) {
-    trim[i] = (int8_t)(c9x.trim[i] >> 2);
-    trim_ext = (trim_ext & ~(0x03 << (2*i))) + (((c9x.trim[i] & 0x03) << (2*i)));
-  }
-  swtch = open9xStockFromSwitch(c9x.swtch);
-  setEEPROMZString(name, c9x.name, sizeof(name));
-  fadeIn = c9x.fadeIn;
-  fadeOut = c9x.fadeOut;
-}
-
 t_Open9xTimerData_v201::operator TimerData ()
 {
   TimerData c9x;
@@ -1466,24 +737,6 @@ t_Open9xTimerData_v202::operator TimerData ()
   return c9x;
 }
 
-t_Open9xTimerData_v202::t_Open9xTimerData_v202(TimerData &c9x)
-{
-  val = c9x.val;
-
-  if (c9x.mode >= TMRMODE_OFF && c9x.mode <= TMRMODE_THt)
-    mode = 0+c9x.mode-TMRMODE_OFF;
-  else if (c9x.mode >= TMRMODE_FIRST_MOMENT_SWITCH)
-    mode = 26+c9x.mode-TMRMODE_FIRST_MOMENT_SWITCH;
-  else if (c9x.mode >= TMRMODE_FIRST_SWITCH)
-    mode = 5+c9x.mode-TMRMODE_FIRST_SWITCH;
-  else if (c9x.mode <= TMRMODE_FIRST_NEG_MOMENT_SWITCH)
-    mode = -22+c9x.mode-TMRMODE_FIRST_NEG_MOMENT_SWITCH;
-  else if (c9x.mode <= TMRMODE_FIRST_NEG_SWITCH)
-    mode = -1+c9x.mode-TMRMODE_FIRST_NEG_SWITCH;
-  else
-    mode = 0;
-}
-
 FrSkyRSSIAlarm t_Open9xFrSkyRSSIAlarm::get(int index)
 {
   FrSkyRSSIAlarm c9x;
@@ -1492,25 +745,6 @@ FrSkyRSSIAlarm t_Open9xFrSkyRSSIAlarm::get(int index)
   return c9x;
 }
 
-t_Open9xFrSkyRSSIAlarm::t_Open9xFrSkyRSSIAlarm(int index, FrSkyRSSIAlarm &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyRSSIAlarm));
-  level = (2+c9x.level-index) % 4;
-  value = c9x.value - 50;
-}
-
-t_Open9xFrSkyChannelData_v201::t_Open9xFrSkyChannelData_v201(FrSkyChannelData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v201));
-  ratio = c9x.ratio;
-  alarms_value[0] = c9x.alarms[0].value;
-  alarms_value[1] = c9x.alarms[1].value;
-  alarms_level = (c9x.alarms[1].level << 2) + c9x.alarms[0].level;
-  alarms_greater = (c9x.alarms[1].greater << 1) + c9x.alarms[0].greater;
-  type = c9x.type;
-  offset = LIMIT<int8_t>(-8, c9x.offset, +7);
-}
-
 t_Open9xFrSkyChannelData_v201::operator FrSkyChannelData ()
 {
   FrSkyChannelData c9x;
@@ -1526,18 +760,6 @@ t_Open9xFrSkyChannelData_v201::operator FrSkyChannelData ()
   return c9x;
 }
 
-t_Open9xFrSkyChannelData_v203::t_Open9xFrSkyChannelData_v203(FrSkyChannelData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v203));
-  ratio = c9x.ratio;
-  alarms_value[0] = c9x.alarms[0].value;
-  alarms_value[1] = c9x.alarms[1].value;
-  alarms_level = (c9x.alarms[1].level << 2) + c9x.alarms[0].level;
-  alarms_greater = (c9x.alarms[1].greater << 1) + c9x.alarms[0].greater;
-  type = c9x.type;
-  offset = c9x.offset;
-}
-
 t_Open9xFrSkyChannelData_v203::operator FrSkyChannelData ()
 {
   FrSkyChannelData c9x;
@@ -1553,20 +775,6 @@ t_Open9xFrSkyChannelData_v203::operator FrSkyChannelData ()
   return c9x;
 }
 
-t_Open9xFrSkyChannelData_v204::t_Open9xFrSkyChannelData_v204(FrSkyChannelData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v204));
-  ratio = c9x.ratio;
-  type = c9x.type;
-  multiplier = c9x.multiplier;
-  alarms_value[0] = c9x.alarms[0].value;
-  alarms_value[1] = c9x.alarms[1].value;
-  alarms_level = (c9x.alarms[1].level << 2) + c9x.alarms[0].level;
-  alarms_greater = (c9x.alarms[1].greater << 1) + c9x.alarms[0].greater;
-  // TODO multiplier = c9x.multiplier;
-  offset = c9x.offset;
-}
-
 t_Open9xFrSkyChannelData_v204::operator FrSkyChannelData ()
 {
   FrSkyChannelData c9x;
@@ -1584,20 +792,6 @@ t_Open9xFrSkyChannelData_v204::operator FrSkyChannelData ()
   return c9x;
 }
 
-t_Open9xFrSkyChannelData_v208::t_Open9xFrSkyChannelData_v208(FrSkyChannelData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v208));
-  ratio = c9x.ratio;
-  type = c9x.type;
-  multiplier = c9x.multiplier;
-  alarms_value[0] = c9x.alarms[0].value;
-  alarms_value[1] = c9x.alarms[1].value;
-  alarms_level = (c9x.alarms[1].level << 2) + c9x.alarms[0].level;
-  alarms_greater = (c9x.alarms[1].greater << 1) + c9x.alarms[0].greater;
-  // TODO multiplier = c9x.multiplier;
-  offset = c9x.offset;
-}
-
 t_Open9xFrSkyChannelData_v208::operator FrSkyChannelData ()
 {
   FrSkyChannelData c9x;
@@ -1632,14 +826,6 @@ t_Open9xFrSkyData_v202::operator FrSkyData ()
   return c9x;
 }
 
-t_Open9xFrSkyData_v202::t_Open9xFrSkyData_v202(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyData_v202));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-  usrProto = c9x.usrProto;
-}
-
 t_Open9xFrSkyData_v203::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -1649,14 +835,6 @@ t_Open9xFrSkyData_v203::operator FrSkyData ()
   return c9x;
 }
 
-t_Open9xFrSkyData_v203::t_Open9xFrSkyData_v203(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyData_v203));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-  usrProto = c9x.usrProto;
-}
-
 t_Open9xFrSkyBarData_v204::operator FrSkyBarData ()
 {
   FrSkyBarData c9x;
@@ -1666,14 +844,6 @@ t_Open9xFrSkyBarData_v204::operator FrSkyBarData ()
   return c9x;
 }
 
-t_Open9xFrSkyBarData_v204::t_Open9xFrSkyBarData_v204(FrSkyBarData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyBarData_v204));
-  source = c9x.source;
-  barMin = c9x.barMin;
-  barMax = c9x.barMax;
-}
-
 t_Open9xFrSkyData_v204::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -1688,18 +858,6 @@ t_Open9xFrSkyData_v204::operator FrSkyData ()
   return c9x;
 }
 
-t_Open9xFrSkyData_v204::t_Open9xFrSkyData_v204(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyData_v204));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-  usrProto = c9x.usrProto;
-  imperial = c9x.imperial;
-  blades = c9x.blades;
-  for (int i=0; i<4; i++)
-    bars[i] = c9x.screens[0].body.bars[i];
-}
-
 t_Open9xFrSkyData_v205::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -1716,21 +874,6 @@ t_Open9xFrSkyData_v205::operator FrSkyData ()
   return c9x;
 }
 
-t_Open9xFrSkyData_v205::t_Open9xFrSkyData_v205(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyData_v205));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-  usrProto = c9x.usrProto;
-  imperial = c9x.imperial;
-  blades = c9x.blades;
-  for (int i=0; i<4; i++)
-    bars[i] = c9x.screens[0].body.bars[i];
-  rssiAlarms[0] = Open9xFrSkyRSSIAlarm(0, c9x.rssiAlarms[0]);
-  rssiAlarms[1] = Open9xFrSkyRSSIAlarm(1, c9x.rssiAlarms[1]);
-}
-
-
 t_Open9xFrSkyData_v208::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -1748,21 +891,6 @@ t_Open9xFrSkyData_v208::operator FrSkyData ()
   return c9x;
 }
 
-t_Open9xFrSkyData_v208::t_Open9xFrSkyData_v208(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyData_v208));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-  usrProto = c9x.usrProto;
-  voltsSource = c9x.voltsSource;
-  blades = c9x.blades;
-  currentSource=c9x.currentSource;
-  for (int i=0; i<4; i++)
-    bars[i] = c9x.screens[0].body.bars[i];
-  rssiAlarms[0] = Open9xFrSkyRSSIAlarm(0, c9x.rssiAlarms[0]);
-  rssiAlarms[1] = Open9xFrSkyRSSIAlarm(1, c9x.rssiAlarms[1]);
-}
-
 t_Open9xFrSkyData_v210::operator FrSkyData ()
 {
   FrSkyData c9x;
@@ -1798,40 +926,6 @@ t_Open9xFrSkyData_v210::operator FrSkyData ()
   return c9x;
 }
 
-t_Open9xFrSkyData_v210::t_Open9xFrSkyData_v210(FrSkyData &c9x)
-{
-  memset(this, 0, sizeof(t_Open9xFrSkyData_v210));
-  channels[0] = c9x.channels[0];
-  channels[1] = c9x.channels[1];
-  usrProto = c9x.usrProto;
-  voltsSource = c9x.voltsSource;
-  blades = c9x.blades;
-  currentSource=c9x.currentSource;
-
-  for (int scr=0; scr<2; scr++) {
-    if (c9x.screens[scr].type == 1) {
-      for (int i=0; i<4; i++)
-        bars[i] = c9x.screens[scr].body.bars[i];
-    }
-    else {
-      linesXtra=0;
-      for (int j=0; j<4; j++) {
-        lines[j] = 0;
-        for (int k=0; k<2; k++) {
-          int value = c9x.screens[scr].body.lines[j].source[k];
-          lines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-          linesXtra |= (value / 16) << (4*j+2*k);
-        }
-      }
-    }
-  }
-  rssiAlarms[0] = Open9xFrSkyRSSIAlarm(0, c9x.rssiAlarms[0]);
-  rssiAlarms[1] = Open9xFrSkyRSSIAlarm(1, c9x.rssiAlarms[1]);
-  varioSource = c9x.varioSource;
-  varioSpeedUpMin = c9x.varioCenterMax;
-  varioSpeedDownMin = c9x.varioCenterMin;
-}
-
 t_Open9xModelData_v201::operator ModelData ()
 {
   ModelData c9x;
@@ -1881,7 +975,6 @@ t_Open9xModelData_v201::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1889,7 +982,6 @@ t_Open9xModelData_v201::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1957,7 +1049,6 @@ t_Open9xModelData_v202::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -1965,7 +1056,6 @@ t_Open9xModelData_v202::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -1987,86 +1077,6 @@ t_Open9xModelData_v202::operator ModelData ()
   return c9x;
 }
 
-t_Open9xModelData_v202::t_Open9xModelData_v202(ModelData &c9x)
-{
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    timer1 = c9x.timers[0];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case PPM16:
-        protocol = 3;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    spare1 = 0;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    timer2 = c9x.timers[1];
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-
-    /* TODO for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-
-    for (int i=0; i<12; i++)
-      customSw[i] = c9x.customSw[i];
-    for (int i=0; i<12; i++)
-      funcSw[i] = c9x.funcSw[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      safetySw[i] = c9x.safetySw[i];
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId=c9x.modelId;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xModelData_v202));
-  }
-}
-
 t_Open9xModelData_v203::operator ModelData ()
 {
   ModelData c9x;
@@ -2115,7 +1125,6 @@ t_Open9xModelData_v203::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -2123,7 +1132,6 @@ t_Open9xModelData_v203::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -2143,96 +1151,6 @@ t_Open9xModelData_v203::operator ModelData ()
   return c9x;
 }
 
-t_Open9xModelData_v203::t_Open9xModelData_v203(ModelData &c9x)
-{
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    timer1 = c9x.timers[0];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case PPM16:
-        protocol = 3;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    spare1 = 0;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    timer2 = c9x.timers[1];
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-
-    /* for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-
-    for (int i=0; i<O9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xModelData_v203));
-  }
-}
-
 t_Open9xModelData_v204::operator ModelData ()
 {
   ModelData c9x;
@@ -2281,7 +1199,6 @@ t_Open9xModelData_v204::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -2289,7 +1206,6 @@ t_Open9xModelData_v204::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -2311,98 +1227,6 @@ t_Open9xModelData_v204::operator ModelData ()
   return c9x;
 }
 
-t_Open9xModelData_v204::t_Open9xModelData_v204(ModelData &c9x)
-{
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    timer1 = c9x.timers[0];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case PPM16:
-        protocol = 3;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    spare1 = 0;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    timer2 = c9x.timers[1];
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-
-    /* TODO    for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-
-    for (int i=0; i<O9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyRssiAlarms[0] = Open9xFrSkyRSSIAlarm(0, c9x.frsky.rssiAlarms[0]);
-    frskyRssiAlarms[1] = Open9xFrSkyRSSIAlarm(1, c9x.frsky.rssiAlarms[1]);
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xModelData_v204));
-  }
-}
-
 t_Open9xModelData_v205::operator ModelData ()
 {
   ModelData c9x;
@@ -2454,7 +1278,6 @@ t_Open9xModelData_v205::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -2462,7 +1285,6 @@ t_Open9xModelData_v205::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -2490,109 +1312,6 @@ t_Open9xModelData_v205::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_205 756
-t_Open9xModelData_v205::t_Open9xModelData_v205(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_205) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_205));
-  }
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PXX_DJT:
-        protocol = 1;
-        break;
-      case DSM2:
-        protocol = 2;
-        break;
-      case PPM16:
-        protocol = 3;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    spare1 = 0;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-/* TODO    for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-    for (int i=0; i<O9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyLinesXtra=0;
-    for (int j=0; j<4; j++) {
-      frskyLines[j] = 0;
-      for (int k=0; k<2; k++) {
-        int value = c9x.frsky.screens[1].body.lines[j].source[k];
-        frskyLines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-        frskyLinesXtra |= (value / 16) << (4*j+2*k);
-      }
-    }
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xModelData_v205));
-  }
-}
-
-
 t_Open9xModelData_v208::operator ModelData ()
 {
   ModelData c9x;
@@ -2645,7 +1364,6 @@ t_Open9xModelData_v208::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -2653,7 +1371,6 @@ t_Open9xModelData_v208::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -2688,121 +1405,6 @@ t_Open9xModelData_v208::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_208 758
-t_Open9xModelData_v208::t_Open9xModelData_v208(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_208) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_208));
-  }
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-/* TODO    for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-    for (int i=0; i<O9X_NUM_CSW; i++) {
-      customSw[i] = c9x.customSw[i];
-    }
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    varioSource = c9x.frsky.varioSource;
-    varioSpeedUpMin = c9x.frsky.varioCenterMax;
-    varioSpeedDownMin = c9x.frsky.varioCenterMin;
-
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyLinesXtra=0;
-    for (int j=0; j<4; j++) {
-      frskyLines[j] = 0;
-      for (int k=0; k<2; k++) {
-        int value = c9x.frsky.screens[1].body.lines[j].source[k];
-        frskyLines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-        frskyLinesXtra |= (value / 16) << (4*j+2*k);
-      }
-    }
-
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-  else {
-    memset(this, 0, sizeof(t_Open9xModelData_v208));
-  }
-}
-
-
 t_Open9xModelData_v209::operator ModelData ()
 {
   ModelData c9x;
@@ -2855,7 +1457,6 @@ t_Open9xModelData_v209::operator ModelData ()
     c9x.expoData[i] = expoData[i];
 
   for (int i=0; i<O9X_209_MAX_CURVE5; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 5;
     for (int j = 0; j < 5; j++) {
       c9x.curves[i].points[j].x = -100 + 50 * i;
@@ -2863,7 +1464,6 @@ t_Open9xModelData_v209::operator ModelData ()
     }
   }
   for (int i=0; i<O9X_209_MAX_CURVE9; i++) {
-    c9x.curves[O9X_209_MAX_CURVE5 + i].custom = false;
     c9x.curves[O9X_209_MAX_CURVE5 + i].count = 9;
     for (int j = 0; j < 9; j++) {
       c9x.curves[O9X_209_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
@@ -2899,120 +1499,6 @@ t_Open9xModelData_v209::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_209 759
-t_Open9xModelData_v209::t_Open9xModelData_v209(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_209) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_209));
-  }
-
-  memset(this, 0, sizeof(t_Open9xModelData_v209));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-/* TODO    for (int i=0; i<MAX_CURVE5; i++)
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves5[i][j];
-    for (int i=0; i<MAX_CURVE9; i++)
-      for (int j=0; j<9; j++)
-        curves9[i][j] = c9x.curves9[i][j]; */
-    for (int i=0; i<O9X_NUM_CSW; i++) {
-      customSw[i] = c9x.customSw[i];
-    }
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-    varioSource = c9x.frsky.varioSource;
-    varioSpeedUpMin = c9x.frsky.varioCenterMax;
-    varioSpeedDownMin = c9x.frsky.varioCenterMin;
-    switchWarningStates = c9x.switchWarningStates;
-
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-    frskyLinesXtra=0;
-    for (int j=0; j<4; j++) {
-      frskyLines[j] = 0;
-      for (int k=0; k<2; k++) {
-        int value = c9x.frsky.screens[1].body.lines[j].source[k];
-        frskyLines[j] |= (k==0 ? (value & 0x0f) : ((value & 0x0f) << 4));
-        frskyLinesXtra |= (value / 16) << (4*j+2*k);
-      }
-    }
-
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-}
-
 t_Open9xModelData_v210::operator ModelData ()
 {
   ModelData c9x;
@@ -3066,7 +1552,7 @@ t_Open9xModelData_v210::operator ModelData ()
 
   for (int i=0; i<O9X_MAX_CURVES; i++) {
     CurveInfo crvinfo = curveinfo(this, i);
-    c9x.curves[i].custom = crvinfo.custom;
+    c9x.curves[i].type = (crvinfo.custom ? CurveData::CURVE_TYPE_CUSTOM : CurveData::CURVE_TYPE_STANDARD);
     c9x.curves[i].count = crvinfo.points;
     for (int j=0; j<crvinfo.points; j++)
       c9x.curves[i].points[j].y = crvinfo.crv[j];
@@ -3101,123 +1587,6 @@ t_Open9xModelData_v210::operator ModelData ()
   return c9x;
 }
 
-#define MODEL_DATA_SIZE_210 760
-t_Open9xModelData_v210::t_Open9xModelData_v210(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_210) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_210));
-  }
-
-  memset(this, 0, sizeof(t_Open9xModelData_v210));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare2 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-
-    int8_t * cur = &points[0];
-    int offset = 0;
-    for (int i=0; i<O9X_MAX_CURVES; i++) {
-      offset += (c9x.curves[i].custom ? c9x.curves[i].count * 2 - 2 : c9x.curves[i].count) - 5;
-      if (offset > O9X_NUM_POINTS - 5 * O9X_MAX_CURVES) {
-        EEPROMWarnings += ::QObject::tr("open9x only accepts %1 points in all curves").arg(O9X_NUM_POINTS) + "\n";
-        break;
-      }
-      curves[i] = offset;
-      for (int j=0; j<c9x.curves[i].count; j++) {
-        *cur++ = c9x.curves[i].points[j].y;
-      }
-      if (c9x.curves[i].custom) {
-        for (int j=1; j<c9x.curves[i].count-1; j++) {
-          *cur++ = c9x.curves[i].points[j].x;
-        }
-      }
-    }
-
-    for (int i=0; i<O9X_NUM_CSW; i++) {
-      customSw[i] = c9x.customSw[i];
-    }
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-
-    switchWarningStates = c9x.switchWarningStates;
-
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      servoCenter[i] = c9x.limitData[i].ppmCenter;
-    }
-  }
-}
-
 t_Open9xModelData_v211::operator ModelData ()
 {
   ModelData c9x;
@@ -3271,7 +1640,7 @@ t_Open9xModelData_v211::operator ModelData ()
 
   for (int i=0; i<O9X_MAX_CURVES; i++) {
     CurveInfo crvinfo = curveinfo(this, i);
-    c9x.curves[i].custom = crvinfo.custom;
+    c9x.curves[i].type = (crvinfo.custom ? CurveData::CURVE_TYPE_CUSTOM : CurveData::CURVE_TYPE_STANDARD);
     c9x.curves[i].count = crvinfo.points;
     for (int j=0; j<crvinfo.points; j++)
       c9x.curves[i].points[j].y = crvinfo.crv[j];
@@ -3301,116 +1670,3 @@ t_Open9xModelData_v211::operator ModelData ()
 
   return c9x;
 }
-
-#define MODEL_DATA_SIZE_211 744
-t_Open9xModelData_v211::t_Open9xModelData_v211(ModelData &c9x)
-{
-  if (sizeof(*this) != MODEL_DATA_SIZE_211) {
-    QMessageBox::warning(NULL, "companion9x", QString("Open9xModelData wrong size (%1 instead of %2)").arg(sizeof(*this)).arg(MODEL_DATA_SIZE_211));
-  }
-
-  memset(this, 0, sizeof(t_Open9xModelData_v211));
-
-  if (c9x.used) {
-    setEEPROMZString(name, c9x.name, sizeof(name));
-    for (int i=0; i<O9X_MAX_TIMERS; i++)
-      timers[i] = c9x.timers[i];
-    switch(c9x.moduleData[0].protocol) {
-      case PPM:
-        protocol = 0;
-        break;
-      case PPM16:
-        protocol = 1;
-        break;
-      case PPMSIM:
-        protocol = 2;
-        break;
-      case PXX_DJT:
-        protocol = 3;
-        break;
-      case DSM2:
-        protocol = 4;
-        break;
-      default:
-        protocol = 0;
-        EEPROMWarnings += ::QObject::tr("Open9x doesn't accept this protocol") + "\n";
-        // TODO more explicit warning for each protocol
-        break;
-    }
-    thrTrim = c9x.thrTrim;
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    trimInc = c9x.trimInc;
-    disableThrottleWarning=c9x.disableThrottleWarning;
-    pulsePol = c9x.moduleData[0].ppmPulsePol;
-    extendedLimits = c9x.extendedLimits;
-    extendedTrims = c9x.extendedTrims;
-    spare1 = 0;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    beepANACenter = (uint8_t)(c9x.beepANACenter & 0x7F);
-    for (int i=0; i<O9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<O9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<O9X_MAX_EXPOS; i++)
-      expoData[i] = c9x.expoData[i];
-    if (c9x.expoData[O9X_MAX_EXPOS].mode)
-      EEPROMWarnings += ::QObject::tr("open9x only accepts %1 expos").arg(O9X_MAX_EXPOS) + "\n";
-
-    int8_t * cur = &points[0];
-    int offset = 0;
-    for (int i=0; i<O9X_MAX_CURVES; i++) {
-      offset += (c9x.curves[i].custom ? c9x.curves[i].count * 2 - 2 : c9x.curves[i].count) - 5;
-      if (offset > O9X_NUM_POINTS - 5 * O9X_MAX_CURVES) {
-        EEPROMWarnings += ::QObject::tr("open9x only accepts %1 points in all curves").arg(O9X_NUM_POINTS) + "\n";
-        break;
-      }
-      curves[i] = offset;
-      for (int j=0; j<c9x.curves[i].count; j++) {
-        *cur++ = c9x.curves[i].points[j].y;
-      }
-      if (c9x.curves[i].custom) {
-        for (int j=1; j<c9x.curves[i].count-1; j++) {
-          *cur++ = c9x.curves[i].points[j].x;
-        }
-      }
-    }
-
-    for (int i=0; i<O9X_NUM_CSW; i++) {
-      customSw[i] = c9x.customSw[i];
-    }
-    int count = 0;
-    for (int i=0; i<O9X_NUM_FSW; i++) {
-      if (c9x.funcSw[i].swtch.type != SWITCH_TYPE_NONE)
-        funcSw[count++] = c9x.funcSw[i];
-    }
-    for (int i=0; i<O9X_NUM_CHNOUT; i++) {
-      if (c9x.safetySw[i].swtch.type) {
-        funcSw[count].func = i;
-        funcSw[count].swtch = open9xStockFromSwitch(c9x.safetySw[i].swtch);
-        funcSw[count].param = c9x.safetySw[i].val;
-        count++;
-      }
-    }
-
-    swashR = c9x.swashRingData;
-    for (int i=0; i<O9X_MAX_PHASES; i++) {
-      PhaseData phase = c9x.phaseData[i];
-      for (int j=0; j<NUM_STICKS; j++) {
-        if (phase.trimRef[j] >= 0) {
-          phase.trim[j] = 501 + phase.trimRef[j] - (phase.trimRef[j] >= i ? 1 : 0);
-        }
-        else {
-          phase.trim[j] = std::max(-500, std::min(500, phase.trim[j]));
-        }
-      }
-      phaseData[i] = phase;
-    }
-    frsky = c9x.frsky;
-
-    switchWarningStates = c9x.switchWarningStates;
-
-    ppmFrameLength = c9x.moduleData[0].ppmFrameLength;
-    thrTraceSrc = c9x.thrTraceSrc;
-    modelId = c9x.modelId;
-  }
-}
diff --git a/companion/src/firmwares/opentx/open9xStockeeprom.h b/companion/src/firmwares/opentx/open9xStockeeprom.h
index 46178281f..59bee09a9 100644
--- a/companion/src/firmwares/opentx/open9xStockeeprom.h
+++ b/companion/src/firmwares/opentx/open9xStockeeprom.h
@@ -65,7 +65,6 @@ PACK(typedef struct t_Open9xFrSkyRSSIAlarm {
   int8_t        value:6;
   FrSkyRSSIAlarm get(int index);
   t_Open9xFrSkyRSSIAlarm() { memset(this, 0, sizeof(t_Open9xFrSkyRSSIAlarm)); }
-  t_Open9xFrSkyRSSIAlarm(int index, FrSkyRSSIAlarm&);
 }) Open9xFrSkyRSSIAlarm;
 
 PACK(typedef struct t_Open9xExpoData_v201 {
@@ -80,8 +79,6 @@ PACK(typedef struct t_Open9xExpoData_v201 {
 
   operator ExpoData();
   t_Open9xExpoData_v201() { memset(this, 0, sizeof(t_Open9xExpoData_v201)); }
-  t_Open9xExpoData_v201(ExpoData&);
-
 }) Open9xExpoData_v201;
 
 PACK(typedef struct t_Open9xExpoData_v211 {
@@ -95,8 +92,6 @@ PACK(typedef struct t_Open9xExpoData_v211 {
 
   operator ExpoData();
   t_Open9xExpoData_v211() { memset(this, 0, sizeof(t_Open9xExpoData_v211)); }
-  t_Open9xExpoData_v211(ExpoData&);
-
 }) Open9xExpoData_v211;
 
 PACK(typedef struct t_Open9xLimitData_v201 {
@@ -107,8 +102,6 @@ PACK(typedef struct t_Open9xLimitData_v201 {
 
   operator LimitData();
   t_Open9xLimitData_v201() { memset(this, 0, sizeof(t_Open9xLimitData_v201)); }
-  t_Open9xLimitData_v201(LimitData&);
-
 }) Open9xLimitData_v201;
 
 PACK(typedef struct t_Open9xLimitData_v211 {
@@ -121,8 +114,6 @@ PACK(typedef struct t_Open9xLimitData_v211 {
 
   operator LimitData();
   t_Open9xLimitData_v211() { memset(this, 0, sizeof(t_Open9xLimitData_v211)); }
-  t_Open9xLimitData_v211(LimitData&);
-
 }) Open9xLimitData_v211;
 
 PACK(typedef struct t_Open9xMixData_v201 {
@@ -143,8 +134,6 @@ PACK(typedef struct t_Open9xMixData_v201 {
 
   operator MixData();
   t_Open9xMixData_v201() { memset(this, 0, sizeof(t_Open9xMixData_v201)); }
-  t_Open9xMixData_v201(MixData&);
-
 }) Open9xMixData_v201;
 
 PACK(typedef struct t_Open9xMixData_v203 {
@@ -165,8 +154,6 @@ PACK(typedef struct t_Open9xMixData_v203 {
 
   operator MixData();
   t_Open9xMixData_v203() { memset(this, 0, sizeof(t_Open9xMixData_v203)); }
-  t_Open9xMixData_v203(MixData&);
-
 }) Open9xMixData_v203;
 
 PACK(typedef struct t_Open9xMixData_v205 {
@@ -188,8 +175,6 @@ PACK(typedef struct t_Open9xMixData_v205 {
 
  operator MixData();
   t_Open9xMixData_v205() { memset(this, 0, sizeof(t_Open9xMixData_v205)); }
-  t_Open9xMixData_v205(MixData&);
-
 }) Open9xMixData_v205;
 
 PACK(typedef struct t_Open9xMixData_v209 {
@@ -211,8 +196,6 @@ PACK(typedef struct t_Open9xMixData_v209 {
 
  operator MixData();
   t_Open9xMixData_v209() { memset(this, 0, sizeof(t_Open9xMixData_v209)); }
-  t_Open9xMixData_v209(MixData&);
-
 }) Open9xMixData_v209;
 
 PACK(typedef struct t_Open9xMixData_v211 {
@@ -236,8 +219,6 @@ PACK(typedef struct t_Open9xMixData_v211 {
 
  operator MixData();
   t_Open9xMixData_v211() { memset(this, 0, sizeof(t_Open9xMixData_v211)); }
-  t_Open9xMixData_v211(MixData&);
-
 }) Open9xMixData_v211;
 
 PACK(typedef struct t_Open9xCustomSwData_v208 { // Custom Switches data
@@ -257,7 +238,6 @@ PACK(typedef struct t_Open9xCustomSwData_v209 { // Custom Switches data
 
   operator CustomSwData();
   t_Open9xCustomSwData_v209() { memset(this, 0, sizeof(t_Open9xCustomSwData_v209)); }
-  t_Open9xCustomSwData_v209(CustomSwData&);
 }) Open9xCustomSwData_v209;
 
 PACK(typedef struct t_Open9xSafetySwData { // Safety Switches data
@@ -266,8 +246,6 @@ PACK(typedef struct t_Open9xSafetySwData { // Safety Switches data
 
   operator SafetySwData();
   t_Open9xSafetySwData() { memset(this, 0, sizeof(t_Open9xSafetySwData)); }
-  t_Open9xSafetySwData(SafetySwData&);
-
 }) Open9xSafetySwData;
 
 PACK(typedef struct t_Open9xFuncSwData_v201 { // Function Switches data
@@ -276,8 +254,6 @@ PACK(typedef struct t_Open9xFuncSwData_v201 { // Function Switches data
 
   operator FuncSwData();
   t_Open9xFuncSwData_v201() { memset(this, 0, sizeof(t_Open9xFuncSwData_v201)); }
-  t_Open9xFuncSwData_v201(FuncSwData&);
-
 }) Open9xFuncSwData_v201;
 
 PACK(typedef struct t_Open9xFuncSwData_v203 { // Function Switches data
@@ -287,8 +263,6 @@ PACK(typedef struct t_Open9xFuncSwData_v203 { // Function Switches data
 
   operator FuncSwData();
   t_Open9xFuncSwData_v203() { memset(this, 0, sizeof(t_Open9xFuncSwData_v203)); }
-  t_Open9xFuncSwData_v203(FuncSwData&);
-
 }) Open9xFuncSwData_v203;
 
 PACK(typedef struct t_Open9xFuncSwData_v210 { // Function Switches data
@@ -299,8 +273,6 @@ PACK(typedef struct t_Open9xFuncSwData_v210 { // Function Switches data
 
   operator FuncSwData();
   t_Open9xFuncSwData_v210() { memset(this, 0, sizeof(t_Open9xFuncSwData_v210)); }
-  t_Open9xFuncSwData_v210(FuncSwData&);
-
 }) Open9xFuncSwData_v210;
 
 PACK(typedef struct t_Open9xFrSkyChannelData_v201 {
@@ -316,8 +288,6 @@ PACK(typedef struct t_Open9xFrSkyChannelData_v201 {
 
   operator FrSkyChannelData();
   t_Open9xFrSkyChannelData_v201() { memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v201)); }
-  t_Open9xFrSkyChannelData_v201(FrSkyChannelData&);
-
 }) Open9xFrSkyChannelData_v201;
 
 PACK(typedef struct t_Open9xFrSkyChannelData_v203 {
@@ -333,8 +303,6 @@ PACK(typedef struct t_Open9xFrSkyChannelData_v203 {
 
   operator FrSkyChannelData();
   t_Open9xFrSkyChannelData_v203() { memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v203)); }
-  t_Open9xFrSkyChannelData_v203(FrSkyChannelData&);
-
 }) Open9xFrSkyChannelData_v203;
 
 PACK(typedef struct t_Open9xFrSkyChannelData_v204 {
@@ -348,8 +316,6 @@ PACK(typedef struct t_Open9xFrSkyChannelData_v204 {
 
   operator FrSkyChannelData();
   t_Open9xFrSkyChannelData_v204() { memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v204)); }
-  t_Open9xFrSkyChannelData_v204(FrSkyChannelData&);
-
 }) Open9xFrSkyChannelData_v204;
 
 PACK(typedef struct t_Open9xFrSkyChannelData_v208 {
@@ -363,37 +329,30 @@ PACK(typedef struct t_Open9xFrSkyChannelData_v208 {
 
   operator FrSkyChannelData();
   t_Open9xFrSkyChannelData_v208() { memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v208)); }
-  t_Open9xFrSkyChannelData_v208(FrSkyChannelData&);
-
 }) Open9xFrSkyChannelData_v208;
 
 PACK(typedef struct t_Open9xFrSkyData_v201 {
-	Open9xFrSkyChannelData_v201 channels[2];
-
-	operator FrSkyData();
-	t_Open9xFrSkyData_v201() { memset(this, 0, sizeof(t_Open9xFrSkyData_v201)); }
+  Open9xFrSkyChannelData_v201 channels[2];
 
+  operator FrSkyData();
+  t_Open9xFrSkyData_v201() { memset(this, 0, sizeof(t_Open9xFrSkyData_v201)); }
 }) Open9xFrSkyData_v201;
 
 PACK(typedef struct t_Open9xFrSkyData_v202 {
-	Open9xFrSkyChannelData_v201 channels[2];
-	uint8_t usrProto:2;  // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
-	uint8_t spare:6;
-
-	operator FrSkyData();
-	t_Open9xFrSkyData_v202() { memset(this, 0, sizeof(t_Open9xFrSkyData_v202)); }
-	t_Open9xFrSkyData_v202(FrSkyData&);
+  Open9xFrSkyChannelData_v201 channels[2];
+  uint8_t usrProto:2;  // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t spare:6;
 
+  operator FrSkyData();
+  t_Open9xFrSkyData_v202() { memset(this, 0, sizeof(t_Open9xFrSkyData_v202)); }
 }) Open9xFrSkyData_v202;
 
 PACK(typedef struct t_Open9xFrSkyData_v203 {
-        Open9xFrSkyChannelData_v203 channels[2];
-        uint8_t usrProto;  // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
-
-        operator FrSkyData();
-        t_Open9xFrSkyData_v203() { memset(this, 0, sizeof(t_Open9xFrSkyData_v203)); }
-        t_Open9xFrSkyData_v203(FrSkyData&);
+  Open9xFrSkyChannelData_v203 channels[2];
+  uint8_t usrProto;  // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
 
+  operator FrSkyData();
+  t_Open9xFrSkyData_v203() { memset(this, 0, sizeof(t_Open9xFrSkyData_v203)); }
 }) Open9xFrSkyData_v203;
 
 PACK(typedef struct t_Open9xFrSkyBarData_v204 {
@@ -403,8 +362,6 @@ PACK(typedef struct t_Open9xFrSkyBarData_v204 {
 
   operator FrSkyBarData();
   t_Open9xFrSkyBarData_v204() { memset(this, 0, sizeof(t_Open9xFrSkyBarData_v204)); }
-  t_Open9xFrSkyBarData_v204(FrSkyBarData&);
-
 }) Open9xFrSkyBarData_v204;
 
 PACK(typedef struct t_Open9xFrSkyData_v204 {
@@ -417,7 +374,6 @@ PACK(typedef struct t_Open9xFrSkyData_v204 {
 
   operator FrSkyData();
   t_Open9xFrSkyData_v204() { memset(this, 0, sizeof(t_Open9xFrSkyData_v204)); }
-  t_Open9xFrSkyData_v204(FrSkyData&);
 }) Open9xFrSkyData_v204;
 
 PACK(typedef struct t_Open9xFrSkyData_v205 {
@@ -431,7 +387,6 @@ PACK(typedef struct t_Open9xFrSkyData_v205 {
 
   operator FrSkyData();
   t_Open9xFrSkyData_v205() { memset(this, 0, sizeof(t_Open9xFrSkyData_v205)); }
-  t_Open9xFrSkyData_v205(FrSkyData&);
 }) Open9xFrSkyData_v205;
 
 PACK(typedef struct t_Open9xFrSkyData_v208 {
@@ -445,7 +400,6 @@ PACK(typedef struct t_Open9xFrSkyData_v208 {
 
   operator FrSkyData();
   t_Open9xFrSkyData_v208() { memset(this, 0, sizeof(t_Open9xFrSkyData_v208)); }
-  t_Open9xFrSkyData_v208(FrSkyData&);
 }) Open9xFrSkyData_v208;
 
 PACK(typedef struct t_Open9xFrSkyData_v210 {
@@ -466,7 +420,6 @@ PACK(typedef struct t_Open9xFrSkyData_v210 {
 
   operator FrSkyData();
   t_Open9xFrSkyData_v210() { memset(this, 0, sizeof(t_Open9xFrSkyData_v210)); }
-  t_Open9xFrSkyData_v210(FrSkyData&);
 }) Open9xFrSkyData_v210;
 
 PACK(typedef struct t_Open9xSwashRingData_v208 { // Swash Ring data
@@ -479,8 +432,6 @@ PACK(typedef struct t_Open9xSwashRingData_v208 { // Swash Ring data
 
   operator SwashRingData();
   t_Open9xSwashRingData_v208() { memset(this, 0, sizeof(t_Open9xSwashRingData_v208)); }
-  t_Open9xSwashRingData_v208(SwashRingData&);
-
 }) Open9xSwashRingData_v208;
 
 PACK(typedef struct t_Open9xSwashRingData_v209 { // Swash Ring data
@@ -493,8 +444,6 @@ PACK(typedef struct t_Open9xSwashRingData_v209 { // Swash Ring data
 
   operator SwashRingData();
   t_Open9xSwashRingData_v209() { memset(this, 0, sizeof(t_Open9xSwashRingData_v209)); }
-  t_Open9xSwashRingData_v209(SwashRingData&);
-
 }) Open9xSwashRingData_v209;
 
 PACK(typedef struct t_Open9xPhaseData_v201 {
@@ -507,7 +456,6 @@ PACK(typedef struct t_Open9xPhaseData_v201 {
 
   operator PhaseData();
   t_Open9xPhaseData_v201() { memset(this, 0, sizeof(t_Open9xPhaseData_v201)); }
-  t_Open9xPhaseData_v201(PhaseData &eepe);
 }) Open9xPhaseData_v201;
 
 PACK(typedef struct t_Open9xTimerData_v201 {
@@ -526,7 +474,6 @@ PACK(typedef struct t_Open9xTimerData_v202 {
 
   operator TimerData();
   t_Open9xTimerData_v202() { memset(this, 0, sizeof(t_Open9xTimerData_v202)); }
-  t_Open9xTimerData_v202(TimerData &eepe);
 }) Open9xTimerData_v202;
 
 PACK(typedef struct t_Open9xTimerDataExtra {
@@ -579,8 +526,6 @@ PACK(typedef struct t_Open9xModelData_v201 {
 
   operator ModelData();
   t_Open9xModelData_v201() { memset(this, 0, sizeof(t_Open9xModelData_v201)); }
-  t_Open9xModelData_v201(ModelData&);
-
 }) Open9xModelData_v201;
 
 PACK(typedef struct t_Open9xModelData_v202 {
@@ -615,8 +560,6 @@ PACK(typedef struct t_Open9xModelData_v202 {
 
   operator ModelData();
   t_Open9xModelData_v202() { memset(this, 0, sizeof(t_Open9xModelData_v202)); }
-  t_Open9xModelData_v202(ModelData&);
-
 }) Open9xModelData_v202;
 
 PACK(typedef struct t_Open9xModelData_v203 {
@@ -650,8 +593,6 @@ PACK(typedef struct t_Open9xModelData_v203 {
 
   operator ModelData();
   t_Open9xModelData_v203() { memset(this, 0, sizeof(t_Open9xModelData_v203)); }
-  t_Open9xModelData_v203(ModelData&);
-
 }) Open9xModelData_v203;
 
 PACK(typedef struct t_Open9xModelData_v204 {
@@ -686,8 +627,6 @@ PACK(typedef struct t_Open9xModelData_v204 {
 
   operator ModelData();
   t_Open9xModelData_v204() { memset(this, 0, sizeof(t_Open9xModelData_v204)); }
-  t_Open9xModelData_v204(ModelData&);
-
 }) Open9xModelData_v204;
 
 PACK(typedef struct t_Open9xModelData_v205 {
@@ -723,8 +662,6 @@ PACK(typedef struct t_Open9xModelData_v205 {
 
   operator ModelData();
   t_Open9xModelData_v205() { memset(this, 0, sizeof(t_Open9xModelData_v205)); }
-  t_Open9xModelData_v205(ModelData&);
-
 }) Open9xModelData_v205;
 
 PACK(typedef struct t_Open9xModelData_v208 {
@@ -764,8 +701,6 @@ PACK(typedef struct t_Open9xModelData_v208 {
 
   operator ModelData();
   t_Open9xModelData_v208() { memset(this, 0, sizeof(t_Open9xModelData_v208)); }
-  t_Open9xModelData_v208(ModelData&);
-
 }) Open9xModelData_v208;
 
 PACK(typedef struct t_Open9xModelData_v209 {
@@ -806,8 +741,6 @@ PACK(typedef struct t_Open9xModelData_v209 {
 
   operator ModelData();
   t_Open9xModelData_v209() { memset(this, 0, sizeof(t_Open9xModelData_v209)); }
-  t_Open9xModelData_v209(ModelData&);
-
 }) Open9xModelData_v209;
 
 PACK(typedef struct t_Open9xModelData_v210 {
@@ -846,8 +779,6 @@ PACK(typedef struct t_Open9xModelData_v210 {
 
   operator ModelData();
   t_Open9xModelData_v210() { memset(this, 0, sizeof(t_Open9xModelData_v210)); }
-  t_Open9xModelData_v210(ModelData&);
-
 }) Open9xModelData_v210;
 
 PACK(typedef struct t_Open9xModelData_v211 {
@@ -884,8 +815,6 @@ PACK(typedef struct t_Open9xModelData_v211 {
 
   operator ModelData();
   t_Open9xModelData_v211() { memset(this, 0, sizeof(t_Open9xModelData_v211)); }
-  t_Open9xModelData_v211(ModelData&);
-
 }) Open9xModelData_v211;
 
 #endif
diff --git a/companion/src/firmwares/opentx/open9xGruvin9xsimulator.cpp b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
similarity index 95%
rename from companion/src/firmwares/opentx/open9xGruvin9xsimulator.cpp
rename to companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
index 9cb478b16..0d2f07771 100644
--- a/companion/src/firmwares/opentx/open9xGruvin9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
@@ -14,9 +14,9 @@
  *
  */
 
-#include "open9xGruvin9xsimulator.h"
-#include "open9xinterface.h"
-#include "open9xeeprom.h"
+#include "opentxGruvin9xsimulator.h"
+#include "opentxinterface.h"
+#include "opentxeeprom.h"
 
 #define SIMU
 #define SIMU_EXCEPTIONS
@@ -98,7 +98,7 @@ bool hasExtendedTrims()
 
 uint8_t getStickMode()
 {
-  return g_eeGeneral.stickMode;
+  return limit<uint8_t>(0, g_eeGeneral.stickMode, 3);
 }
 
 }
@@ -160,7 +160,7 @@ void Open9xGruvin9xSimulator::setValues(TxInputs &inputs)
 
 void Open9xGruvin9xSimulator::setTrim(unsigned int idx, int value)
 {
-  idx = Open9xGruvin9x::modn12x3[4*getStickMode() + idx] - 1;
+  idx = Open9xGruvin9x::modn12x3[4*getStickMode() + idx];
   uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
   setTrimValue(phase, idx, value);
 }
@@ -174,7 +174,7 @@ void Open9xGruvin9xSimulator::getTrims(Trims & trims)
   }
 
   for (int i=0; i<2; i++) {
-    uint8_t idx = Open9xGruvin9x::modn12x3[4*getStickMode() + i] - 1;
+    uint8_t idx = Open9xGruvin9x::modn12x3[4*getStickMode() + i];
     int16_t tmp = trims.values[i];
     trims.values[i] = trims.values[idx];
     trims.values[idx] = tmp;
diff --git a/companion/src/firmwares/opentx/open9xGruvin9xsimulator.h b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.h
similarity index 100%
rename from companion/src/firmwares/opentx/open9xGruvin9xsimulator.h
rename to companion/src/firmwares/opentx/opentxGruvin9xsimulator.h
diff --git a/companion/src/firmwares/opentx/open9xM128simulator.cpp b/companion/src/firmwares/opentx/opentxM128simulator.cpp
similarity index 94%
rename from companion/src/firmwares/opentx/open9xM128simulator.cpp
rename to companion/src/firmwares/opentx/opentxM128simulator.cpp
index a82b53b0c..f169a10d3 100644
--- a/companion/src/firmwares/opentx/open9xM128simulator.cpp
+++ b/companion/src/firmwares/opentx/opentxM128simulator.cpp
@@ -14,9 +14,9 @@
  *
  */
 
-#include "open9xM128simulator.h"
-#include "open9xinterface.h"
-#include "open9xeeprom.h"
+#include "opentxM128simulator.h"
+#include "opentxinterface.h"
+#include "opentxeeprom.h"
 
 #define SIMU
 #define SIMU_EXCEPTIONS
@@ -96,7 +96,7 @@ bool hasExtendedTrims()
 
 uint8_t getStickMode()
 {
-  return g_eeGeneral.stickMode;
+  return limit<uint8_t>(0, g_eeGeneral.stickMode, 3);
 }
 
 }
@@ -154,7 +154,7 @@ void Open9xM128Simulator::setValues(TxInputs &inputs)
 
 void Open9xM128Simulator::setTrim(unsigned int idx, int value)
 {
-  idx = Open9xM128::modn12x3[4*getStickMode() + idx] - 1;
+  idx = Open9xM128::modn12x3[4*getStickMode() + idx];
   uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
   setTrimValue(phase, idx, value);
 }
@@ -168,7 +168,7 @@ void Open9xM128Simulator::getTrims(Trims & trims)
   }
 
   for (int i=0; i<2; i++) {
-    uint8_t idx = Open9xM128::modn12x3[4*getStickMode() + i] - 1;
+    uint8_t idx = Open9xM128::modn12x3[4*getStickMode() + i];
     int16_t tmp = trims.values[i];
     trims.values[i] = trims.values[idx];
     trims.values[idx] = tmp;
diff --git a/companion/src/firmwares/opentx/open9xM128simulator.h b/companion/src/firmwares/opentx/opentxM128simulator.h
similarity index 100%
rename from companion/src/firmwares/opentx/open9xM128simulator.h
rename to companion/src/firmwares/opentx/opentxM128simulator.h
diff --git a/companion/src/firmwares/opentx/open9xSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
similarity index 95%
rename from companion/src/firmwares/opentx/open9xSky9xsimulator.cpp
rename to companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
index d724028ec..9f444c808 100644
--- a/companion/src/firmwares/opentx/open9xSky9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
@@ -14,8 +14,8 @@
  *
  */
 
-#include "open9xSky9xsimulator.h"
-#include "open9xinterface.h"
+#include "opentxSky9xsimulator.h"
+#include "opentxinterface.h"
 
 #define SIMU
 #define SIMU_EXCEPTIONS
@@ -125,7 +125,7 @@ bool hasExtendedTrims()
 
 uint8_t getStickMode()
 {
-  return g_eeGeneral.stickMode;
+  return limit<uint8_t>(0, g_eeGeneral.stickMode, 3);
 }
 
 }
@@ -193,7 +193,7 @@ void Open9xSky9xSimulator::setValues(TxInputs &inputs)
 
 void Open9xSky9xSimulator::setTrim(unsigned int idx, int value)
 {
-  idx = Open9xSky9x::modn12x3[4*getStickMode() + idx] - 1;
+  idx = Open9xSky9x::modn12x3[4*getStickMode() + idx];
   uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
   setTrimValue(phase, idx, value);
 }
@@ -207,7 +207,7 @@ void Open9xSky9xSimulator::getTrims(Trims & trims)
   }
 
   for (int i=0; i<2; i++) {
-    uint8_t idx = Open9xSky9x::modn12x3[4*getStickMode() + i] - 1;
+    uint8_t idx = Open9xSky9x::modn12x3[4*getStickMode() + i];
     int16_t tmp = trims.values[i];
     trims.values[i] = trims.values[idx];
     trims.values[idx] = tmp;
diff --git a/companion/src/firmwares/opentx/open9xSky9xsimulator.h b/companion/src/firmwares/opentx/opentxSky9xsimulator.h
similarity index 100%
rename from companion/src/firmwares/opentx/open9xSky9xsimulator.h
rename to companion/src/firmwares/opentx/opentxSky9xsimulator.h
diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index 6f216273a..ae4424797 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "opentxTaranisSimulator.h"
-#include "open9xinterface.h"
+#include "opentxinterface.h"
 
 #define SIMU
 #define SIMU_EXCEPTIONS
@@ -128,7 +128,7 @@ bool hasExtendedTrims()
 
 uint8_t getStickMode()
 {
-  return g_eeGeneral.stickMode;
+  return limit<uint8_t>(0, g_eeGeneral.stickMode, 3);
 }
 
 void resetTrims()
@@ -200,7 +200,7 @@ void OpentxTaranisSimulator::setValues(TxInputs &inputs)
 
 void OpentxTaranisSimulator::setTrim(unsigned int idx, int value)
 {
-  idx = Open9xX9D::modn12x3[4*getStickMode() + idx] - 1;
+  idx = Open9xX9D::modn12x3[4*getStickMode() + idx];
   uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
   setTrimValue(phase, idx, value);
 }
@@ -214,7 +214,7 @@ void OpentxTaranisSimulator::getTrims(Trims & trims)
   }
 
   for (int i=0; i<2; i++) {
-    uint8_t idx = Open9xX9D::modn12x3[4*getStickMode() + i] - 1;
+    uint8_t idx = Open9xX9D::modn12x3[4*getStickMode() + i];
     int16_t tmp = trims.values[i];
     trims.values[i] = trims.values[idx];
     trims.values[idx] = tmp;
diff --git a/companion/src/firmwares/opentx/open9xeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
similarity index 86%
rename from companion/src/firmwares/opentx/open9xeeprom.cpp
rename to companion/src/firmwares/opentx/opentxeeprom.cpp
index 9601cb35a..b723ac0a2 100644
--- a/companion/src/firmwares/opentx/open9xeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <algorithm>
 #include "helpers.h"
-#include "open9xeeprom.h"
+#include "opentxeeprom.h"
 #include <QObject>
 
 #define IS_DBLEEPROM(board, version)         ((board==BOARD_GRUVIN9X || board==BOARD_M128) && version >= 213)
@@ -18,10 +18,11 @@
 #define MAX_PHASES(board, version)           (IS_ARM(board) ? 9 :  (IS_DBLRAM(board, version) ? 6 :  5))
 #define MAX_MIXERS(board, version)           (IS_ARM(board) ? 64 : 32)
 #define MAX_CHANNELS(board, version)         (IS_ARM(board) ? 32 : 16)
-#define MAX_EXPOS(board, version)            (IS_ARM(board) ? 32 : (IS_DBLRAM(board, version) ? 16 : 14))
+#define MAX_EXPOS(board, version)            (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 64 : 32) : (IS_DBLRAM(board, version) ? 16 : 14))
 #define MAX_CUSTOM_SWITCHES(board, version)  (IS_ARM(board) ? 32 : (IS_DBLEEPROM(board, version) ? 15 : 12))
 #define MAX_CUSTOM_FUNCTIONS(board, version) (IS_ARM(board) ? 32 : (IS_DBLEEPROM(board, version) ? 24 : 16))
-#define MAX_CURVES(board)                    (IS_ARM(board) ? O9X_ARM_MAX_CURVES : O9X_MAX_CURVES)
+#define MAX_CURVES(board, version)           (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 32 : 16) : O9X_MAX_CURVES)
+#define MAX_GVARS(board, version)            ((IS_ARM(board) && version >= 216) ? 9 : 5)
 
 #define IS_RELEASE_21_MARCH_2013(board, version) (version >= 214 || (!IS_ARM(board) && version >= 213))
 #define IS_RELEASE_23_MARCH_2013(board, version) (version >= 214 || (board==BOARD_STOCK && version >= 213))
@@ -134,6 +135,16 @@ class SourcesConversionTable: public ConversionTable {
         addConversion(RawSource(SOURCE_TYPE_NONE), val++);
       }
 
+      if (IS_TARANIS(board) && version >= 216) {
+        for (int i=0; i<32; i++)
+          addConversion(RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i), val++);
+        for (int i=0; i<3; i++) {
+          for (int j=0; j<6; j++) {
+            addConversion(RawSource(SOURCE_TYPE_LUA_INPUT, i*16+j), val++);
+          }
+        }
+      }
+
       for (int i=0; i<4+MAX_POTS(board); i++)
         addConversion(RawSource(SOURCE_TYPE_STICK, i), val++);
 
@@ -352,6 +363,36 @@ class SourceField: public ConversionField< UnsignedField<N> > {
     unsigned int _source;
 };
 
+class CurveReferenceField: public TransformedField {
+  public:
+    CurveReferenceField(CurveReference & curve, BoardEnum board, unsigned int version):
+      TransformedField(internalField),
+      curve(curve),
+      _curve_type(0)
+    {
+      internalField.Append(new UnsignedField<8>(_curve_type));
+      internalField.Append(new SignedField<8>(curve.value));
+    }
+
+    virtual void beforeExport()
+    {
+      if (curve.value != 0)
+        _curve_type = (unsigned int)curve.type;
+      else
+        _curve_type = 0;
+    }
+
+    virtual void afterImport()
+    {
+      curve.type = (CurveReference::CurveRefType)_curve_type;
+    }
+
+  protected:
+    StructField internalField;
+    CurveReference & curve;
+    unsigned int _curve_type;
+};
+
 class HeliField: public StructField {
   public:
     HeliField(SwashRingData & heli, BoardEnum board, unsigned int version, unsigned int variant)
@@ -409,7 +450,7 @@ class PhaseField: public TransformedField {
       }
 
       if (board != BOARD_STOCK && (board != BOARD_M128 || version < 215)) {
-        for (int i=0; i<O9X_MAX_GVARS; i++) {
+        for (int i=0; i<MAX_GVARS(board, version); i++) {
           internalField.Append(new SignedField<16>(phase.gvars[i]));
         }
       }
@@ -595,7 +636,25 @@ class MixField: public TransformedField {
       board(board),
       version(version)
     {
-      if (IS_ARM(board)) {
+      if (IS_TARANIS(board) && version >= 216) {
+        internalField.Append(new UnsignedField<8>(_destCh));
+        internalField.Append(new UnsignedField<16>(mix.phases));
+        internalField.Append(new UnsignedField<8>((unsigned int &)mix.mltpx));
+        internalField.Append(new SignedField<16>(_weight));
+        internalField.Append(new SwitchField<8>(mix.swtch, board, version));
+        internalField.Append(new CurveReferenceField(mix.curve, board, version));
+        internalField.Append(new UnsignedField<4>(mix.mixWarn));
+        internalField.Append(new UnsignedField<4>(mix.srcVariant));
+        internalField.Append(new UnsignedField<8>(mix.delayUp));
+        internalField.Append(new UnsignedField<8>(mix.delayDown));
+        internalField.Append(new UnsignedField<8>(mix.speedUp));
+        internalField.Append(new UnsignedField<8>(mix.speedDown));
+        internalField.Append(new SourceField<8>(mix.srcRaw, board, version, FLAG_NOTELEMETRY));
+        internalField.Append(new SignedField<16>(_offset));
+        internalField.Append(new ZCharField<8>(mix.name));
+        internalField.Append(new SpareBitsField<8>());
+      }
+      else if (IS_ARM(board)) {
         internalField.Append(new UnsignedField<8>(_destCh));
         internalField.Append(new UnsignedField<16>(mix.phases));
         internalField.Append(new BoolField<1>(_curveMode));
@@ -680,8 +739,18 @@ class MixField: public TransformedField {
     {
       if (mix.destCh && mix.srcRaw.type != SOURCE_TYPE_NONE) {
         _destCh = mix.destCh - 1;
-        _curveMode = mix.curve;
-        _curveParam = (mix.curve ? mix.curve : smallGvarToEEPROM(mix.differential));
+        if (mix.curve.type == CurveReference::CURVE_REF_CUSTOM) {
+          _curveMode = true;
+          _curveParam = 6 + mix.curve.value;
+        }
+        else if (mix.curve.type == CurveReference::CURVE_REF_FUNC) {
+          _curveMode = true;
+          _curveParam = mix.curve.value;
+        }
+        else if (mix.curve.type == CurveReference::CURVE_REF_DIFF) {
+          _curveMode = 0;
+          _curveParam = smallGvarToEEPROM(mix.curve.value);
+        }
       }
       else {
         mix.clear();
@@ -707,12 +776,14 @@ class MixField: public TransformedField {
     {
       if (mix.srcRaw.type != SOURCE_TYPE_NONE) {
         mix.destCh = _destCh + 1;
-        mix.curve = 0;
-        mix.differential = 0;
-        if (_curveMode)
-          mix.curve = _curveParam;
-        else
-          mix.differential = smallGvarToC9x(_curveParam);
+        if (!IS_ARM(board) || version < 216) {
+          if (!_curveMode)
+            mix.curve = CurveReference(CurveReference::CURVE_REF_DIFF, smallGvarToC9x(_curveParam));
+          else if (_curveParam > 6)
+            mix.curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, _curveParam-6);
+          else
+            mix.curve = CurveReference(CurveReference::CURVE_REF_FUNC, _curveParam);
+        }
       }
 
       if (IS_ARM(board)) {
@@ -748,9 +819,23 @@ class ExpoField: public TransformedField {
       TransformedField(internalField),
       internalField("Expo"),
       expo(expo),
-      board(board)
+      board(board),
+      version(version)
     {
-      if (IS_ARM(board)) {
+      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<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 ZCharField<8>(expo.name));
+        internalField.Append(new SignedField<8>(expo.offset, "Offset"));
+        internalField.Append(new CurveReferenceField(expo.curve, board, version));
+        internalField.Append(new SpareBitsField<8>());
+      }
+      else if (IS_ARM(board)) {
         internalField.Append(new UnsignedField<8>(expo.mode));
         internalField.Append(new UnsignedField<8>(expo.chn));
         internalField.Append(new SwitchField<8>(expo.swtch, board, version));
@@ -789,22 +874,41 @@ class ExpoField: public TransformedField {
 
     virtual void beforeExport()
     {
-      _curveMode = (expo.curveMode && expo.curveParam);
       _weight    = smallGvarToEEPROM(expo.weight);
-      _curveParam = smallGvarToEEPROM(expo.curveParam);
+      if (!IS_TARANIS(board) || version < 216) {
+        if (expo.curve.type==CurveReference::CURVE_REF_FUNC && expo.curve.value) {
+          _curveMode = true;
+          _curveParam = expo.curve.value;
+        }
+        else if (expo.curve.type==CurveReference::CURVE_REF_CUSTOM && expo.curve.value) {
+          _curveMode = true;
+          _curveParam = expo.curve.value+6;
+        }
+        else {
+          _curveMode = false;
+          _curveParam = smallGvarToEEPROM(expo.curve.value);
+        }
+      }
     }
 
     virtual void afterImport()
     {
-      expo.curveMode  = _curveMode;
       expo.weight     = smallGvarToC9x(_weight);
-      expo.curveParam = smallGvarToC9x(_curveParam);
+      if (!IS_TARANIS(board) || version < 216) {
+        if (!_curveMode)
+          expo.curve = CurveReference(CurveReference::CURVE_REF_EXPO, smallGvarToC9x(_curveParam));
+        else if (_curveParam > 6)
+          expo.curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, _curveParam-6);
+        else
+          expo.curve = CurveReference(CurveReference::CURVE_REF_FUNC, _curveParam);
+      }
     }
 
   protected:
     StructField internalField;
     ExpoData & expo;
     BoardEnum board;
+    unsigned int version;
     bool _curveMode;
     int  _weight;
     int  _curveParam;
@@ -812,36 +916,56 @@ class ExpoField: public TransformedField {
 
 class LimitField: public StructField {
   public:
-    LimitField(LimitData & limit, BoardEnum board):
+    LimitField(LimitData & limit, BoardEnum board, unsigned int version):
       StructField("Limit")
     {
-      Append(new ConversionField< SignedField<8> >(limit.min, +100));
-      Append(new ConversionField< SignedField<8> >(limit.max, -100));
+      if (IS_ARM(board) && version >= 216) {
+        Append(new ConversionField< SignedField<16> >(limit.min, +1000));
+        Append(new ConversionField< SignedField<16> >(limit.max, -1000));
+      }
+      else {
+        Append(new ConversionField< SignedField<8> >(limit.min, +100, 10));
+        Append(new ConversionField< SignedField<8> >(limit.max, -100, 10));
+      }
       Append(new SignedField<8>(limit.ppmCenter));
       Append(new SignedField<14>(limit.offset));
       Append(new BoolField<1>(limit.symetrical));
       Append(new BoolField<1>(limit.revert));
-      if (HAS_LARGE_LCD(board))
+      if (HAS_LARGE_LCD(board)) {
         Append(new ZCharField<6>(limit.name));
+      }
+      if (IS_TARANIS(board) && version >= 216) {
+        Append(new SignedField<8>(limit.curve.value));
+      }
     }
 };
 
 class CurvesField: public TransformedField {
   public:
-    CurvesField(CurveData * curves, BoardEnum board):
+    CurvesField(CurveData * curves, BoardEnum board, unsigned int version):
       TransformedField(internalField),
       internalField("Curves"),
       curves(curves),
       board(board),
-      maxCurves(MAX_CURVES(board)),
+      version(version),
+      maxCurves(MAX_CURVES(board, version)),
       maxPoints(IS_ARM(board) ? O9X_ARM_NUM_POINTS : O9X_NUM_POINTS)
     {
       for (int i=0; i<maxCurves; i++) {
-        if (IS_ARM(board))
+        if (IS_TARANIS(board) && version >= 216) {
+          internalField.Append(new UnsignedField<3>((unsigned int &)curves[i].type));
+          internalField.Append(new BoolField<1>(curves[i].smooth));
+          internalField.Append(new SpareBitsField<4>());
+          internalField.Append(new ConversionField< SignedField<8> >(curves[i].count, -5));
+        }
+        else if (IS_ARM(board)) {
           internalField.Append(new SignedField<16>(_curves[i]));
-        else
+        }
+        else {
           internalField.Append(new SignedField<8>(_curves[i]));
+        }
       }
+
       for (int i=0; i<maxPoints; i++) {
         internalField.Append(new SignedField<8>(_points[i]));
       }
@@ -853,46 +977,56 @@ class CurvesField: public TransformedField {
 
       int * cur = &_points[0];
       int offset = 0;
+
       for (int i=0; i<maxCurves; i++) {
         CurveData *curve = &curves[i];
-        offset += (curve->custom ? curve->count * 2 - 2 : curve->count) - 5;
-        if (offset > maxPoints - 5 * maxCurves) {
+        int size = (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count);
+        if (offset+size > maxPoints) {
           EEPROMWarnings += ::QObject::tr("openTx only accepts %1 points in all curves").arg(maxPoints) + "\n";
           break;
         }
-        _curves[i] = offset;
+        if (!IS_TARANIS(board) || version < 216) {
+          _curves[i] = offset - (5*i);
+        }
         for (int j=0; j<curve->count; j++) {
           *cur++ = curve->points[j].y;
         }
-        if (curve->custom) {
+        if (curve->type == CurveData::CURVE_TYPE_CUSTOM) {
           for (int j=1; j<curve->count-1; j++) {
             *cur++ = curve->points[j].x;
           }
         }
+        offset += size;
       }
     }
 
     virtual void afterImport()
     {
+      int * cur = &_points[0];
+
       for (int i=0; i<maxCurves; i++) {
         CurveData *curve = &curves[i];
-        int * cur = &_points[i==0 ? 0 : 5*i + _curves[i-1]];
-        int * next = &_points[5*(i+1) + _curves[i]];
-        int size = next - cur;
-        if (size % 2 == 0) {
-          curve->count = (size / 2) + 1;
-          curve->custom = true;
+        if (!IS_TARANIS(board) || version < 216) {
+          int * next = &_points[5*(i+1) + _curves[i]];
+          int size = next - cur;
+          if (size % 2 == 0) {
+            curve->count = (size / 2) + 1;
+            curve->type = CurveData::CURVE_TYPE_CUSTOM;
+          }
+          else {
+            curve->count = size;
+            curve->type = CurveData::CURVE_TYPE_STANDARD;
+          }
         }
-        else {
-          curve->count = size;
-          curve->custom = false;
+
+        for (int j=0; j<curve->count; j++) {
+          curve->points[j].y = *cur++;
         }
-        for (int j=0; j<curve->count; j++)
-          curve->points[j].y = cur[j];
-        if (curve->custom) {
+
+        if (curve->type == CurveData::CURVE_TYPE_CUSTOM) {
           curve->points[0].x = -100;
           for (int j=1; j<curve->count-1; j++)
-            curve->points[j].x = cur[curve->count+j-1];
+            curve->points[j].x = *cur++;
           curve->points[curve->count-1].x = +100;
         }
         else {
@@ -906,10 +1040,11 @@ class CurvesField: public TransformedField {
     StructField internalField;
     CurveData *curves;
     BoardEnum board;
+    unsigned int version;
     int maxCurves;
     int maxPoints;
-    int _curves[O9X_ARM_MAX_CURVES];
-    int _points[O9X_ARM_NUM_POINTS];
+    int _curves[C9X_MAX_CURVES];
+    int _points[C9X_MAX_CURVES*C9X_MAX_POINTS*2];
 };
 
 class CustomSwitchesFunctionsTable: public ConversionTable {
@@ -1238,7 +1373,7 @@ class CustomFunctionField: public TransformedField {
         else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic) {
           memcpy(_arm_param, fn.paramarm, sizeof(_arm_param));
         }
-        else if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGV5) {
+        else if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGVLast) {
           unsigned int value;
           if (version >= 214) {
             _mode = fn.adjustMode;
@@ -1268,7 +1403,7 @@ class CustomFunctionField: public TransformedField {
         /* the default behavior */
         _param = fn.param;
         _union_param = (fn.enabled ? 1 : 0);
-        if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGV5) {
+        if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGVLast) {
           if (version >= 213) {
             _union_param += (fn.adjustMode << 1);
             if (fn.adjustMode == 1)
@@ -1321,7 +1456,7 @@ class CustomFunctionField: public TransformedField {
         else if (fn.func == FuncVolume) {
           sourcesConversionTable->importValue(value, (int &)fn.param);
         }
-        else if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGV5) {
+        else if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGVLast) {
           if (version >= 214) {
             fn.adjustMode = _mode;
             if (fn.adjustMode == 1)
@@ -1350,7 +1485,7 @@ class CustomFunctionField: public TransformedField {
         if (version >= 213) {
           fn.enabled = (_union_param & 0x01);
         }
-        if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGV5) {
+        if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGVLast) {
           if (version >= 213) {
             fn.adjustMode = ((_union_param >> 1) & 0x03);
             if (fn.adjustMode == 1)
@@ -1551,7 +1686,14 @@ class FrskyField: public StructField {
           Append(new UnsignedField<8>(frsky.channels[i].multiplier, 0, 5, "Multiplier"));
         }
         Append(new UnsignedField<8>(frsky.usrProto));
-        Append(new UnsignedField<8>(frsky.voltsSource));
+        if (version >= 216) {
+          Append(new UnsignedField<7>(frsky.voltsSource));
+          // TODO altitude displayed
+          Append(new SpareBitsField<1>());
+        }
+        else {
+          Append(new UnsignedField<8>(frsky.voltsSource));
+        }
         Append(new UnsignedField<8>(frsky.blades));
         Append(new UnsignedField<8>(frsky.currentSource));
 
@@ -1575,6 +1717,12 @@ class FrskyField: public StructField {
           Append(new ConversionField< UnsignedField<2> >(frsky.rssiAlarms[i].level, &rssiConversionTable[i], "RSSI"));
           Append(new ConversionField< SignedField<6> >(frsky.rssiAlarms[i].value, -45+i*3));
         }
+        if (version >= 216) {
+          // TODO uint16_t mAhPersistent:1;
+          // uint16_t storedMah:15;
+          // int8_t   fasOffset;
+          Append(new SpareBitsField<24>());
+        }
       }
       else {
         for (int i=0; i<2; i++) {
@@ -1598,7 +1746,7 @@ class FrskyField: public StructField {
         Append(new SignedField<4>(frsky.varioMax));
         for (int i=0; i<2; i++) {
           Append(new ConversionField< UnsignedField<2> >(frsky.rssiAlarms[i].level, &rssiConversionTable[i], "RSSI level"));
-          Append(new ConversionField< SignedField<6> >(frsky.rssiAlarms[i].value, -45+i*3, 0, 100, "RSSI value"));
+          Append(new ConversionField< SignedField<6> >(frsky.rssiAlarms[i].value, -45+i*3, 0, 0, 100, "RSSI value"));
         }
         for (int i=0; i<2; i++) {
           Append(new FrskyScreenField(frsky.screens[i], board, version));
@@ -1607,6 +1755,10 @@ class FrskyField: public StructField {
         Append(new SignedField<5>(frsky.varioCenterMin));
         Append(new UnsignedField<3>(frsky.currentSource));
         Append(new SignedField<8>(frsky.varioCenterMax));
+        if (version >= 216) {
+          // TODO int8_t   fasOffset;
+          Append(new SpareBitsField<8>());
+        }
       }
     }
 
@@ -1658,9 +1810,16 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
 
   for (int i=0; i<O9X_MAX_TIMERS; i++) {
     internalField.Append(new TimerModeField(modelData.timers[i].mode, board, version));
-    if (release21March2013) {
+    if ((IS_ARM(board) || IS_2560(board)) && version >= 216) {
+      internalField.Append(new UnsignedField<16>(modelData.timers[i].val));
+      internalField.Append(new BoolField<2>(modelData.timers[i].countdownBeep));
+      internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
+      internalField.Append(new BoolField<1>(modelData.timers[i].persistent));
+      internalField.Append(new SpareBitsField<4>());
+      internalField.Append(new SignedField<16>(modelData.timers[i].pvalue));
+    }
+    else if (release21March2013) {
       internalField.Append(new UnsignedField<12>(modelData.timers[i].val));
-
       internalField.Append(new BoolField<1>(modelData.timers[i].countdownBeep));
       internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
       if (HAS_PERSISTENT_TIMERS(board)) {
@@ -1688,7 +1847,7 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
 
   internalField.Append(new BoolField<1>(modelData.thrTrim));
 
-  if (IS_TARANIS(board))
+  if (IS_TARANIS(board) || (IS_ARM(board) && version >= 216))
     internalField.Append(new SpareBitsField<4>());
   else
     internalField.Append(new ConversionField< SignedField<4> >(modelData.moduleData[0].channelsCount, &channelsConversionTable, "Channels number", ::QObject::tr("OpenTX doesn't allow this number of channels")));
@@ -1696,7 +1855,7 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
   internalField.Append(new UnsignedField<3>(modelData.trimInc));
   internalField.Append(new BoolField<1>(modelData.disableThrottleWarning));
 
-  if (IS_TARANIS(board))
+  if (IS_TARANIS(board) || (IS_ARM(board) && version >= 216))
     internalField.Append(new SpareBitsField<1>());
   else
     internalField.Append(new BoolField<1>(modelData.moduleData[0].ppmPulsePol));
@@ -1704,7 +1863,10 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
   internalField.Append(new BoolField<1>(modelData.extendedLimits));
   internalField.Append(new BoolField<1>(modelData.extendedTrims));
   internalField.Append(new BoolField<1>(modelData.throttleReversed));
-  internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[0].ppmDelay, exportPpmDelay, importPpmDelay));
+
+  if (!IS_ARM(board) || version < 216) {
+    internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[0].ppmDelay, exportPpmDelay, importPpmDelay));
+  }
 
   if (IS_ARM(board) || board==BOARD_GRUVIN9X)
     internalField.Append(new UnsignedField<16>(modelData.beepANACenter));
@@ -1714,10 +1876,10 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
   for (int i=0; i<MAX_MIXERS(board, version); i++)
     internalField.Append(new MixField(modelData.mixData[i], board, version));
   for (int i=0; i<MAX_CHANNELS(board, version); i++)
-    internalField.Append(new LimitField(modelData.limitData[i], board));
+    internalField.Append(new LimitField(modelData.limitData[i], board, version));
   for (int i=0; i<MAX_EXPOS(board, version); i++)
     internalField.Append(new ExpoField(modelData.expoData[i], board, version));
-  internalField.Append(new CurvesField(modelData.curves, board));
+  internalField.Append(new CurvesField(modelData.curves, board, version));
   for (int i=0; i<MAX_CUSTOM_SWITCHES(board, version); i++)
     internalField.Append(new CustomSwitchField(modelData.customSw[i], board, version, variant));
   for (int i=0; i<MAX_CUSTOM_FUNCTIONS(board, version); i++)
@@ -1725,11 +1887,16 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
   internalField.Append(new HeliField(modelData.swashRingData, board, version, variant));
   for (int i=0; i<MAX_PHASES(board, version); i++)
     internalField.Append(new PhaseField(modelData.phaseData[i], i, board, version));
-  internalField.Append(new SignedField<8>(modelData.moduleData[0].ppmFrameLength));
+
+  if (!IS_ARM(board) || version < 216) {
+    internalField.Append(new SignedField<8>(modelData.moduleData[0].ppmFrameLength));
+  }
+
   internalField.Append(new UnsignedField<8>(modelData.thrTraceSrc));
 
-  if (!release21March2013)
+  if (!release21March2013) {
     internalField.Append(new UnsignedField<8>(modelData.modelId));
+  }
 
   if (IS_TARANIS(board))
     internalField.Append(new UnsignedField<16>(modelData.switchWarningStates));
@@ -1737,15 +1904,19 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
     internalField.Append(new SwitchesWarningField<8>(modelData.switchWarningStates, board, version));
 
   if ((board == BOARD_STOCK || (board == BOARD_M128 && version >= 215)) && (variant & GVARS_VARIANT)) {
-    for (int i=0; i<O9X_MAX_GVARS; i++) {
+    for (int i=0; i<MAX_GVARS(board, version); i++) {
       // on M64 GVARS are common to all phases, and there is no name
       internalField.Append(new SignedField<16>(modelData.phaseData[0].gvars[i]));
     }
   }
 
   if (board != BOARD_STOCK && (board != BOARD_M128 || version < 215)) {
-    for (int i=0; i<O9X_MAX_GVARS; i++) {
+    for (int i=0; i<MAX_GVARS(board, version); i++) {
       internalField.Append(new ZCharField<6>(modelData.gvars_names[i]));
+      if (version >= 216) {
+        internalField.Append(new BoolField<1>(modelData.gvars_popups[i]));
+        internalField.Append(new SpareBitsField<7>());
+      }
     }
   }
 
@@ -1783,15 +1954,23 @@ Open9xModelDataNew::Open9xModelDataNew(ModelData & modelData, BoardEnum board, u
   }
 
   if (IS_TARANIS(board)) {
-    for (int i=0; i<MAX_CURVES(board); i++) {
+    for (int i=0; i<MAX_CURVES(board, version); i++) {
       internalField.Append(new ZCharField<6>(modelData.curves[i].name));
     }
   }
+
+  if (IS_TARANIS(board) && version >= 216) {
+    // TODO ScriptData scriptsData[MAX_SCRIPTS];
+    internalField.Append(new SpareBitsField<720>());
+    // TODO char inputNames[MAX_INPUTS][4];
+    internalField.Append(new SpareBitsField<1024>());
+  }
 }
 
 void Open9xModelDataNew::beforeExport()
 {
   // qDebug() << QString("before export model") << modelData.name;
+
   for (int module=0; module<3; module++) {
     if (modelData.moduleData[module].protocol >= PXX_XJT_X16 && modelData.moduleData[module].protocol <= PXX_XJT_LR12)
       subprotocols[module] = modelData.moduleData[module].protocol - PXX_XJT_X16;
@@ -1802,7 +1981,7 @@ void Open9xModelDataNew::beforeExport()
 
 void Open9xModelDataNew::afterImport()
 {
-  // qDebug() << QString("after import model") << modelData.name;
+  // qDebug() << QString("after import model") << modelData.name ;
 
   for (int module=0; module<3; module++) {
     if (modelData.moduleData[module].protocol == PXX_XJT_X16) {
@@ -1866,8 +2045,9 @@ Open9xGeneralDataNew::Open9xGeneralDataNew(GeneralSettings & generalData, BoardE
   internalField.Append(new UnsignedField<8>(generalData.inactivityTimer));
   if (IS_STOCK(board) && version >= 215) {
     internalField.Append(new UnsignedField<3>(generalData.mavbaud));
-  } else {
-    internalField.Append(new BoolField<1>(generalData.throttleReversed));
+  }
+  else {
+    internalField.Append(new SpareBitsField<1>());
     internalField.Append(new BoolField<1>(generalData.minuteBeep));
     internalField.Append(new BoolField<1>(generalData.preBeep));
   }
@@ -1892,9 +2072,9 @@ Open9xGeneralDataNew::Open9xGeneralDataNew(GeneralSettings & generalData, BoardE
   internalField.Append(new UnsignedField<8>(generalData.speakerPitch));
 
   if (IS_ARM(board))
-    internalField.Append(new ConversionField< SignedField<8> >(generalData.speakerVolume, -12, 0, 23, "Volume"));
+    internalField.Append(new ConversionField< SignedField<8> >(generalData.speakerVolume, -12, 0, 0, 23, "Volume"));
   else
-    internalField.Append(new ConversionField< SignedField<8> >(generalData.speakerVolume, -7, 0, 7, "Volume"));
+    internalField.Append(new ConversionField< SignedField<8> >(generalData.speakerVolume, -7, 0, 0, 7, "Volume"));
 
   if (version >= 214 || (!IS_ARM(board) && version >= 213)) {
     internalField.Append(new SignedField<8>(generalData.vBatMin));
diff --git a/companion/src/firmwares/opentx/open9xeeprom.h b/companion/src/firmwares/opentx/opentxeeprom.h
similarity index 98%
rename from companion/src/firmwares/opentx/open9xeeprom.h
rename to companion/src/firmwares/opentx/opentxeeprom.h
index 29385f66b..363c46677 100644
--- a/companion/src/firmwares/opentx/open9xeeprom.h
+++ b/companion/src/firmwares/opentx/opentxeeprom.h
@@ -42,7 +42,6 @@
 #define O9X_NUM_FSW            16 // number of functions assigned to switches
 #define O9X_MAX_CURVES         8
 #define O9X_NUM_POINTS         (112-O9X_MAX_CURVES)
-#define O9X_MAX_GVARS          5
 
 #define O9X_ARM_MAX_PHASES     9
 #define O9X_ARM_MAX_MIXERS     64
@@ -50,7 +49,6 @@
 #define O9X_ARM_NUM_CHNOUT     32 // number of real output channels CH1-CH16
 #define O9X_ARM_NUM_CSW        32 // number of custom switches
 #define O9X_ARM_NUM_FSW        32 // number of functions assigned to switches
-#define O9X_ARM_MAX_CURVES     16
 #define O9X_ARM_NUM_POINTS     512
 #define O9X_ARM_MAX_CSFUNCOLD  13
 #define O9X_ARM_MAX_CSFUNC     15
diff --git a/companion/src/firmwares/opentx/open9xinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
similarity index 91%
rename from companion/src/firmwares/opentx/open9xinterface.cpp
rename to companion/src/firmwares/opentx/opentxinterface.cpp
index f5e9ce787..73738e0b4 100644
--- a/companion/src/firmwares/opentx/open9xinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -16,14 +16,14 @@
 
 #include <iostream>
 #include <QMessageBox>
-#include "open9xinterface.h"
-#include "open9xeeprom.h"
+#include "opentxinterface.h"
+#include "opentxeeprom.h"
 #include "open9xGruvin9xeeprom.h"
 #include "open9xSky9xeeprom.h"
-#include "open9xsimulator.h"
-#include "open9xM128simulator.h"
-#include "open9xGruvin9xsimulator.h"
-#include "open9xSky9xsimulator.h"
+#include "opentxsimulator.h"
+#include "opentxM128simulator.h"
+#include "opentxGruvin9xsimulator.h"
+#include "opentxSky9xsimulator.h"
 #include "opentxTaranisSimulator.h"
 #include "file.h"
 
@@ -278,15 +278,7 @@ bool Open9xInterface::saveGeneral(GeneralSettings &settings, BoardEnum board, ui
 }
 
 template <class T>
-bool Open9xInterface::saveModel(unsigned int index, ModelData &model)
-{
-  T open9xModel(model);
-  int sz = efile->writeRlc2(FILE_MODEL(index), FILE_TYP_MODEL, (uint8_t*)&open9xModel, sizeof(T));
-  return (sz == sizeof(T));
-}
-
-template <class T>
-bool Open9xInterface::saveModelVariant(unsigned int index, ModelData &model, unsigned int version, unsigned int variant)
+bool Open9xInterface::saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant)
 {
   T open9xModel(model, board, version, variant);
   // open9xModel.Dump();
@@ -371,16 +363,16 @@ int Open9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t varian
       case BOARD_TARANIS:
       case BOARD_TARANIS_REV4a:
       case BOARD_SKY9X:
-        version = 215;
+        version = 216;
         break;
       case BOARD_GRUVIN9X:
-        version = 214;
+        version = 216;
         break;
       case BOARD_M128:
-        version = 215;
+        version = 216;
         break;
       case BOARD_STOCK:
-        version = 213;
+        version = 216;
         break;
     }
   }
@@ -389,81 +381,21 @@ int Open9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t varian
 
   efile->EeFsCreate(eeprom, size, board);
 
-  int result = 0;
-
   if (board == BOARD_M128) {
     variant |= M128_VARIANT;
   }
   
-  result = saveGeneral<Open9xGeneralDataNew>(radioData.generalSettings, board, version, variant);
-
-  if (!result)
+  int result = saveGeneral<Open9xGeneralDataNew>(radioData.generalSettings, board, version, variant);
+  if (!result) {
     return 0;
+  }
 
   for (int i=0; i<getMaxModels(); i++) {
     if (!radioData.models[i].isempty()) {
-      result = 0;
-      switch(version) {
-        case 202:
-          result = saveModel<Open9xModelData_v202>(i, radioData.models[i]);
-          break;
-        case 203:
-          result = saveModel<Open9xModelData_v203>(i, radioData.models[i]);
-          break;
-        case 204:
-          result = saveModel<Open9xModelData_v204>(i, radioData.models[i]);
-          break;
-        case 205:
-          result = saveModel<Open9xModelData_v205>(i, radioData.models[i]);
-          break;
-        case 207:
-          if (board == BOARD_GRUVIN9X)
-            result = saveModel<Open9xGruvin9xModelData_v207>(i, radioData.models[i]);
-          break;
-        case 208:
-          if (board == BOARD_GRUVIN9X)
-            result = saveModel<Open9xGruvin9xModelData_v208>(i, radioData.models[i]);
-          else if (board == BOARD_SKY9X)
-            result = saveModel<Open9xArmModelData_v208>(i, radioData.models[i]);
-          else
-            result = saveModel<Open9xModelData_v208>(i, radioData.models[i]);
-          break;
-        case 209:
-          if (board == BOARD_GRUVIN9X)
-            result = saveModel<Open9xGruvin9xModelData_v209>(i, radioData.models[i]);
-          else if (board == BOARD_SKY9X)
-            result = saveModel<Open9xArmModelData_v209>(i, radioData.models[i]);
-          else
-            result = saveModel<Open9xModelData_v209>(i, radioData.models[i]);
-          break;
-        case 210:
-          if (board == BOARD_GRUVIN9X)
-            result = saveModel<Open9xGruvin9xModelData_v210>(i, radioData.models[i]);
-          else if (board == BOARD_SKY9X)
-            result = saveModel<Open9xArmModelData_v210>(i, radioData.models[i]);
-          else
-            result = saveModel<Open9xModelData_v210>(i, radioData.models[i]);
-          break;
-        case 211:
-          if (board == BOARD_GRUVIN9X)
-            result = saveModel<Open9xGruvin9xModelData_v211>(i, radioData.models[i]);
-          else if (board == BOARD_SKY9X)
-            result = saveModel<Open9xArmModelData_v211>(i, radioData.models[i]);
-          else
-            result = saveModel<Open9xModelData_v211>(i, radioData.models[i]);
-          break;
-        case 212:
-          if (board == BOARD_SKY9X)
-            result = saveModel<Open9xArmModelData_v212>(i, radioData.models[i]);
-          else
-            result = saveModelVariant<Open9xModelDataNew>(i, radioData.models[i], version, variant);
-          break;
-        default:
-          result = saveModelVariant<Open9xModelDataNew>(i, radioData.models[i], version, variant);
-          break;
+      result = saveModel<Open9xModelDataNew>(i, radioData.models[i], version, variant);
+      if (!result) {
+        return 0;
       }
-      if (!result)
-        return false;
     }
   }
 
@@ -488,7 +420,6 @@ int Open9xInterface::getSize(ModelData &model)
   efile->EeFsCreate(tmp, EESIZE_RLC_MAX, board);
 
   Open9xModelDataNew open9xModel(model, board, 255, GetCurrentFirmwareVariant());
-  // open9xModel.Dump();
 
   QByteArray eeprom;
   open9xModel.Export(eeprom);
@@ -562,12 +493,14 @@ int Open9xInterface::getCapability(const Capability capability)
         return 6;
       else
         return 5;
-    case FlightPhasesAreNamed:
     case FlightPhasesHaveFades:
+      return 1;
     case Gvars:
+      return IS_ARM(board) ? 9 : 5;
+    case FlightModesName:
+    case GvarsName:
+      return (IS_TARANIS(board) ? 10 : 6);
     case GvarsInCS:
-    case GvarsAsWeight:
-    case ExpoIsCurve:
     case HasFAIMode:
       return 1;
     case GvarsAreNamed:
@@ -663,13 +596,6 @@ int Open9xInterface::getCapability(const Capability capability)
       return 0;
     case ExtraInputs:
       return 1;
-    case HasNegCurves:
-      return 1;
-    case HasExpoCurves:
-      return true;
-    case ExpoCurve5:
-    case ExpoCurve9:
-      return 4;
     case ExtendedTrims:
       return 500;
     case ExtraTrims:
@@ -680,10 +606,6 @@ int Open9xInterface::getCapability(const Capability capability)
       return 1;
     case FSSwitch:
       return 1;
-    case HasTTrace:
-      return 1;
-    case CustomCurves:
-      return 1;
     case MixesWithoutExpo:
       return 1;
     case NumCurves:
@@ -692,14 +614,10 @@ int Open9xInterface::getCapability(const Capability capability)
       return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false);
     case HasExpoNames:
       return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false);
-    case HasChNames:
-      return (IS_TARANIS(board) ? 1 : 0);
+    case ChannelsName:
+      return (IS_TARANIS(board) ? 6 : 0);
     case HasCvNames:
       return (IS_TARANIS(board) ? 1 : 0);
-    case NoTimerDirs:
-      return 1;
-    case NoThrExpo:
-      return 1;
     case Telemetry:
       return TM_HASTELEMETRY|TM_HASOFFSET|TM_HASWSHH;
     case TelemetryBars:
@@ -734,8 +652,6 @@ int Open9xInterface::getCapability(const Capability capability)
       return 1;
     case TelemetryMaxMultiplier:
       return (IS_ARM(board) ? 32 : 8);
-    case DiffMixers:
-      return 1;
     case PPMCenter:
       return 1;
     case SYMLimits:
@@ -766,10 +682,6 @@ int Open9xInterface::getCapability(const Capability capability)
     case HasBrightness:
       return (IS_ARM(board) ? true : false);
     case PerModelTimers:
-    case PerModelThrottleWarning:
-    case PerModelThrottleInvert:
-      return 1;
-    case pmSwitchMask:
       return 1;
     case SlowScale:
       return (IS_ARM(board) ? 10 : 2);
@@ -777,15 +689,18 @@ int Open9xInterface::getCapability(const Capability capability)
       return (IS_ARM(board) ? 250 : 15);
     case CSFunc:
       return 18;
-    case GvarsNum:
-    case GvarsOfsNum:  
-      return 5;
     case HasSDLogs:
       return ((board == BOARD_GRUVIN9X || IS_ARM(board)) ? true : false);
     case LCDWidth:
       return (IS_TARANIS(board) ? 212 : 128) ;
     case GetThrSwitch:
-      return (IS_TARANIS(board) ?DSW_SF1 : DSW_THR) ;
+      return (IS_TARANIS(board) ? DSW_SF1 : DSW_THR) ;
+    case VirtualInputs:
+    case LuaInputs:
+    case LimitsPer1000:
+    case EnhancedCurves:
+    case TelemetryInternalAlarms:
+      return IS_TARANIS(board);
     default:
       return 0;
   }
@@ -814,12 +729,15 @@ int Open9xInterface::isAvailable(Protocol proto, int port)
           case PXX_XJT_D8:
           case PXX_XJT_LR12:
           case PXX_DJT:
+          case LP45:
+          case DSM2:
+          case DSMX:
             return 1;
           default:
             return 0;
         }
         break;
-      case 2:
+      case -1:
         switch (proto) {
           case PPM:
             return 1;
@@ -954,6 +872,9 @@ bool Open9xInterface::checkVersion(unsigned int version)
     case 215:
       // M128 revert because too much RAM used!
       break;
+    case 216:
+      // A lot of things (first github release)
+      break;
     default:
       return false;
   }
diff --git a/companion/src/firmwares/opentx/open9xinterface.h b/companion/src/firmwares/opentx/opentxinterface.h
similarity index 95%
rename from companion/src/firmwares/opentx/open9xinterface.h
rename to companion/src/firmwares/opentx/opentxinterface.h
index 351b1ba53..82e8c7671 100644
--- a/companion/src/firmwares/opentx/open9xinterface.h
+++ b/companion/src/firmwares/opentx/opentxinterface.h
@@ -67,10 +67,7 @@ class Open9xInterface : public EEPROMInterface
     bool loadModel(uint8_t version, ModelData &model, uint8_t *data, int index, unsigned int variant, unsigned int stickMode=0);
 
     template <class T>
-    bool saveModel(unsigned int index, ModelData &model);
-
-    template <class T>
-    bool saveModelVariant(unsigned int index, ModelData &model, unsigned int version, unsigned int variant);
+    bool saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant);
 
     template <class T>
     bool loadGeneral(GeneralSettings &settings, unsigned int version);
diff --git a/companion/src/firmwares/opentx/open9xsimulator.cpp b/companion/src/firmwares/opentx/opentxsimulator.cpp
similarity index 94%
rename from companion/src/firmwares/opentx/open9xsimulator.cpp
rename to companion/src/firmwares/opentx/opentxsimulator.cpp
index 252ee6ecc..9037afa86 100644
--- a/companion/src/firmwares/opentx/open9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxsimulator.cpp
@@ -14,9 +14,9 @@
  *
  */
 
-#include "open9xsimulator.h"
-#include "open9xinterface.h"
-#include "open9xeeprom.h"
+#include "opentxsimulator.h"
+#include "opentxinterface.h"
+#include "opentxeeprom.h"
 
 #define HELI
 #define SIMU
@@ -100,7 +100,7 @@ bool hasExtendedTrims()
 
 uint8_t getStickMode()
 {
-  return g_eeGeneral.stickMode;
+  return limit<uint8_t>(0, g_eeGeneral.stickMode, 3);
 }
 
 }
@@ -162,7 +162,7 @@ void Open9xSimulator::setValues(TxInputs &inputs)
 
 void Open9xSimulator::setTrim(unsigned int idx, int value)
 {
-  idx = Open9x::modn12x3[4*getStickMode() + idx] - 1;
+  idx = Open9x::modn12x3[4*getStickMode() + idx];
   uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
   setTrimValue(phase, idx, value);
 }
@@ -176,7 +176,7 @@ void Open9xSimulator::getTrims(Trims & trims)
   }
 
   for (int i=0; i<2; i++) {
-    uint8_t idx = Open9x::modn12x3[4*getStickMode() + i] - 1;
+    uint8_t idx = Open9x::modn12x3[4*getStickMode() + i];
     int16_t tmp = trims.values[i];
     trims.values[i] = trims.values[idx];
     trims.values[idx] = tmp;
diff --git a/companion/src/firmwares/opentx/open9xsimulator.h b/companion/src/firmwares/opentx/opentxsimulator.h
similarity index 100%
rename from companion/src/firmwares/opentx/open9xsimulator.h
rename to companion/src/firmwares/opentx/opentxsimulator.h
diff --git a/companion/src/firmwares/th9x/th9xeeprom.cpp b/companion/src/firmwares/th9x/th9xeeprom.cpp
index d09eb979b..8df98e04b 100644
--- a/companion/src/firmwares/th9x/th9xeeprom.cpp
+++ b/companion/src/firmwares/th9x/th9xeeprom.cpp
@@ -29,15 +29,6 @@ t_Th9xTrainerMix::t_Th9xTrainerMix()
   memset(this, 0, sizeof(t_Th9xTrainerMix));
 }
 
-t_Th9xTrainerMix::t_Th9xTrainerMix(TrainerMix &c9x)
-{
-  memset(this, 0, sizeof(t_Th9xTrainerMix));
-  srcChn = c9x.src;
-  swtch = th9xFromSwitch(c9x.swtch);
-  studWeight = (8 * c9x.weight) / 25;
-  mode = c9x.mode;
-}
-
 t_Th9xTrainerMix::operator TrainerMix()
 {
   TrainerMix c9x;
@@ -53,15 +44,6 @@ t_Th9xTrainerData::t_Th9xTrainerData()
   memset(this, 0, sizeof(t_Th9xTrainerData));
 }
 
-t_Th9xTrainerData::t_Th9xTrainerData(TrainerData &c9x)
-{
-  memset(this, 0, sizeof(t_Th9xTrainerData));
-  for (int i=0; i<NUM_STICKS; i++) {
-    calib[i] = c9x.calib[i];
-    mix[i] = c9x.mix[i];
-  }
-}
-
 t_Th9xTrainerData::operator TrainerData ()
 {
   TrainerData c9x;
@@ -77,49 +59,6 @@ t_Th9xGeneral::t_Th9xGeneral()
   memset(this, 0, sizeof(t_Th9xGeneral));
 }
 
-t_Th9xGeneral::t_Th9xGeneral(GeneralSettings &c9x)
-{
-  memset(this, 0, sizeof(t_Th9xGeneral));
-
-  myVers = MDVERS;
-
-  for (int i=0; i<NUM_STICKSnPOTS; i++) {
-    calibMid[i] = c9x.calibMid[i];
-    calibSpanNeg[i] = c9x.calibSpanNeg[i];
-    calibSpanPos[i] = c9x.calibSpanPos[i];
-  }
-
-  inactivityMin = c9x.inactivityTimer;
-  // iTrimSwitch =
-  // iTrimTme1
-  // iTrimTme2
-  currModel = c9x.currModel;
-  contrast = c9x.contrast;
-  vBatWarn = c9x.vBatWarn;
-  vBatCalib = c9x.vBatCalib;
-  // lightSw = th9xFromSwitch(c9x.lightSw);
-  trainer = c9x.trainer;
-  adcFilt = c9x.filterInput;
-  // keySpeed
-  thr0pos = c9x.throttleReversed;
-  disableThrottleWarning = c9x.disableThrottleWarning;
-  disableSwitchWarning = (c9x.switchWarning != -1);
-  disableMemoryWarning = c9x.disableMemoryWarning;
-
-  if (c9x.beeperMode == e_quiet)
-    beeperVal = 0;
-  else if (c9x.beeperMode < e_all)
-    beeperVal = 1;
-  else if (c9x.beeperLength < 2)
-    beeperVal = 2;
-  else
-    beeperVal = 3;
-
-  view = c9x.view;
-  stickMode = c9x.stickMode;
-  // naviMode
-}
-
 Th9xGeneral::operator GeneralSettings ()
 {
   GeneralSettings result;
@@ -158,7 +97,6 @@ Th9xGeneral::operator GeneralSettings ()
   }
   result.stickMode = stickMode;
   result.inactivityTimer = inactivityMin;
-  result.throttleReversed = thr0pos;
   result.filterInput = adcFilt;
   return result;
 }
@@ -169,35 +107,25 @@ t_Th9xExpoData::t_Th9xExpoData()
   memset(this, 0, sizeof(t_Th9xExpoData));
 }
 
-t_Th9xExpoData::t_Th9xExpoData(ExpoData &c9x)
-{
-  memset(this, 0, sizeof(t_Th9xLimitData));
-  exp5 = c9x.expo;
-  mode3 = c9x.mode;
-  weight6 = c9x.weight;
-  chn = c9x.chn;
-  drSw = th9xFromSwitch(c9x.swtch);
-  if (c9x.curveMode==1)
-    curve = c9x.curveParam;
-  else
-    curve = 0;
-}
-
 t_Th9xExpoData::operator ExpoData ()
 {
   ExpoData c9x;
-  c9x.expo = exp5;
+  if (exp5) {
+    c9x.curve.type = CurveReference::CURVE_REF_EXPO;
+    c9x.curve.value = exp5;
+  }
+  else if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
   c9x.mode = mode3;
   c9x.weight = weight6;
   c9x.chn = chn;
   c9x.swtch = th9xToSwitch(drSw);
-  if (curve) {
-    c9x.curveMode=1;
-    c9x.curveParam = curve;    
-  } else {
-    c9x.curveMode = 0;
-    c9x.curveParam = exp5;
-  }
   return c9x;
 }
 
@@ -206,15 +134,6 @@ t_Th9xLimitData::t_Th9xLimitData()
   memset(this, 0, sizeof(t_Th9xLimitData));
 }
 
-t_Th9xLimitData::t_Th9xLimitData(LimitData &c9x)
-{
-  memset(this, 0, sizeof(t_Th9xLimitData));
-  min = c9x.min+100;
-  max = c9x.max-100;
-  revert = c9x.revert;
-  offset = c9x.offset;
-}
-
 t_Th9xLimitData::operator LimitData ()
 {
   LimitData c9x;
@@ -225,36 +144,11 @@ t_Th9xLimitData::operator LimitData ()
   return c9x;
 }
 
-
 t_Th9xMixData::t_Th9xMixData()
 {
   memset(this, 0, sizeof(t_Th9xMixData));
 }
 
-t_Th9xMixData::t_Th9xMixData(MixData &c9x)
-{
-  memset(this, 0, sizeof(t_Th9xMixData));
-  destCh = c9x.destCh;
-  mixMode = c9x.mltpx;
-  if (c9x.srcRaw.type == SOURCE_TYPE_STICK)
-    srcRaw = c9x.srcRaw.index;
-  else if (c9x.srcRaw.type == SOURCE_TYPE_MAX)
-    srcRaw = 10;
-  else if (c9x.srcRaw.type == SOURCE_TYPE_PPM)
-    srcRaw = 24 + c9x.srcRaw.index;
-  else if (c9x.srcRaw.type == SOURCE_TYPE_CH)
-    srcRaw = 12 + c9x.srcRaw.index;
-  else
-    srcRaw = 0; // TODO
-  switchMode = 1;
-  curveNeg = 0;
-  weight = c9x.weight;
-  swtch = th9xFromSwitch(c9x.swtch);
-  curve = c9x.curve;
-  speedUp = c9x.speedUp;
-  speedDown = c9x.speedDown;
-}
-
 t_Th9xMixData::operator MixData ()
 {
   MixData c9x;
@@ -273,41 +167,20 @@ t_Th9xMixData::operator MixData ()
     c9x.srcRaw = RawSource(SOURCE_TYPE_PPM, srcRaw-24);
   c9x.weight = weight;
   c9x.swtch = th9xToSwitch(swtch);
-  c9x.curve = curve;
+  if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
   c9x.speedUp = speedUp;
   c9x.speedDown = speedDown;
   c9x.mltpx = (MltpxValue)mixMode;
   return c9x;
 }
 
-
-t_Th9xCustomSwData::t_Th9xCustomSwData(CustomSwData &c9x)
-{
-  opCmp = c9x.func;
-  val1 = c9x.val1;
-  val2 = c9x.val2;
-
-  if ((c9x.func >= CS_FN_VPOS && c9x.func <= CS_FN_ANEG) || c9x.func >= CS_FN_EQUAL) {
-    val1 = fromSource(RawSource(c9x.val1));
-  }
-
-  if (c9x.func >= CS_FN_EQUAL) {
-    val2 = fromSource(RawSource(c9x.val2));
-  }
-
-  if (c9x.func >= CS_FN_AND && c9x.func <= CS_FN_XOR) {
-    val1 = th9xFromSwitch(RawSwitch(c9x.val1));
-    val2 = th9xFromSwitch(RawSwitch(c9x.val2));
-  }
-
-  if (opCmp>TH9X_MAX_CSFUNC ) {
-    EEPROMWarnings += ::QObject::tr("th9x does not support Custom Switch function %1").arg(getFuncName(opCmp)) + "\n";
-    opCmp=0;
-    val1=0;
-    val2=0;
-  }    
-}
-
 t_Th9xCustomSwData::operator CustomSwData ()
 {
   CustomSwData c9x;
@@ -388,76 +261,6 @@ t_Th9xModelData::t_Th9xModelData()
   memset(this, 0, sizeof(t_Th9xModelData));
 }
 
-t_Th9xModelData::t_Th9xModelData(ModelData &c9x)
-{
-  memset(this, 0, sizeof(t_Th9xModelData));
-
-  if (c9x.used) {
-    setEEPROMString(name, c9x.name, sizeof(name));
-    mdVers = MDVERS;
-    if (c9x.timers[0].mode == TMRMODE_ABS)
-      tmrMode = 1;
-    if (c9x.timers[0].mode == TMRMODE_THs)
-      tmrMode = 2;
-    if (c9x.timers[0].mode == TMRMODE_THp)
-      tmrMode = 3;
-    else
-      tmrMode = 0;
-
-    // TODO tmrDir = c9x.timers[0].dir;
-    tmrVal = c9x.timers[0].val;
-    //protocol = c9x.protocol;
-    /*
-    ppmNCH = (c9x.moduleData[0].channelsCount - 8) / 2;
-    thrTrim = c9x.thrTrim;
-    thrExpo = c9x.thrExpo;
-    trimInc = c9x.trimInc;
-    ppmDelay = (c9x.moduleData[0].ppmDelay - 300) / 50;
-    for (unsigned int i=0; i<C9X_MAX_CUSTOM_FUNCTIONS; i++)
-      if (c9x.funcSw[i].func == FuncTrims2Offsets && c9x.funcSw[i].swtch) trimSw = c9x.funcSw[i].swtch;
-    beepANACenter = c9x.beepANACenter;
-    pulsePol = c9x.pulsePol;*/
-    for (int i=0; i<TH9X_NUM_CHNOUT; i++)
-      limitData[i] = c9x.limitData[i];
-    for (int i=0; i<TH9X_MAX_EXPOS; i++)
-      expoTab[i] = c9x.expoData[i];
-    for (int i=0; i<TH9X_MAX_MIXERS; i++)
-      mixData[i] = c9x.mixData[i];
-    for (int i=0; i<NUM_STICKS; i++)
-      trimData[i].itrim = std::max(-30, std::min(30, c9x.phaseData[0].trim[i]));
-    for (int i=0; i<TH9X_MAX_CURVES3; i++)
-      if  (c9x.curves[i].count==3) {
-        if  (c9x.curves[i].custom)
-          EEPROMWarnings += QObject::tr("th9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1) + "\n";    
-        for (int j=0; j<3; j++)
-          curves3[i][j] = c9x.curves[i].points[j].y;
-    } else {
-        EEPROMWarnings += QObject::tr("th9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i].count).arg(i+1) + "\n";
-    }   
-    for (int i=0; i<TH9X_MAX_CURVES5; i++)
-     if  (c9x.curves[i+TH9X_MAX_CURVES3].count==5) {
-      if  (c9x.curves[i+TH9X_MAX_CURVES3].custom)
-        EEPROMWarnings += QObject::tr("th9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1+TH9X_MAX_CURVES3) + "\n";    
-      for (int j=0; j<5; j++)
-        curves5[i][j] = c9x.curves[i+TH9X_MAX_CURVES3].points[j].y;
-     } else {
-       EEPROMWarnings += QObject::tr("th9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i+TH9X_MAX_CURVES3].count).arg(i+1+TH9X_MAX_CURVES3) + "\n";
-     }   
-    for (int i=0; i<TH9X_MAX_CURVES9; i++)
-     if  (c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].count==9) {
-      if  (c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].custom)
-        EEPROMWarnings += QObject::tr("th9x doesn't support custom curves as curve%1, curve as been exported as fixed point ").arg(i+1+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5) + "\n";    
-      for (int j=0; j<9; j++)
-        curves5[i][j] = c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].points[j].y;
-     } else {
-       EEPROMWarnings += QObject::tr("th9x doesn't support curve with %1 point as curve%2 ").arg(c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].count).arg(i+1+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5) + "\n";
-     }   
-
-    /*for (int i=0; i<TH9X_NUM_CSW; i++)
-      customSw[i] = c9x.customSw[i];*/
-  }
-}
-
 t_Th9xModelData::operator ModelData ()
 {
   ModelData c9x;
@@ -507,7 +310,6 @@ t_Th9xModelData::operator ModelData ()
   for (int i=0; i<NUM_STICKS; i++)
     c9x.phaseData[0].trim[i] = trimData[i].itrim;
   for (int i=0; i<TH9X_MAX_CURVES3; i++) {
-    c9x.curves[i].custom = false;
     c9x.curves[i].count = 3;
     for (int j=0; j<3; j++) {
       c9x.curves[i].points[j].x = -100 + 100*i;
@@ -515,7 +317,6 @@ t_Th9xModelData::operator ModelData ()
     }
   }
   for (int i=0; i<TH9X_MAX_CURVES5; i++) {
-    c9x.curves[i+TH9X_MAX_CURVES3].custom = false;
     c9x.curves[i+TH9X_MAX_CURVES3].count = 5;
     for (int j=0; j<5; j++) {
       c9x.curves[i+TH9X_MAX_CURVES3].points[j].x = -100 + 50*i;
@@ -523,15 +324,12 @@ t_Th9xModelData::operator ModelData ()
     }
   }
   for (int i=0; i<TH9X_MAX_CURVES9; i++) {
-    c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].custom = false;
     c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].count = 5;
     for (int j=0; j<9; j++) {
       c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].points[j].x = -100 + 50*i;
       c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].points[j].y = curves9[i][j];
     }
   }
-  /*for (int i=0; i<TH9X_NUM_CSW; i++)
-    c9x.customSw[i] = customSw[i];*/
 
   return c9x;
 }
diff --git a/companion/src/firmwares/th9x/th9xeeprom.h b/companion/src/firmwares/th9x/th9xeeprom.h
index d9653fb67..294a33a0c 100644
--- a/companion/src/firmwares/th9x/th9xeeprom.h
+++ b/companion/src/firmwares/th9x/th9xeeprom.h
@@ -42,8 +42,6 @@ PACK(typedef struct t_Th9xTrainerMix {
 
   operator TrainerMix();
   t_Th9xTrainerMix();
-  t_Th9xTrainerMix(TrainerMix&);
-
 }) Th9xTrainerMix; //
 
 PACK(typedef struct t_Th9xTrainerData {
@@ -52,8 +50,6 @@ PACK(typedef struct t_Th9xTrainerData {
 
   operator TrainerData();
   t_Th9xTrainerData();
-  t_Th9xTrainerData(TrainerData&);
-
 }) Th9xTrainerData;
 
 PACK(typedef struct t_Th9xGeneral {
@@ -84,8 +80,6 @@ PACK(typedef struct t_Th9xGeneral {
 
   operator GeneralSettings();
   t_Th9xGeneral();
-  t_Th9xGeneral(GeneralSettings&);
-
 }) Th9xGeneral;
 
 /*
@@ -104,7 +98,6 @@ PACK(typedef struct t_Th9xExpoData {
 
   operator ExpoData();
   t_Th9xExpoData();
-  t_Th9xExpoData(ExpoData&);
 }) Th9xExpoData;
 
 
@@ -118,7 +111,6 @@ PACK(typedef struct t_Th9xLimitData {
 
   operator LimitData();
   t_Th9xLimitData();
-  t_Th9xLimitData(LimitData&);
 }) Th9xLimitData;
 
 #define MLTPX_ADD  0
@@ -144,7 +136,6 @@ PACK(typedef struct t_Th9xMixData {
 
   operator MixData();
   t_Th9xMixData();
-  t_Th9xMixData(MixData&);
 }) Th9xMixData;
 
 PACK(typedef struct t_Th9xCustomSwData {
@@ -156,7 +147,6 @@ PACK(typedef struct t_Th9xCustomSwData {
 
   operator CustomSwData();
   t_Th9xCustomSwData() { memset(this, 0, sizeof(t_Th9xCustomSwData)); }
-  t_Th9xCustomSwData(CustomSwData &);
   int8_t fromSource(RawSource source);
   RawSource toSource(int8_t value);
 }) Th9xCustomSwData;
@@ -187,9 +177,6 @@ PACK(typedef struct t_Th9xModelData {
   Th9xTrimData   trimData[NUM_STICKS];    // 3*4 -> 1*4
   operator ModelData();
   t_Th9xModelData();
-  t_Th9xModelData(ModelData&);
 }) Th9xModelData;
 
-
 #endif
-/*eof*/
diff --git a/companion/src/firmwares/th9x/th9xinterface.cpp b/companion/src/firmwares/th9x/th9xinterface.cpp
index 624b077a8..d86065ddb 100644
--- a/companion/src/firmwares/th9x/th9xinterface.cpp
+++ b/companion/src/firmwares/th9x/th9xinterface.cpp
@@ -124,56 +124,20 @@ bool Th9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize,
 
 int Th9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
 {
-  EEPROMWarnings.clear();
+  std::cout << "NO!\n";
+  // TODO a warning
 
-  efile->EeFsCreate(eeprom, getEEpromSize(), BOARD_STOCK);
-
-  Th9xGeneral th9xGeneral(radioData.generalSettings);
-  int sz = efile->writeRlc2(FILE_GENERAL, FILE_TYP_GENERAL, (uint8_t*)&th9xGeneral, sizeof(Th9xGeneral));
-  if(sz != sizeof(Th9xGeneral)) {
-    return 0;
-  }
-
-  for (int i=0; i<getMaxModels(); i++) {
-    if (!radioData.models[i].isempty()) {
-      Th9xModelData th9xModel(radioData.models[i]);
-      sz = efile->writeRlc2(FILE_MODEL(i), FILE_TYP_MODEL, (uint8_t*)&th9xModel, sizeof(Th9xModelData));
-      if(sz != sizeof(Th9xModelData)) {
-        return 0;
-      }
-    }
-  }
-
-  return getEEpromSize();
+  return 0;
 }
 
 int Th9xInterface::getSize(ModelData &model)
 {
-  if (model.isempty())
-    return 0;
-
-  uint8_t tmp[2*EESIZE_STOCK];
-  efile->EeFsCreate(tmp, getEEpromSize(), BOARD_STOCK);
-
-  Th9xModelData th9xModel(model);
-  int sz = efile->writeRlc2(0, FILE_TYP_MODEL, (uint8_t*)&th9xModel, sizeof(Th9xModelData));
-  if(sz != sizeof(Th9xModelData)) {
-     return -1;
-  }
-  return efile->size(0);
+  return 0;
 }
 
 int Th9xInterface::getSize(GeneralSettings &settings)
 {
-  uint8_t tmp[2*EESIZE_STOCK];
-  efile->EeFsCreate(tmp, getEEpromSize(), BOARD_STOCK);
-
-  Th9xGeneral th9xGeneral(settings);
-  int sz = efile->writeRlc2(0, FILE_TYP_GENERAL, (uint8_t*)&th9xGeneral, sizeof(Th9xGeneral));
-  if(sz != sizeof(th9xGeneral)) {
-    return -1;
-  }
-  return efile->size(0);
+  return 0;
 }
 
 int Th9xInterface::getCapability(const Capability capability)
@@ -181,12 +145,6 @@ int Th9xInterface::getCapability(const Capability capability)
   switch (capability) {
     case Mixes:
       return TH9X_MAX_MIXERS;
-    case NumCurves3:
-      return TH9X_MAX_CURVES3;
-    case NumCurves5:
-      return TH9X_MAX_CURVES5;      
-    case NumCurves9:
-      return TH9X_MAX_CURVES9;
     case OwnerName:
       return 0;
     case Timers:
diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp
index 1f5b179bb..0758f5e22 100644
--- a/companion/src/generaledit.cpp
+++ b/companion/src/generaledit.cpp
@@ -170,22 +170,10 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
       ui->crosstrimChkB->hide();
       ui->crosstrimLB->hide();
     }
-   if (!GetEepromInterface()->getCapability(HasPPMSim)) {
+    if (!GetEepromInterface()->getCapability(HasPPMSim)) {
       ui->PPMSimLB->hide();
       ui->PPMSimChkB->hide();
     }
-     
-    if (GetEepromInterface()->getCapability(PerModelThrottleWarning)) {
-      ui->thrwarnChkB->setDisabled(true);
-      ui->thrwarnChkB->hide();
-      ui->thrwarnLabel->hide();
-    }
-    if (GetEepromInterface()->getCapability(pmSwitchMask)) {
-      ui->swwarn_label->hide();
-      ui->swtchWarnCB->hide();
-      ui->swtchWarnChkB->hide();
-      layout()->removeItem(ui->swwarn_layout);
-    }
     if (!GetEepromInterface()->getCapability( HasPxxCountry)) {
       ui->countrycode_label->hide();
       ui->countrycode_CB->hide();
@@ -322,11 +310,8 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
       ui->swID0ChkB->hide();
       ui->swID1ChkB->hide();
       ui->swID2ChkB->hide();
-      ui->swtchWarnChkB->hide();
       this->layout()->removeItem(ui->switchMaskLayout);
     } else {
-      ui->swtchWarnCB->setDisabled(true);
-      ui->swtchWarnCB->hide();
       setSwitchDefPos();
     }
     if (!GetEepromInterface()->getCapability(TelemetryAlarm)) {
@@ -340,12 +325,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
     } else {
       populateRotEncCB(ui->re_CB, g_eeGeneral.reNavigation, renumber);
     }
-    if (GetEepromInterface()->getCapability(PerModelThrottleInvert)) {
-      ui->label_thrrev->hide();
-      ui->thrrevChkB->hide();
-    } else {
-      ui->thrrevChkB->setChecked(g_eeGeneral.throttleReversed);
-    }
     ui->telalarmsChkB->setChecked(g_eeGeneral.enableTelemetryAlarm);
     ui->PotScrollEnableChkB->setChecked(!g_eeGeneral.disablePotScroll);
     ui->BandGapEnableChkB->setChecked(!g_eeGeneral.disableBG);
@@ -359,9 +338,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
     ui->StickScrollChkB->setChecked(g_eeGeneral.stickScroll);
     ui->PPMSimChkB->setChecked(g_eeGeneral.enablePpmsim);
     ui->inputfilterCB->setCurrentIndex(g_eeGeneral.filterInput);
-    ui->thrwarnChkB->setChecked(!g_eeGeneral.disableThrottleWarning);   //Default is zero=checked
-    ui->swtchWarnChkB->setChecked(g_eeGeneral.switchWarning == -1);
-    ui->swtchWarnCB->setCurrentIndex(g_eeGeneral.switchWarning == -1 ? 2 : g_eeGeneral.switchWarning);
     ui->memwarnChkB->setChecked(!g_eeGeneral.disableMemoryWarning);   //Default is zero=checked
     ui->alarmwarnChkB->setChecked(!g_eeGeneral.disableAlarmWarning);//Default is zero=checked
     ui->enableTelemetryAlarmChkB->setChecked(g_eeGeneral.enableTelemetryAlarm);
@@ -622,36 +598,12 @@ void GeneralEdit::on_inactimerSB_editingFinished()
     updateSettings();
 }
 
-void GeneralEdit::on_thrrevChkB_stateChanged(int )
-{
-    g_eeGeneral.throttleReversed = ui->thrrevChkB->isChecked() ? 1 : 0;
-    updateSettings();
-}
-
 void GeneralEdit::on_inputfilterCB_currentIndexChanged(int index)
 {
     g_eeGeneral.filterInput = index;
     updateSettings();
 }
 
-void GeneralEdit::on_thrwarnChkB_stateChanged(int )
-{
-    g_eeGeneral.disableThrottleWarning = ui->thrwarnChkB->isChecked() ? 0 : 1;
-    updateSettings();
-}
-
-void GeneralEdit::on_swtchWarnCB_currentIndexChanged(int index)
-{
-    g_eeGeneral.switchWarning = (index == 2 ? -1 : index);
-    updateSettings();
-}
-
-void GeneralEdit::on_swtchWarnChkB_stateChanged(int )
-{
-    g_eeGeneral.switchWarning = ui->swtchWarnChkB->isChecked() ? -1 : 0;
-    updateSettings();
-}
-
 void GeneralEdit::on_memwarnChkB_stateChanged(int )
 {
     g_eeGeneral.disableMemoryWarning = ui->memwarnChkB->isChecked() ? 0 : 1;
@@ -1074,7 +1026,7 @@ void GeneralEdit::on_blinvert_cb_stateChanged(int )
 void GeneralEdit::on_faimode_CB_stateChanged(int )
 {
     if (ui->faimode_CB->isChecked()) {
-      int ret = QMessageBox::question(this, "companion9x", 
+      int ret = QMessageBox::question(this, "Companion", 
                      tr("If you enable FAI, you loose the vario, the play functions, the telemetry screen.\nThis function cannot be disabled by the radio.\nAre you sure ?") ,
                      QMessageBox::Yes | QMessageBox::No);
       if (ret==QMessageBox::Yes) {
@@ -1375,7 +1327,7 @@ void GeneralEdit::on_calstore_PB_clicked()
   } else {
     QString calib=settings.value("StickPotCalib","").toString();
     if (!(calib.isEmpty())) {
-      int ret = QMessageBox::question(this, "companion9x", 
+      int ret = QMessageBox::question(this, "Companion", 
                       tr("Do you want to store calibration in %1 profile<br>overwriting existing calibration?").arg(name) ,
                       QMessageBox::Yes | QMessageBox::No);
       if (ret == QMessageBox::No) {
@@ -1408,7 +1360,7 @@ void GeneralEdit::on_calstore_PB_clicked()
     settings.setValue("countryCode",QString("%1%2%3").arg((uint8_t)g_eeGeneral.countryCode, 2, 16, QChar('0')).arg((uint8_t)g_eeGeneral.imperial, 2, 16, QChar('0')).arg(g_eeGeneral.ttsLanguage));
     settings.endGroup();
     settings.endGroup();
-    QMessageBox::information(this, "companion9x", tr("Calibration and HW parameters saved."));
+    QMessageBox::information(this, "Companion", tr("Calibration and HW parameters saved."));
   }
 }
 
diff --git a/companion/src/generaledit.h b/companion/src/generaledit.h
index ac6b12cbc..eb6895d13 100644
--- a/companion/src/generaledit.h
+++ b/companion/src/generaledit.h
@@ -123,12 +123,8 @@ private slots:
     void on_channelorderCB_currentIndexChanged(int index);
     void on_beeperCB_currentIndexChanged(int index);
     void on_memwarnChkB_stateChanged(int );
-    void on_swtchWarnCB_currentIndexChanged(int index);
-    void on_swtchWarnChkB_stateChanged(int );
     void on_telalarmsChkB_stateChanged(int );
-    void on_thrwarnChkB_stateChanged(int );
     void on_inputfilterCB_currentIndexChanged(int index);
-    void on_thrrevChkB_stateChanged(int );
     void on_inactimerSB_editingFinished();
     void on_backlightautoSB_editingFinished();
     void on_backlightswCB_currentIndexChanged(int index);
diff --git a/companion/src/generaledit.ui b/companion/src/generaledit.ui
index 8ac09986a..d47781a69 100644
--- a/companion/src/generaledit.ui
+++ b/companion/src/generaledit.ui
@@ -117,6 +117,13 @@ These will be relevant for all models in the same EEPROM.</string>
        <string>Setup</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0,0">
+       <item row="19" column="4">
+        <widget class="QCheckBox" name="PPMSimChkB">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
        <item row="4" column="1">
         <widget class="QSpinBox" name="volume_SB">
          <property name="sizePolicy">
@@ -130,7 +137,7 @@ These will be relevant for all models in the same EEPROM.</string>
          </property>
         </widget>
        </item>
-       <item row="29" column="3" colspan="2">
+       <item row="28" column="3" colspan="2">
         <layout class="QHBoxLayout" name="pxxCountry">
          <item>
           <widget class="QLabel" name="countrycode_label">
@@ -160,13 +167,6 @@ These will be relevant for all models in the same EEPROM.</string>
          </item>
         </layout>
        </item>
-       <item row="19" column="4">
-        <widget class="QCheckBox" name="PPMSimChkB">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
        <item row="24" column="0">
         <widget class="QLabel" name="mavbaud_label">
          <property name="text">
@@ -174,7 +174,7 @@ These will be relevant for all models in the same EEPROM.</string>
          </property>
         </widget>
        </item>
-       <item row="30" column="3" colspan="2">
+       <item row="29" column="3" colspan="2">
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QLabel" name="VoiceLang_label">
@@ -188,49 +188,7 @@ These will be relevant for all models in the same EEPROM.</string>
          </item>
         </layout>
        </item>
-       <item row="25" column="1">
-        <layout class="QHBoxLayout" name="swwarn_layout">
-         <item>
-          <widget class="QComboBox" name="swtchWarnCB">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>100</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <item>
-            <property name="text">
-             <string>Off</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Switches Up</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Switches Down</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="swtchWarnChkB">
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="30" column="0">
+       <item row="29" column="0">
         <widget class="QLabel" name="units_label">
          <property name="text">
           <string>Measurement Units</string>
@@ -476,13 +434,6 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="19" column="0">
-        <widget class="QLabel" name="label_thrrev">
-         <property name="text">
-          <string>Reverse Throttle Operation</string>
-         </property>
-        </widget>
-       </item>
        <item row="3" column="3">
         <widget class="QLabel" name="label_HL">
          <property name="text">
@@ -490,7 +441,7 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="32" column="1">
+       <item row="31" column="1">
         <widget class="QComboBox" name="stickmodeCB">
          <property name="toolTip">
           <string/>
@@ -551,26 +502,40 @@ Mode 4:
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_12">
+       <item row="18" column="4">
+        <widget class="QCheckBox" name="crosstrimChkB">
          <property name="text">
-          <string>Beeper Mode</string>
+          <string/>
          </property>
         </widget>
        </item>
-       <item row="13" column="4">
-        <widget class="QSpinBox" name="blOnStickMoveSB">
-         <property name="suffix">
-          <string> sec</string>
+       <item row="12" column="0">
+        <widget class="QLabel" name="label_displayType">
+         <property name="text">
+          <string>LCD Display Type</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QSpinBox" name="hapticStrengthSB">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
          <property name="maximum">
-          <number>600</number>
-         </property>
-         <property name="singleStep">
           <number>5</number>
          </property>
         </widget>
        </item>
+       <item row="13" column="3">
+        <widget class="QLabel" name="label_blOnStickMove">
+         <property name="text">
+          <string>BackLight On Stick Move</string>
+         </property>
+        </widget>
+       </item>
        <item row="2" column="4">
         <widget class="QSpinBox" name="speakerPitchSB">
          <property name="toolTip">
@@ -598,23 +563,37 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="19" column="1">
-        <widget class="QCheckBox" name="thrrevChkB">
-         <property name="whatsThis">
-          <string>Reverse throttle operation.
-If this is checked the throttle will be reversed.  Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
-
-</string>
+       <item row="13" column="4">
+        <widget class="QSpinBox" name="blOnStickMoveSB">
+         <property name="suffix">
+          <string> sec</string>
          </property>
-         <property name="text">
-          <string/>
+         <property name="maximum">
+          <number>600</number>
+         </property>
+         <property name="singleStep">
+          <number>5</number>
          </property>
         </widget>
        </item>
-       <item row="13" column="3">
-        <widget class="QLabel" name="label_blOnStickMove">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_12">
          <property name="text">
-          <string>BackLight On Stick Move</string>
+          <string>Beeper Mode</string>
+         </property>
+        </widget>
+       </item>
+       <item row="30" column="0">
+        <widget class="QLabel" name="label_timezone">
+         <property name="text">
+          <string>Timeshift from UTC</string>
+         </property>
+        </widget>
+       </item>
+       <item row="17" column="3">
+        <widget class="QLabel" name="re_label">
+         <property name="text">
+          <string>RotEnc Navigation</string>
          </property>
         </widget>
        </item>
@@ -637,47 +616,6 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
          </property>
         </widget>
        </item>
-       <item row="17" column="3">
-        <widget class="QLabel" name="re_label">
-         <property name="text">
-          <string>RotEnc Navigation</string>
-         </property>
-        </widget>
-       </item>
-       <item row="31" column="0">
-        <widget class="QLabel" name="label_timezone">
-         <property name="text">
-          <string>Timeshift from UTC</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1">
-        <widget class="QSpinBox" name="hapticStrengthSB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximum">
-          <number>5</number>
-         </property>
-        </widget>
-       </item>
-       <item row="18" column="4">
-        <widget class="QCheckBox" name="crosstrimChkB">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="12" column="0">
-        <widget class="QLabel" name="label_displayType">
-         <property name="text">
-          <string>LCD Display Type</string>
-         </property>
-        </widget>
-       </item>
        <item row="22" column="0">
         <widget class="QLabel" name="label_frskyintalarm">
          <property name="text">
@@ -685,14 +623,7 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
          </property>
         </widget>
        </item>
-       <item row="21" column="0">
-        <widget class="QLabel" name="thrwarnLabel">
-         <property name="text">
-          <string>Throttle Startup Warning</string>
-         </property>
-        </widget>
-       </item>
-       <item row="26" column="0" colspan="5">
+       <item row="25" column="0" colspan="5">
         <layout class="QHBoxLayout" name="switchMaskLayout">
          <item>
           <widget class="QCheckBox" name="swTHRChkB">
@@ -775,7 +706,7 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="31" column="3" colspan="2">
+       <item row="30" column="3" colspan="2">
         <layout class="QHBoxLayout" name="gpsFormatLayout">
          <item>
           <widget class="QLabel" name="gpsFormatLabel">
@@ -800,7 +731,7 @@ p, li { white-space: pre-wrap; }
          </item>
         </layout>
        </item>
-       <item row="29" column="1">
+       <item row="28" column="1">
         <widget class="QCheckBox" name="faimode_CB">
          <property name="toolTip">
           <string>If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.</string>
@@ -810,7 +741,7 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="32" column="4">
+       <item row="31" column="4">
         <widget class="QComboBox" name="channelorderCB">
          <property name="toolTip">
           <string/>
@@ -948,48 +879,6 @@ This is used by the templated to determine which channel goes to what number out
          </item>
         </widget>
        </item>
-       <item row="20" column="0">
-        <widget class="QLabel" name="label_27">
-         <property name="text">
-          <string>Alarm Warning</string>
-         </property>
-        </widget>
-       </item>
-       <item row="20" column="1">
-        <widget class="QCheckBox" name="alarmwarnChkB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="whatsThis">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
        <item row="16" column="3">
         <widget class="QLabel" name="label_hideOwnerName">
          <property name="text">
@@ -1046,7 +935,7 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="29" column="0">
+       <item row="28" column="0">
         <widget class="QLabel" name="label_faimode">
          <property name="text">
           <string>FAI Mode</string>
@@ -1163,7 +1052,7 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="31" column="1">
+       <item row="30" column="1">
         <widget class="QSpinBox" name="timezoneSB">
          <property name="minimum">
           <number>-14</number>
@@ -1176,7 +1065,7 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="30" column="1">
+       <item row="29" column="1">
         <widget class="QComboBox" name="units_CB">
          <item>
           <property name="text">
@@ -1190,7 +1079,7 @@ p, li { white-space: pre-wrap; }
          </item>
         </widget>
        </item>
-       <item row="32" column="3">
+       <item row="31" column="3">
         <widget class="QLabel" name="label_13">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -1203,7 +1092,7 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="32" column="0">
+       <item row="31" column="0">
         <widget class="QLabel" name="label_14">
          <property name="text">
           <string>Stick Mode</string>
@@ -1247,41 +1136,6 @@ p, li { white-space: pre-wrap; }
          </property>
         </spacer>
        </item>
-       <item row="20" column="4">
-        <widget class="QCheckBox" name="memwarnChkB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="whatsThis">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
        <item row="12" column="1">
         <widget class="QComboBox" name="displayTypeCB">
          <item>
@@ -1345,13 +1199,6 @@ p, li { white-space: pre-wrap; }
          </item>
         </widget>
        </item>
-       <item row="20" column="3">
-        <widget class="QLabel" name="label_11">
-         <property name="text">
-          <string>Memory Startup Warning</string>
-         </property>
-        </widget>
-       </item>
        <item row="11" column="4">
         <widget class="QSpinBox" name="BLBright_SB">
          <property name="maximum">
@@ -1532,32 +1379,6 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="21" column="1">
-        <widget class="QCheckBox" name="thrwarnChkB">
-         <property name="whatsThis">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-         <property name="tristate">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
        <item row="1" column="3">
         <widget class="QLabel" name="label_soundMode">
          <property name="text">
@@ -1565,7 +1386,7 @@ p, li { white-space: pre-wrap; }
          </property>
         </widget>
        </item>
-       <item row="33" column="0" colspan="2">
+       <item row="32" column="0" colspan="2">
         <spacer name="verticalSpacer_5">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -1684,7 +1505,7 @@ Acceptable values are 5v..10v</string>
          </property>
         </widget>
        </item>
-       <item row="27" column="0">
+       <item row="26" column="0">
         <widget class="QLabel" name="ro_label">
          <property name="text">
           <string>Readonly Unlock</string>
@@ -1726,13 +1547,6 @@ Acceptable values are 5v..10v</string>
          </property>
         </widget>
        </item>
-       <item row="25" column="0">
-        <widget class="QLabel" name="swwarn_label">
-         <property name="text">
-          <string>Switch Startup Warning</string>
-         </property>
-        </widget>
-       </item>
        <item row="13" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
@@ -1740,7 +1554,7 @@ Acceptable values are 5v..10v</string>
          </property>
         </widget>
        </item>
-       <item row="27" column="1" colspan="3">
+       <item row="26" column="1" colspan="3">
         <layout class="QGridLayout" name="TaranisReadOnlyUnlock" rowstretch="0,0" columnstretch="0,0,0,0,0,0,0,0,0">
          <property name="sizeConstraint">
           <enum>QLayout::SetMinimumSize</enum>
@@ -2268,6 +2082,90 @@ Acceptable values are 5v..10v</string>
          </item>
         </layout>
        </item>
+       <item row="19" column="1">
+        <widget class="QCheckBox" name="alarmwarnChkB">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="whatsThis">
+          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="19" column="0">
+        <widget class="QLabel" name="label_27">
+         <property name="text">
+          <string>Alarm Warning</string>
+         </property>
+        </widget>
+       </item>
+       <item row="21" column="1">
+        <widget class="QCheckBox" name="memwarnChkB">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="whatsThis">
+          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="21" column="0">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Memory Startup Warning</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabTrainer">
@@ -3607,8 +3505,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>beepMinuteChkB</tabstop>
   <tabstop>beepCountDownChkB</tabstop>
   <tabstop>beepFlashChkB</tabstop>
-  <tabstop>swtchWarnCB</tabstop>
-  <tabstop>swtchWarnChkB</tabstop>
   <tabstop>swTHRChkB</tabstop>
   <tabstop>swRUDChkB</tabstop>
   <tabstop>swELEChkB</tabstop>
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 30f2a9c6f..7c5046b31 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -155,16 +155,8 @@ QString getFuncName(unsigned int val)
     return QObject::tr("Background Music");
   else if (val == FuncBackgroundMusicPause)
     return QObject::tr("Background Music Pause");
-  else if (val == FuncAdjustGV1)
-    return QObject::tr("Adjust GV1");
-  else if (val == FuncAdjustGV2)
-    return QObject::tr("Adjust GV2");
-  else if (val == FuncAdjustGV3)
-    return QObject::tr("Adjust GV3");
-  else if (val == FuncAdjustGV4)
-    return QObject::tr("Adjust GV4");
-  else if (val == FuncAdjustGV5)
-    return QObject::tr("Adjust GV5");
+  else if (val >= FuncAdjustGV1 && val <= FuncAdjustGVLast)
+    return QObject::tr("Adjust GV%1").arg(val-FuncAdjustGV1+1);
   else {
     return QString("???"); // Highlight unknown functions with output of question marks.(BTW should not happen that we do not know what a function is)
   }
@@ -424,7 +416,7 @@ void populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsign
   else if (function==FuncPlayValue) {
     populateSourceCB(b, RawSource(value), POPULATE_SOURCES|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRYEXT);
   }
-  else if (function>=FuncAdjustGV1 && function<=FuncAdjustGV5 ) {
+  else if (function>=FuncAdjustGV1 && function<=FuncAdjustGVLast) {
     switch (adjustmode) {
       case 1:
         populateSourceCB(b, RawSource(value), POPULATE_SOURCES|POPULATE_TRIMS|POPULATE_SWITCHES);
@@ -440,7 +432,6 @@ void populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsign
         break;
     }
   }
-
   else {
     b->hide();
   }
@@ -480,68 +471,133 @@ void populatePhasesCB(QComboBox *b, int value)
   b->setCurrentIndex(value + GetEepromInterface()->getCapability(FlightPhases));
 }
 
-void populateCurvesCB(QComboBox *b, int value)
+CurveGroup::CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags):
+  QObject(),
+  curveTypeCB(curveTypeCB),
+  curveGVarCB(curveGVarCB),
+  curveValueCB(curveValueCB),
+  curveValueSB(curveValueSB),
+  curve(curve),
+  flags(flags),
+  lock(false),
+  lastType(-1)
 {
-  b->clear();
-  int numcurves=GetEepromInterface()->getCapability(NumCurves);
-  if (numcurves==0) {
-    numcurves=16;
-  }
-  for (int i = -(numcurves)*GetEepromInterface()->getCapability(HasNegCurves); i < CURVE_BASE + numcurves; i++) {
-    if ((i==0) && GetEepromInterface()->getCapability(DiffMixers)) {
-      b->addItem(QObject::tr("Diff"));
-    } else {
-      b->addItem(getCurveStr(i));
-    }
-  }
-  b->setCurrentIndex(value+numcurves*GetEepromInterface()->getCapability(HasNegCurves));
-  b->setMaxVisibleItems(10);
+  curveTypeCB->addItem(tr("Diff"));
+  curveTypeCB->addItem(tr("Expo"));
+  curveTypeCB->addItem(tr("Func"));
+  curveTypeCB->addItem(tr("Curve"));
+
+  curveValueCB->setMaxVisibleItems(10);
+
+  connect(curveTypeCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(curveGVarCB, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
+  connect(curveValueCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(curveValueSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
+
+  update();
 }
 
-void populateExpoCurvesCB(QComboBox *b, int value)
+void CurveGroup::update()
 {
-  b->clear();
-  int numcurves=GetEepromInterface()->getCapability(NumCurves);
-  if (numcurves==0) {
-    numcurves=16;
-  }
-  if (GetEepromInterface()->getCapability(ExpoIsCurve)) {
-      b->addItem(QObject::tr("Expo"));
-  } else {
-      b->addItem(getCurveStr(0));
-  }
-  for (int i = 1; i < CURVE_BASE + numcurves; i++)    
-    b->addItem(getCurveStr(i));
-  b->setCurrentIndex(value);
-  b->setMaxVisibleItems(10);
-  /* TODO
-  if (GetEepromInterface()->getCapability(ExpoCurve5)) {
-    int curve5=GetEepromInterface()->getCapability(ExpoCurve5);
-    for (int i=CURVE_BASE+curve5; i < CURVE_BASE + MAX_CURVE5; i++) {
-      // Get the index of the value to disable
-      QModelIndex index = b->model()->index(i, 0);
+  lock = true;
 
-      // This is the effective 'disable' flag
-      QVariant v(0);
+  curveTypeCB->setCurrentIndex(curve.type);
 
-      //the magic
-      b->model()->setData(index, v, Qt::UserRole - 1);
+  if (curve.type == CurveReference::CURVE_REF_DIFF || curve.type == CurveReference::CURVE_REF_EXPO) {
+    curveGVarCB->show();
+    if (curve.value > 100 || curve.value < -100) {
+      curveGVarCB->setChecked(true);
+      if (lastType != CurveReference::CURVE_REF_DIFF && lastType != CurveReference::CURVE_REF_EXPO) {
+        lastType = curve.type;
+        populateGVCB(curveValueCB, curve.value);
+      }
+      curveValueCB->show();
+      curveValueSB->hide();
+    }
+    else {
+      curveGVarCB->setChecked(false);
+      curveValueSB->setMinimum(-100);
+      curveValueSB->setMaximum(100);
+      curveValueSB->setValue(curve.value);
+      curveValueSB->show();
+      curveValueCB->hide();
     }
   }
-  if (GetEepromInterface()->getCapability(ExpoCurve9)) {
-    int curve9=GetEepromInterface()->getCapability(ExpoCurve9);
-    for (int i=CURVE_BASE+MAX_CURVE5+curve9; i < CURVE_BASE + MAX_CURVE5+ MAX_CURVE9; i++) {
-      // Get the index of the value to disable
-      QModelIndex index = b->model()->index(i, 0);
-
-      // This is the effective 'disable' flag
-      QVariant v(0);
-
-      //the magic
-      b->model()->setData(index, v, Qt::UserRole - 1);
+  else {
+    curveGVarCB->hide();
+    curveValueSB->hide();
+    curveValueCB->show();
+    switch (curve.type) {
+      case CurveReference::CURVE_REF_FUNC:
+        if (lastType != curve.type) {
+          lastType = curve.type;
+          curveValueCB->clear();
+          for (int i=0; i<=6/*TODO constant*/; i++) {
+            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_FUNC, i).toString());
+          }
+        }
+        curveValueCB->setCurrentIndex(curve.value);
+        break;
+      case CurveReference::CURVE_REF_CUSTOM:
+      {
+        int numcurves = GetEepromInterface()->getCapability(NumCurves);
+        if (lastType != curve.type) {
+          lastType = curve.type;
+          curveValueCB->clear();
+          for (int i=-numcurves; i<numcurves; i++) {
+            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString());
+          }
+        }
+        curveValueCB->setCurrentIndex(curve.value+numcurves);
+        break;
+      }
+      default:
+        break;
     }
   }
-  */
+
+  lock = false;
+}
+
+void CurveGroup::gvarCBChanged(int state)
+{
+  if (!lock) {
+    if (state) {
+      curve.value = 10000; // TODO constant in EEpromInterface ...
+    }
+    else {
+      curve.value = 0; // TODO could be better
+    }
+
+    update();
+  }
+}
+
+void CurveGroup::valuesChanged()
+{
+  if (!lock) {
+    switch (curveTypeCB->currentIndex()) {
+      case 0:
+      case 1:
+      {
+        int value;
+        if (curveGVarCB->isChecked())
+          value = curveValueCB->itemData(curveValueCB->currentIndex()).toInt();
+        else
+          value = curveValueSB->value();
+        curve = CurveReference(curveTypeCB->currentIndex() == 0 ? CurveReference::CURVE_REF_DIFF : CurveReference::CURVE_REF_EXPO, value);
+        break;
+      }
+      case 2:
+        curve = CurveReference(CurveReference::CURVE_REF_FUNC, curveValueCB->currentIndex());
+        break;
+      case 3:
+        curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->currentIndex() - GetEepromInterface()->getCapability(NumCurves));
+        break;
+    }
+
+    update();
+  }
 }
 
 void populateTrimUseCB(QComboBox *b, unsigned int phase)
@@ -560,73 +616,29 @@ void populateTrimUseCB(QComboBox *b, unsigned int phase)
 void populateGvarUseCB(QComboBox *b, unsigned int phase)
 {
   b->addItem(QObject::tr("Own value"));
-  unsigned int num_phases = GetEepromInterface()->getCapability(FlightPhases);
-  if (num_phases>0) {
-    for (unsigned int i = 0; i < num_phases; i++) {
-      if (i != phase) {
-        b->addItem(QObject::tr("Flight mode %1 value").arg(i));
-      }
+  for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+    if (i != (int)phase) {
+      b->addItem(QObject::tr("Flight mode %1 value").arg(i));
     }
   }
 }
 
-void populateTimerSwitchCB(QComboBox *b, int value, int extrafields)
+void populateTimerSwitchCB(QComboBox *b, int value)
 {
   b->clear();
-  uint8_t endvalue=128;
   uint8_t count=0;
-  if (extrafields==2)
-    endvalue=192;
-  for (int i=-128; i<endvalue; i++) {
+  for (int i=-128; i<128; i++) {
     QString timerMode = getTimerMode(i);
     if (!timerMode.isEmpty()) {
       b->addItem(getTimerMode(i), i);
       if (i==value)
         b->setCurrentIndex(b->count()-1);
-      if (extrafields==2 && (i<0 || (i>3 && i <TMRMODE_FIRST_CHPERC))) {
-        QModelIndex index = b->model()->index(count, 0);
-        // This is the effective 'disable' flag
-        QVariant v(0);
-        //the magic
-        b->model()->setData(index, v, Qt::UserRole - 1);
-      }
       count++;
     }
   }
   b->setMaxVisibleItems(10);
 }
 
-void populateTimerSwitchBCB(QComboBox *b, int value, int extrafields)
-{
-  b->clear();
-  if (extrafields!=2) {
-    int startvalue=-128;
-    int endvalue=128;
-    if (extrafields==1) {
-      startvalue=-25;
-      endvalue=26;
-    }
-    for (int i=startvalue; i<endvalue; i++) {
-      QString timerMode = getTimerMode(i);
-      if (!timerMode.isEmpty()) {
-        b->addItem(getTimerMode(i), i);
-        if (i==value)
-          b->setCurrentIndex(b->count()-1);
-      }
-    }
-  } else {
-    for (int i=-33; i<66; i++) {
-      QString timerMode = getTimerModeB(i);
-      if (!timerMode.isEmpty()) {
-        b->addItem(timerMode, i);
-        if (i==value)
-          b->setCurrentIndex(b->count()-1);
-      }
-    }
-  }
-  b->setMaxVisibleItems(10);
-}
-
 QString getTimerMode(int tm) {
 
   QString stt = "OFFABSTHsTH%THt";
@@ -868,8 +880,10 @@ void populateGVCB(QComboBox *b, int value)
 {
   int selected=0;
   int nullitem;
+
   b->clear();
-  int pgvars=GetEepromInterface()->getCapability(GvarsOfsNum);
+
+  int pgvars = GetEepromInterface()->getCapability(Gvars);
   for (int i=-pgvars; i<=-1; i++) {
     int16_t gval = (int16_t)(-10000+i);
     b->addItem(QObject::tr("-GV%1").arg(-i), gval);
@@ -878,12 +892,15 @@ void populateGVCB(QComboBox *b, int value)
       selected=1;
     }
   }
+
   b->addItem("---", 0);
+
   nullitem=b->count()-1;
   if (value == 0) {
     b->setCurrentIndex(b->count()-1);
     selected=1;
   }
+
   for (int i=1; i<=pgvars; i++) {
     int16_t gval = (int16_t)(10000+i);
     b->addItem(QObject::tr("GV%1").arg(i), gval);
@@ -892,6 +909,7 @@ void populateGVCB(QComboBox *b, int value)
       selected=1;
     }
   }
+
   if (selected==0)
     b->setCurrentIndex(nullitem);
 }
@@ -983,7 +1001,7 @@ void populateSourceCB(QComboBox *b, const RawSource &source, unsigned int flags)
   }
 
   if (flags & POPULATE_GVARS) {
-    for (int i=0; i<GetEepromInterface()->getCapability(GvarsNum); i++) {
+    for (int i=0; i<GetEepromInterface()->getCapability(Gvars); i++) {
       item = RawSource(SOURCE_TYPE_GVAR, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
@@ -1061,25 +1079,20 @@ QString getSignedStr(int value)
   return value > 0 ? QString("+%1").arg(value) : QString("%1").arg(value);
 }
 
-QString getCurveStr(int curve)
-{
-  QString crvStr = "!c16!c15!c14!c13!c12!c11!c10!c9 !c8 !c7 !c6 !c5 !c4 !c3 !c2 !c1 ----x>0 x<0 |x| f>0 f<0 |f| c1  c2  c3  c4  c5  c6  c7  c8  c9  c10 c11 c12 c13 c14 c15 c16 ";
-  return crvStr.mid((curve+C9X_MAX_CURVES) * 4, 4).remove(' ').replace("c", QObject::tr("Curve") + " ");
-}
-
 QString getGVarString(int16_t val, bool sign)
 {
-  if (val >= -10000 && val <= 10000)
+  if (val >= -10000 && val <= 10000) {
     if (sign)
-      return QString("(%1%)").arg(getSignedStr(val));
+      return QString("%1%").arg(getSignedStr(val));
     else
-      return QString("(%1%)").arg(val);
-  else
-    if (val<0) {
-      return QObject::tr("(-GV%1)").arg(-val-10000);
-    } else {
-      return QObject::tr("(GV%1)").arg(val-10000);
-    }
+      return QString("%1%").arg(val);
+  }
+  else {
+    if (val<0)
+      return QObject::tr("-GV%1").arg(-val-10000);
+    else
+      return QObject::tr("GV%1").arg(val-10000);
+  }
 }
 
 QString image2qstring(QImage image)
@@ -1141,12 +1154,6 @@ int findmult(float value, float base)
   return mult;
 }
 
-bool checkbit(int value, int bit)
-{
-  return ((value & (1<<bit))==(1<<bit));
-}
-
-
 QString getFrSkyAlarmType(int alarm)
 {
   switch (alarm) {
@@ -1344,6 +1351,34 @@ QString getProtocol(ModelData * g_model)
   return str;
 }
 
+QString getPhasesStr(unsigned int phases, ModelData & model)
+{
+  int numphases = GetEepromInterface()->getCapability(FlightPhases);
+
+  if (numphases && phases) {
+    QString str;
+    int count = 0;
+    if (phases == (unsigned int)(1<<numphases) - 1) {
+      str = QObject::tr("None");
+    }
+    if (phases) {
+      for (int i=0; i<numphases;i++) {
+        if (!(phases & (1<<i))) {
+          if (count++ > 0) str += QString(", ");
+          str += getPhaseName(i+1, model.phaseData[i].name);
+        }
+      }
+    }
+    if (count > 1)
+      return QObject::tr("Flight modes(%1)").arg(str);
+    else
+      return QObject::tr("Flight mode(%1)").arg(str);
+  }
+  else {
+    return "";
+  }
+}
+
 float c9xexpou(float point, float coeff)
 {
   float x=point*1024.0/100.0;
diff --git a/companion/src/helpers.h b/companion/src/helpers.h
index d37b8f8bd..bc61e2894 100644
--- a/companion/src/helpers.h
+++ b/companion/src/helpers.h
@@ -6,10 +6,10 @@
 
 #define TMR_NUM_OPTION  (TMR_VAROFS+2*9+2*GetEepromInterface()->getCapability(CustomSwitches)-1)
 
-//convert from mode 1 to mode g_eeGeneral.stickMode
+//convert from mode 1 to mode generalSettings.stickMode
 //NOTICE!  =>  1..4 -> 1..4
-#define CONVERT_MODE(x) (((x)<=4) ? modn12x3[g_eeGeneral.stickMode][((x)-1)] : (x))
-#define CHANNEL_ORDER(x) (chout_ar[g_eeGeneral.templateSetup*4 + (x)-1])
+#define CONVERT_MODE(x) (((x)<=4) ? modn12x3[generalSettings.stickMode][((x)-1)] : (x))
+#define CHANNEL_ORDER(x) (chout_ar[generalSettings.templateSetup*4 + (x)-1])
 
 #define CURVE_BASE   7
 #define CH(x) (SRC_CH1+(x)-1-(SRC_SWC-SRC_3POS))
@@ -29,6 +29,29 @@ void populateTTraceCB(QComboBox *b, int value);
 void populateRotEncCB(QComboBox *b, int value, int renumber);
 void populateBacklightCB(QComboBox *b, const uint8_t value);
 
+class CurveGroup : public QObject {
+
+  Q_OBJECT
+
+  public:
+    CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags=0);
+    void update();
+
+  protected slots:
+    void gvarCBChanged(int);
+    void valuesChanged();
+
+  protected:
+    QComboBox *curveTypeCB;
+    QCheckBox *curveGVarCB;
+    QComboBox *curveValueCB;
+    QSpinBox *curveValueSB;
+    CurveReference & curve;
+    unsigned int flags;
+    bool lock;
+    int lastType;
+};
+
 #define POPULATE_ONOFF        0x01
 #define POPULATE_MSWITCHES    0x02
 #define POPULATE_AND_SWITCHES 0x04
@@ -42,13 +65,11 @@ void populateFuncParamArmTCB(QComboBox *b, ModelData * g_model, char * value, QS
 void populatePhasesCB(QComboBox *b, int value);
 void populateTrimUseCB(QComboBox *b, unsigned int phase);
 void populateGvarUseCB(QComboBox *b, unsigned int phase);
-void populateCurvesCB(QComboBox *b, int value);
 void populateCustomScreenFieldCB(QComboBox *b, unsigned int value, bool last, int hubproto);
-void populateExpoCurvesCB(QComboBox *b, int value);
-void populateTimerSwitchCB(QComboBox *b, int value, int extrafields=0);
-void populateTimerSwitchBCB(QComboBox *b, int value, int extrafields=0);
+void populateTimerSwitchCB(QComboBox *b, int value);
 QString getCustomSwitchStr(CustomSwData * customSw, const ModelData & model);
 QString getProtocolStr(const int proto);
+QString getPhasesStr(unsigned int phases, ModelData & model);
 
 #define POPULATE_SOURCES       1
 #define POPULATE_TRIMS         2
@@ -72,12 +93,10 @@ QString getCSWFunc(int val);
 QString getFuncName(unsigned int val);
 QString getRepeatString(unsigned int val);
 QString getSignedStr(int value);
-QString getCurveStr(int curve);
 QString getGVarString(int16_t val, bool sign=false);
 QString image2qstring(QImage image);
 QImage qstring2image(QString imagestr);
 int findmult(float value, float base);
-bool checkbit(int value, int bit);
 
 QString getTrimInc(ModelData * g_model);
 QString getTimerStr(TimerData & timer);
@@ -95,4 +114,5 @@ float getBarValue(int barId, int value, FrSkyData *fd);
 float c9xexpou(float point, float coeff);
 float ValToTim(int value);
 int TimToVal(float value);
+
 #endif // HELPERS_H
diff --git a/companion/src/icon.ico b/companion/src/icon.ico
index 2453af4ff..bb088b1ae 100644
Binary files a/companion/src/icon.ico and b/companion/src/icon.ico differ
diff --git a/companion/src/icon.png b/companion/src/icon.png
index 90a961731..6ceee4f23 100644
Binary files a/companion/src/icon.png and b/companion/src/icon.png differ
diff --git a/companion/src/icon.svg b/companion/src/icon.svg
deleted file mode 100644
index c36f00f53..000000000
--- a/companion/src/icon.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3050"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="New document 6">
-  <defs
-     id="defs3052" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="479"
-     inkscape:window-height="590"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3055">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <image
-       y="6.811959e-08"
-       x="4.108463e-07"
-       id="image3120"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAFFRJREFU
-aIHtmWlwXcd15//dd3337QseHoCHlVi5gaJIcBMp0hJTlGzLiV2UPXGUipOKKiqXVGUrrnJ5UoNi
-pFQcO1PxSJM4jD2eOHHkWHQiWxpJZkQtpERS3ESQFAiC2LcH4D28/b279r09H+hw7JGrxhzHyRef
-7919fn26T5/+H+BX9iv7hYz8W07GOafPPPOMBEBxHEe2LEvw+/1wHIczxpxYLGb19vbaBw4cYP9W
-a/7CABycfP5zn1dDoVC0rOupWrXY7Fp2g8d4mDFPJYQQTjgTBKEmy3JeVdXleDy+pGlaTtf1+pEj
-R7z/MIBHjx6VErm5RG4111+p1u4CYwOSqrb4g8FwIOhXFFkWZUjEcz3X1C27WqnU6/V6lrt8MhAN
-XArHw1f7Ovoyn/nMZ8x/d4DP/dfP+UiFtK8sZfeZlrUv2hTrbuvriLV1d/qaEyklooVFURapShRE
-XD9nhuOWSyV7bmHeHLl+pTI+fXPOL2pvk5j8+ql3X5+4fvJ67d8N4PH/9rgilIXuzNzKh4kgHOzf
-ubF1y9Bd0c0tA/5UIKnUBIsuYo0skRwpo4YYD/EQNMS9oBc0FSeXzdXPXTpfeunEK5lL7116Y3U2
-8wNozg3M4Y4jId7pgOefPyycG5ebFxdW7qeSeGjHg/e079yxK7El1uefE9eEPzOfw6uX3sDU2CTq
-hQpc6kGIKUTtjSDW3Sg0a0kh1hCUjcGycuPsnFBYzO4H4xUYSgWw5gC4v1SA00vrg+XVubscZh/Y
-fv/u1j179jRsifT7n6en6B+N/AVmv3seeL8OGJSDUg8u54wTasUztLxrATPb/IAiUHGc+dXpCty4
-wLDi7IXNphDDGgqo/NIAhoeHxWy+1FSsVXem+zs6BndujW4Mdfu/TY/Tx999Guaz48AKODTVhsJ1
-VJkJ0/NAiShyT5NGXI25juCWa+ALNjFkz+c1iGHkaStsbxBcuQpYNQA/d2a6I4AcoNYqlXVUpP3r
-tvaF18e7A1fEGfrFxf8O8x9mQPKU8xi1UGFrmDPyqLgFuLAgkaAXRlwOIIH39LArMskVwUE8DzYn
-EIkMwhMgXhAA/aUBaKgHluu1rkAylGxrb/OHlID0X9y/Q/70JMicCx4SXHBexKyRQcm9AI5zIKQC
-oJ1a3j5n1eizK47jacQHxj1UXAtlVofllUHICkRiAuB34tPPDTA8PEwXrVzAcZyWcFPcn4w0KIvC
-GnmrcAEYswFCOEKChUmjgqo3DpW+gIByGaGQoYa8RMLV1laWVj/s5sxuEKqCwYHjVcF4DhTvQ+Bn
-oNk53MHu3xEAAMqYHfAojwbjQTmk+KVRMkcyaytAjgE+yiERCzVWg4gxyHQc1ytFoMLNw4cz+eyZ
-U4FoqKwTut41WYCLbsXzhBVIPAPOl2DYq5hHFb+sCFzHdSq7mkop9UkBVVREmUwhA1YzQWwAGgVE
-wsC4AZGswifXAeOWM8eOuQawbHRFq/FU6HKdMNHUPBN1ZqCUt3AdDHe483cMsH7DekycmRU8QKKi
-QDhAi7wKWAwgBPBTDpVwUMIgEBP0Azvp8keeqD5TiJmz4ix9KBRyDhw58gsXdT//EWqAx0XP4/A8
-j3swYfO6ZwCuB4gECAiACkDkBIJAINKfAhgeHpaf8BnJun+01TEd/99WqrXHn3o8J7JYkcUK9Wef
-eMYGIXd0fP6fAMPDw7QZUKvVqub8sByKUF9jndcUR7dozi3CIg6giIBKgZhEECQUiiBB9fwBnyI/
-OTysAjG5VrPV1epyS6VQ2V2vV3dCIBGXObWVQnaRSgs3W83m8S8/82fTlw4fzh47dsx+9NFHpaam
-JgUIydUqp//qD+fEy2ZFNjQE64knnrAJIfxnAjz//PPCyJkzSS+f75qs1fpqut7BLCvhqGITAeuv
-ZkthwzRogz8M+ERwlUCwQeTWiOQ013x8XG9pNtMdc3OGZJoT7aZda/Ko281gb9PigXQoFZFVv8Rk
-eFUna2aL2cLEd9/9/okbNybe+c3HHitLNJ6emMj22PZcA+DKrgtYFqAost3VFc8tLIjTHR37ZwGU
-PwDwhS98ITh69uxArVS6v1os7vUcp0cVxahfVWVBFATueaKeKQhO0SCtsQaIARUsrcC7XCPpzT2K
-1yEEpk5e3tg0mDRss5YyTGuTpsWShAoNEMWQ5vdLAcqFhCZwfyAanuBzoZNnXg0tvT/JQslUVmGw
-cuXMfQDZ5vfHI5yrEqUEiQTnoujao6MzuQsXxt5ZWVl8FUD9pwC++tWv+kvz87tWc7lPG/X6gdZU
-KjmwaZPUNjBAEqkUqKlj9PIFcmZ5GmbFQNppQDgYRr6jDDJpYvnklELzLNK9pW9dS0OqoVatxlrb
-Nid6enYFYrGQ2pxWSDwh0KDfwT+/9h75i299Q13I3xC4WTOkqJZMNaXbKpVaOuSP39fff19TY2NX
-oLvbJ6TTCjKZunf06Mv1EydeDhjGQg5InAaG6G2Ao0ePSpmpqcF8ofDbruMc2r93b2T3Aw/Q9o0b
-iZLPo3T5MrKzM4jnCkiaLgozS2jsbEZaaUQ+tgy+NQAzw6jWEYx+asvvIDWixU+cP6sJsqS1tbXI
-Q0PNlEJEuUzx5hs2vvX1dzB/IwcSl6iQCAohTqwmLdkkUnFbX9+HGjdvvqdhaCioLS1R8txzC/jO
-d15h16//yAOMoiDEa8Fge71UCrLbAMVMpimfy33EMowD9+3bFz74yU/SZCpFCt/8Jr7xta/hzOgo
-8gB8mopAbycii91oCPrQsEUFdQiUzjBaDrVhfm1RrLULsQ+1fMjWQmGMvD8l2l6WvH8tgf/xDQEX
-LzEsLs7B86YgBzdDVbOetTJK1g10WZrkW9eWXt/S2joYHRoKaMeOCXR4+AxWV78PYN4lRNQDgUg2
-GlUvO45vuVQ65oq3L+3p0xsqpdL+vs7O+J5Dh4RkKkVyf/zHGB4exjkAFsA1gPtdjpnVNdIiKWT8
-xTfhFKsILVgw7CrmR8qwQ8C3yYtCuaXuG9rbxxVTIuNLI9jYFUWl1oKZGRvAKkQxAMHt5sYyhV+b
-Iw3BWEMsnPR1du6MDm5p8I+Pi/SLX7yGUuk5AMRtaRmshMNX12xbvEAIvTg/7yveTqOjo6PBWqUy
-KABdW7dtE1I9PYS/8gq+/dRTuAiAAJwCDlTVnqXU0yt15dc7e8VCrS5YX3sPGnVg9MpwfAAqDMXX
-1vA/02P4p1iCpMoNaM6E0JwU8JGHDuLmeAIzMyl4Xjdc6zwhxMZA7/1886ZEMhYZVDs7e6Itzar0
-R/+5hlLpfwGQ+PbtO/V16y4Wr12bv8mYeMowlHngmHsbQGQsrOv6ukgwGGzt7aUqY1j8q7/Cu4xB
-AOABLiitOory7mSlsrZt67advl07O/piQbo8nyPlzAiIvx0YCKHumajlapzlDF5ZWOGerBOPpMib
-750lDx/q4A98NEj+9puN0PUueF4Bopige/cc8B+8L8Dz+bg2NBTVXnqJ0JdfPgVgDun0Xvuuuwql
-CxcuZmo1/rbnae+vrr5W/6mHjJpm0LGseLihQQwmEgSzs5i7eBFV3CrOBQCiqq6UdP2fN2zadHPD
-nl18amys6aFDD0j/6bOPkfSfDOOdkybMSR+U9iByySAvd1h6XTR1jxBu6K44Nr/ou3z1tHTwYKMw
-PtpJX3+9Fa5rgjGFVqsDgcFBQZMkUZiakuhTT83Ccd6AJHW4W7eq1bGxl/LZbOU9TQu+K0mZtZ/M
-nCIASIRQ7nmSJElEkGVgagq1SgUgBALnCIoiX+LcXnGc4m8/+GC2UK/nWaHoBjwPffccQEvoKLJX
-RjBSqCE8q6EeDnBLcmqe6s6Y1K5btC7WqRs6V7qS2pDu037rkYR/aSki3riRJvG4Sl5/XRHjcQnR
-KMFzz+mYmHgJgMN7e/uNev1ccWZmepJz5S3XlWYmJq7bHwBwOGcUsEzL4o7jAJaFACFQATBC0CgI
-5IJhxPu7u7dzVY1UZ2f7UooihXw+BAMhtLoeWqt1TNgMfSBciMU9XXdXOMNLBthNR3Q9OSJG63W+
-48zZ93Y8+rsbmj7/+VDsS19Kin6/jVLJxNNPO7cOK94BMI5I5G4WjxfK4+MXV2ybnxYE/9Xp6T1V
-4AQ+AOCpalWSpGypVnPKlYroKgpplGW06TomRBFZ16XtDQ3xvrvuenh6crKi2HbL3QMDUmJggJK1
-NbiZDEQAgmUjrJukkYtYYNSIBgJX5AR92yybTmNDlz9sBVcmbmSjo6OT/k99qjV47VpA/Mu/dEBp
-BUARQB3AOIAWHg63W5nMD6uVSnFCUbTzsuxkgQ+qeBQA5FCopGnazWqtVpqenvZ0ShHQNGwCsFkU
-MeTz0S///u+rD3zyk213t7Zu/Ni+fbE9n/60HOnsBL7/fRQWFnBLleKQOYfsuiC2Q+Wa46bKKWPu
-5Jx5T1dXNaQFSszx9OvXdbdc5t7u3QSKIoKxMgAJgAxAAKUeVlbybi5XZZ7nlnVdLM/NJZ3/2/nb
-EdB1vR4JhUbKtj12cWQk3hWN0jrnNCuKGFAUxGwb20slQdm0ibJkEkIwSATTBPvKV1D88z/HnOfB
-uZVuIQLwGANsm0MQbi9ULMrRSmVlQNMCLara4VtbkyVdp/A8D4AOQIKmdcG2F8H5W8S2RyTG4qok
-qW2UOp2xWHWh8DMkFxEAjhw54v3JE0+MJZqaji9NT7f/3dhYx7JpIiuKtLdeh8k5Xvubv0HqX/6F
-uIEAqroOvrKCe2s1bFMUCLj1D+QAOOdgpslh24wBTADw5JNf9ReL2fWmWdvX17e/uadnXbi1VZG+
-/GXAsm4AuAxARDAoIRK5G+Pji1CUUYUxX9i2WzoEYW6v42AeOHwDOPbBSwwAdjSaC4XDr+r5fOPx
-yclPrBaLTSFAjADCkM9HCpxjZXIStiTxNcfxcgAOPvywkPL7wY4dg1urgdwC4Ea9zsGYTinVN2/2
-CZZVa83ns/cmEh0Dvb17Yjt2RPxvvimQF1+8CuCHIKQKQvzI5z3Y9kEQsgGuqwuyPBWy7WSCsfw2
-zo0poLgGYBk/8W++HeOTJ0/yhw4dcoii2P5o1AcgVjdNZdqyvDHGuEeIGw0EvJVAgF3UdXvfxz7m
-/cZXviKEtm8n1okTeCWXgw6gSxAwBdgVxxnRBOH15KYH3bW13L0AfWDjxgdb77lnQ8Ln88l/8Adr
-ZGnp7wFUeTT6Ibe1dZ1bLs+iXm+gQASACErXqCAYguvKBMjKgLMMtGeBhdtRuB2BJ5980p9bXu43
-Gbtbjccbe7Zv5x0bNzLJtvnl06edV1dXueI4VQ8oDWzaFGrbty/uzM2BNjejJAjIAQgAcF3XKxuG
-JRCSCaZSlmGwfsPQ9/f03NPa378p1t/vU770JU6uXTsOYBXA3U61misbxoilqrFAKtURXFmRBdu2
-wFg/leULfkkKRG070Qcs7Qd8GeDw2E+VEgDgo7S5Xi5/tFwuf9wfCLSsa2sTm7q6aKK5Gft/7de8
-b/7pnzrLul7btH37WrixMRi3LDFICIFh4MriIkoANgDIMcZrnleUZXk6uX4wVK5k700k0ht6eu6J
-7doV9b/xhkC/9a3LAM4DaHeBtTJjx5cZG7e2bfu90Cc+4dLvfU8NvvtuinheDYzlBEG4GaI0lfC8
-te1AbRoYy/2Y/v8AeITEq/X6Rk2WWz+6a5cysG2bEOzuJqIkoRiN8tgjjwjnTLOlVK83tCuKbyid
-Fht27yaFp5/Gy4UCBAAhwBvnnDmuO51MNi0zRdnIDbqzu3tfw549bWHGZOHIkRJ0/VUAKgcUA3it
-AEzPAXYmnV7s27lz0ieKm9SFhai8tNQI1+0FpSVFkpyobdfTnF+9F/BmgLurwCX9NoAkiiYIsURV
-5YnBQdLc2Ejo8eMwz52D//Rpsm/fPrn/s58VSzduaClKSfuBA9Q8fhzPPvssbgLoAHgW8OaAgs/n
-u9Bw9zZSqjp7enp2tH3kI1ujTU1+9bHHKuTy5WMgZAWcr3OAkTIwvgp4b2labMzz9IPvvHMmsnt3
-s7ZlS1NsacmmnOdh261EUdo1SuWo6872A2v7AZ4BDt+8DRCQpEwgHL5Yse1t53/0o9aZU6f4+KlT
-JGfe6jlsn57GnliMpgYH4do2LgwP47lnn8XpWg0xABTwrgGGQ8j5dEfHlaqgdUaC0f6Pf3x3mDFF
-e+SRt8nLL78FYBWcd7jAQhW4XACMq4DydmOjPJ9IxOWzZ8c7NG3ED1RVUXzZ73lF0tLy6zCMtJDP
-XwkAzVGgsBWwrgKXMrcB2jdsyFszM2/o16/3fefrX39oNZOJUEBIE0J2+P34wdoafvCHf4i4pqFs
-25hlDCaA8K2U5r0PGHXgfEgR/ymxfmvGEun25uawduLETf7Xf/09c2FhnAEaAdIuMG8CF/LA2jQg
-ngScqba2eEWSGq6oaub0iRMnEufPvyh5nsEikQ/LlDJSKr3COc/Yt1Q0IQKwNOD4bwM8/PDD7tGj
-R6+fPnv2H95fWoIN3O8HGv2AVCeEbG5rI3XGwLJZzDPGPQASwMsAKwF5BpxVgeelePJ0cl1nOJfL
-rr3wwpvF0dHvioCnAxEK+AFMeEDeAOqLAHkNwCVgsXzy5KK7detDq8mkc/If//F4LJdb2E3p5kSl
-ckIuFFYIYAJwXaBqAGYOEEoA5z+rRxYIAespcD+AvRzoIUAkAqgRUaSEc5iu61qAZQMlD5gWgdMU
-eJMDV4cOH66mUt2xF154a2BxcWwLILYCsgpwAjj8lhNSERDHAbwHSPPAnIlbjyDZseO3gufP/6gX
-iGwFxA6gGAAovVWoEBdAHaDTgHAJMG/+zCbfvYA4BsQZ0MGBLgBpD4g4gEIBIgGmCBQJsCQB0zIw
-OwPkAfyr1ikA8APpIKCqgEEB68drqR7ATUCsAXO1nxjzE9auAh0BYCVwS/qRfqzO2RwQGCDogFkF
-lv+/27O/sl/Zj+1/A3SW42Q2L0q5AAAAAElFTkSuQmCC
-"
-       height="48"
-       width="48" />
-  </g>
-</svg>
diff --git a/companion/src/images/9CX.png b/companion/src/images/9CX.png
deleted file mode 100644
index 3c1b8e453..000000000
Binary files a/companion/src/images/9CX.png and /dev/null differ
diff --git a/companion/src/images/9xdb-bl.png b/companion/src/images/9xdb-bl.png
index 654e2d5ae..ba1dfbd4c 100644
Binary files a/companion/src/images/9xdb-bl.png and b/companion/src/images/9xdb-bl.png differ
diff --git a/companion/src/images/9xdb-gr.png b/companion/src/images/9xdb-gr.png
index e474dc0dd..89778a54f 100644
Binary files a/companion/src/images/9xdb-gr.png and b/companion/src/images/9xdb-gr.png differ
diff --git a/companion/src/images/9xdb-or.png b/companion/src/images/9xdb-or.png
index 20bc45640..c61b410ab 100644
Binary files a/companion/src/images/9xdb-or.png and b/companion/src/images/9xdb-or.png differ
diff --git a/companion/src/images/9xdb-rd.png b/companion/src/images/9xdb-rd.png
index ace3657d4..2d18d84af 100644
Binary files a/companion/src/images/9xdb-rd.png and b/companion/src/images/9xdb-rd.png differ
diff --git a/companion/src/images/9xdb-yl.png b/companion/src/images/9xdb-yl.png
index e1e9f1e6a..158f1e94e 100644
Binary files a/companion/src/images/9xdb-yl.png and b/companion/src/images/9xdb-yl.png differ
diff --git a/companion/src/images/9xdb.png b/companion/src/images/9xdb.png
index 602bc9955..e6198c2a7 100644
Binary files a/companion/src/images/9xdb.png and b/companion/src/images/9xdb.png differ
diff --git a/companion/src/images/companion-title.png b/companion/src/images/companion-title.png
new file mode 100644
index 000000000..cbaa0d13b
Binary files /dev/null and b/companion/src/images/companion-title.png differ
diff --git a/companion/src/images/companion9x-title.png b/companion/src/images/companion9x-title.png
deleted file mode 100644
index 358bc8826..000000000
Binary files a/companion/src/images/companion9x-title.png and /dev/null differ
diff --git a/companion/src/images/customize.png b/companion/src/images/customize.png
index 96259b922..078d0af75 100644
Binary files a/companion/src/images/customize.png and b/companion/src/images/customize.png differ
diff --git a/companion/src/images/iconmac.icns b/companion/src/images/iconmac.icns
index 3c26785d6..0e20c9fe3 100644
Binary files a/companion/src/images/iconmac.icns and b/companion/src/images/iconmac.icns differ
diff --git a/companion/src/images/linuxicons/128x128/companion.png b/companion/src/images/linuxicons/128x128/companion.png
new file mode 100644
index 000000000..6f1616ca2
Binary files /dev/null and b/companion/src/images/linuxicons/128x128/companion.png differ
diff --git a/companion/src/images/linuxicons/256x256/companion.png b/companion/src/images/linuxicons/256x256/companion.png
new file mode 100644
index 000000000..684517666
Binary files /dev/null and b/companion/src/images/linuxicons/256x256/companion.png differ
diff --git a/companion/src/images/linuxicons/32x32/companion.png b/companion/src/images/linuxicons/32x32/companion.png
new file mode 100644
index 000000000..df79707a5
Binary files /dev/null and b/companion/src/images/linuxicons/32x32/companion.png differ
diff --git a/companion/src/images/linuxicons/48x48/companion.png b/companion/src/images/linuxicons/48x48/companion.png
new file mode 100644
index 000000000..99357930d
Binary files /dev/null and b/companion/src/images/linuxicons/48x48/companion.png differ
diff --git a/companion/src/images/linuxicons/512x512/companion.png b/companion/src/images/linuxicons/512x512/companion.png
new file mode 100644
index 000000000..7e9078b2e
Binary files /dev/null and b/companion/src/images/linuxicons/512x512/companion.png differ
diff --git a/companion/src/images/linuxicons/scalable/companion.svg b/companion/src/images/linuxicons/scalable/companion.svg
new file mode 100644
index 000000000..40a99a3b0
--- /dev/null
+++ b/companion/src/images/linuxicons/scalable/companion.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.2" width="190mm" height="190mm" viewBox="0 0 19000 19000" preserveAspectRatio="xMidYMid" fill-rule="evenodd" clip-path="url(#presentation_clip_path)" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
+ <defs class="ClipPathGroup">
+  <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+   <rect x="0" y="0" width="19000" height="19000"/>
+  </clipPath>
+ </defs>
+ <defs class="TextShapeIndex">
+  <g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"/>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+  <g id="bullet-char-template(57356)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+  </g>
+  <g id="bullet-char-template(57354)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+  </g>
+  <g id="bullet-char-template(10146)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
+  </g>
+  <g id="bullet-char-template(10132)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
+  </g>
+  <g id="bullet-char-template(10007)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
+  </g>
+  <g id="bullet-char-template(10004)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
+  </g>
+  <g id="bullet-char-template(9679)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+  </g>
+  <g id="bullet-char-template(8226)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+  </g>
+  <g id="bullet-char-template(8211)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+  </g>
+ </defs>
+ <defs class="TextEmbeddedBitmaps"/>
+ <g>
+  <g id="id2" class="Master_Slide">
+   <g id="bg-id2" class="Background"/>
+   <g id="bo-id2" class="BackgroundObjects"/>
+  </g>
+ </g>
+ <g class="SlideGroup">
+  <g>
+   <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+    <g class="Page">
+     <g class="Group">
+      <g class="com.sun.star.drawing.CustomShape">
+       <g id="id3">
+        <path fill="rgb(0,0,0)" stroke="none" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.PolyPolygonShape">
+       <g id="id4">
+        <path fill="rgb(255,255,255)" stroke="none" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
+        <path fill="none" stroke="rgb(255,255,255)" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
+        <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="3228" y="10021"><tspan fill="rgb(0,0,0)" stroke="none">                </tspan></tspan></tspan></text>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.PolyPolygonShape">
+       <g id="id5">
+        <path fill="rgb(51,102,51)" stroke="none" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
+        <path fill="none" stroke="rgb(51,102,51)" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.TextShape">
+       <g id="id6">
+        <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="2540px" font-weight="700"><tspan class="TextPosition" x="1201" y="17891"><tspan fill="rgb(255,255,255)" stroke="none">COMPANION</tspan></tspan></tspan></text>
+       </g>
+      </g>
+      <g class="Group">
+       <g class="com.sun.star.drawing.TextShape">
+        <g id="id7">
+         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="1391" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">O</tspan></tspan></tspan></text>
+        </g>
+       </g>
+       <g class="com.sun.star.drawing.TextShape">
+        <g id="id8">
+         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="6282" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">P</tspan></tspan></tspan></text>
+        </g>
+       </g>
+       <g class="com.sun.star.drawing.TextShape">
+        <g id="id9">
+         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="10696" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">E</tspan></tspan></tspan></text>
+        </g>
+       </g>
+       <g class="com.sun.star.drawing.TextShape">
+        <g id="id10">
+         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="14950" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">N</tspan></tspan></tspan></text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/companion/src/images/originals/9CX.xcf b/companion/src/images/originals/9CX.xcf
new file mode 100644
index 000000000..167a1ad10
Binary files /dev/null and b/companion/src/images/originals/9CX.xcf differ
diff --git a/companion/src/images/originals/9xdb-bl.xcf b/companion/src/images/originals/9xdb-bl.xcf
new file mode 100644
index 000000000..8b09f5c82
Binary files /dev/null and b/companion/src/images/originals/9xdb-bl.xcf differ
diff --git a/companion/src/images/originals/9xdb-gr.xcf b/companion/src/images/originals/9xdb-gr.xcf
new file mode 100644
index 000000000..416ea3f50
Binary files /dev/null and b/companion/src/images/originals/9xdb-gr.xcf differ
diff --git a/companion/src/images/originals/9xdb-or.xcf b/companion/src/images/originals/9xdb-or.xcf
new file mode 100644
index 000000000..0bbe3113b
Binary files /dev/null and b/companion/src/images/originals/9xdb-or.xcf differ
diff --git a/companion/src/images/originals/9xdb-rd.xcf b/companion/src/images/originals/9xdb-rd.xcf
new file mode 100644
index 000000000..b1a389465
Binary files /dev/null and b/companion/src/images/originals/9xdb-rd.xcf differ
diff --git a/companion/src/images/originals/9xdb-yl.xcf b/companion/src/images/originals/9xdb-yl.xcf
new file mode 100644
index 000000000..6fc4e7883
Binary files /dev/null and b/companion/src/images/originals/9xdb-yl.xcf differ
diff --git a/companion/src/images/originals/9xdb.xcf b/companion/src/images/originals/9xdb.xcf
new file mode 100644
index 000000000..d0ed54593
Binary files /dev/null and b/companion/src/images/originals/9xdb.xcf differ
diff --git a/companion/src/images/originals/companion9x-title.xcf b/companion/src/images/originals/companion9x-title.xcf
new file mode 100644
index 000000000..808d8f4bc
Binary files /dev/null and b/companion/src/images/originals/companion9x-title.xcf differ
diff --git a/companion/src/images/originals/customize.xcf b/companion/src/images/originals/customize.xcf
new file mode 100644
index 000000000..d5ef01df8
Binary files /dev/null and b/companion/src/images/originals/customize.xcf differ
diff --git a/companion/src/images/originals/splash.xcf b/companion/src/images/originals/splash.xcf
new file mode 100644
index 000000000..4130570dd
Binary files /dev/null and b/companion/src/images/originals/splash.xcf differ
diff --git a/companion/src/images/originals/splasht.xcf b/companion/src/images/originals/splasht.xcf
new file mode 100644
index 000000000..66466d2cc
Binary files /dev/null and b/companion/src/images/originals/splasht.xcf differ
diff --git a/companion/src/images/originals/vector-logo.odg b/companion/src/images/originals/vector-logo.odg
new file mode 100644
index 000000000..a4c4278c8
Binary files /dev/null and b/companion/src/images/originals/vector-logo.odg differ
diff --git a/companion/src/images/originals/vector-logo.svg b/companion/src/images/originals/vector-logo.svg
new file mode 100644
index 000000000..40a99a3b0
--- /dev/null
+++ b/companion/src/images/originals/vector-logo.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.2" width="190mm" height="190mm" viewBox="0 0 19000 19000" preserveAspectRatio="xMidYMid" fill-rule="evenodd" clip-path="url(#presentation_clip_path)" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
+ <defs class="ClipPathGroup">
+  <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+   <rect x="0" y="0" width="19000" height="19000"/>
+  </clipPath>
+ </defs>
+ <defs class="TextShapeIndex">
+  <g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"/>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+  <g id="bullet-char-template(57356)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+  </g>
+  <g id="bullet-char-template(57354)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+  </g>
+  <g id="bullet-char-template(10146)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
+  </g>
+  <g id="bullet-char-template(10132)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
+  </g>
+  <g id="bullet-char-template(10007)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
+  </g>
+  <g id="bullet-char-template(10004)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
+  </g>
+  <g id="bullet-char-template(9679)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+  </g>
+  <g id="bullet-char-template(8226)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+  </g>
+  <g id="bullet-char-template(8211)" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+  </g>
+ </defs>
+ <defs class="TextEmbeddedBitmaps"/>
+ <g>
+  <g id="id2" class="Master_Slide">
+   <g id="bg-id2" class="Background"/>
+   <g id="bo-id2" class="BackgroundObjects"/>
+  </g>
+ </g>
+ <g class="SlideGroup">
+  <g>
+   <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+    <g class="Page">
+     <g class="Group">
+      <g class="com.sun.star.drawing.CustomShape">
+       <g id="id3">
+        <path fill="rgb(0,0,0)" stroke="none" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.PolyPolygonShape">
+       <g id="id4">
+        <path fill="rgb(255,255,255)" stroke="none" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
+        <path fill="none" stroke="rgb(255,255,255)" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
+        <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="3228" y="10021"><tspan fill="rgb(0,0,0)" stroke="none">                </tspan></tspan></tspan></text>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.PolyPolygonShape">
+       <g id="id5">
+        <path fill="rgb(51,102,51)" stroke="none" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
+        <path fill="none" stroke="rgb(51,102,51)" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.TextShape">
+       <g id="id6">
+        <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="2540px" font-weight="700"><tspan class="TextPosition" x="1201" y="17891"><tspan fill="rgb(255,255,255)" stroke="none">COMPANION</tspan></tspan></tspan></text>
+       </g>
+      </g>
+      <g class="Group">
+       <g class="com.sun.star.drawing.TextShape">
+        <g id="id7">
+         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="1391" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">O</tspan></tspan></tspan></text>
+        </g>
+       </g>
+       <g class="com.sun.star.drawing.TextShape">
+        <g id="id8">
+         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="6282" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">P</tspan></tspan></tspan></text>
+        </g>
+       </g>
+       <g class="com.sun.star.drawing.TextShape">
+        <g id="id9">
+         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="10696" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">E</tspan></tspan></tspan></text>
+        </g>
+       </g>
+       <g class="com.sun.star.drawing.TextShape">
+        <g id="id10">
+         <text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="14950" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">N</tspan></tspan></tspan></text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/companion/src/images/originals/windows-icon.xcf b/companion/src/images/originals/windows-icon.xcf
new file mode 100644
index 000000000..7cf9bcf71
Binary files /dev/null and b/companion/src/images/originals/windows-icon.xcf differ
diff --git a/companion/src/images/splash-2012.png b/companion/src/images/splash-2012.png
deleted file mode 100644
index f5afdbafa..000000000
Binary files a/companion/src/images/splash-2012.png and /dev/null differ
diff --git a/companion/src/images/splash-2013.png b/companion/src/images/splash-2013.png
deleted file mode 100644
index 0afa87174..000000000
Binary files a/companion/src/images/splash-2013.png and /dev/null differ
diff --git a/companion/src/images/splash-ambroise.png b/companion/src/images/splash-ambroise.png
deleted file mode 100644
index e7df433b5..000000000
Binary files a/companion/src/images/splash-ambroise.png and /dev/null differ
diff --git a/companion/src/images/splash-hb.png b/companion/src/images/splash-hb.png
deleted file mode 100644
index aadacc645..000000000
Binary files a/companion/src/images/splash-hb.png and /dev/null differ
diff --git a/companion/src/images/splash-old.png b/companion/src/images/splash-old.png
deleted file mode 100644
index 44a0bab1c..000000000
Binary files a/companion/src/images/splash-old.png and /dev/null differ
diff --git a/companion/src/images/splash.png b/companion/src/images/splash.png
index 601c590d9..8c55b1551 100644
Binary files a/companion/src/images/splash.png and b/companion/src/images/splash.png differ
diff --git a/companion/src/images/splasht.png b/companion/src/images/splasht.png
index 96f1eb7ce..25cdc0871 100644
Binary files a/companion/src/images/splasht.png and b/companion/src/images/splasht.png differ
diff --git a/companion/src/logsdialog.cpp b/companion/src/logsdialog.cpp
index 4334da516..e1b415ce9 100644
--- a/companion/src/logsdialog.cpp
+++ b/companion/src/logsdialog.cpp
@@ -687,7 +687,7 @@ bool logsDialog::cvsFileParse()
   
   file.close();
   if (errors>1) {
-    QMessageBox::warning(this, "companion9x", tr("The selected logfile contains %1 invalid lines out of  %2 total lines").arg(errors).arg(lines));
+    QMessageBox::warning(this, "Companion", tr("The selected logfile contains %1 invalid lines out of  %2 total lines").arg(errors).arg(lines));
   }
   plotLock=true;
   int n=csvlog.count();
diff --git a/companion/src/logsdialog.ui b/companion/src/logsdialog.ui
index deee92d6b..4d0c91939 100644
--- a/companion/src/logsdialog.ui
+++ b/companion/src/logsdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Companion9x log viewer</string>
+   <string>Companion Log Viewer</string>
   </property>
   <property name="windowIcon">
    <iconset resource="companion9x.qrc">
diff --git a/companion/src/main.cpp b/companion/src/main.cpp
index 04a20ec84..65d4a861e 100644
--- a/companion/src/main.cpp
+++ b/companion/src/main.cpp
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
 
     Q_INIT_RESOURCE(companion9x);
     QApplication app(argc, argv);
-    app.setApplicationName("Companion9x");
+    app.setApplicationName("OpenTX Companion");
 #ifdef __APPLE__
     app.setStyle(new MyProxyStyle);
 #endif
@@ -100,13 +100,13 @@ int main(int argc, char *argv[])
     QString locale = settings.value("locale",QLocale::system().name()).toString();
     bool showSplash = settings.value("show_splash", true).toBool();
 
-    QTranslator companion9xTranslator;
-    companion9xTranslator.load(":/companion9x_" + locale);
+    QTranslator companionTranslator;
+    companionTranslator.load(":/companion_" + locale);
     QTranslator qtTranslator;
     qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 //    qDebug() << locale;
 //    qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));    
-    app.installTranslator(&companion9xTranslator);
+    app.installTranslator(&companionTranslator);
     app.installTranslator(&qtTranslator);
 
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 058218ec7..5b0d0bd64 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -59,7 +59,7 @@
 #include "burndialog.h"
 #include "hexinterface.h"
 #include "warnings.h"
-#include "firmwares/opentx/open9xinterface.h" // TODO get rid of this include
+#include "firmwares/opentx/opentxinterface.h" // TODO get rid of this include
 
 #define DONATE_STR "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2"
 #ifdef __APPLE__
@@ -103,9 +103,9 @@ downloadDialog_forWait(NULL)
     readSettings();
     FirmwareInfo *firmware = GetCurrentFirmware();
     if (ActiveProfile) {
-      setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
+      setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
     } else {
-      setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name));
+      setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
     }
     setUnifiedTitleAndToolBarOnMac(true);
     this->setWindowIcon(QIcon(":/icon.png"));
@@ -172,11 +172,11 @@ void MainWindow::displayWarnings()
   if (warnId<WARNING_ID && warnId!=0) {
     int res=0;
     if (WARNING_LEVEL>0) {
-      QMessageBox::warning(this, "companion9x", WARNING);
-      res = QMessageBox::question(this, "companion9x",tr("Display previous warning again at startup ?"),QMessageBox::Yes | QMessageBox::No);
+      QMessageBox::warning(this, "Companion", WARNING);
+      res = QMessageBox::question(this, "Companion",tr("Display previous warning again at startup ?"),QMessageBox::Yes | QMessageBox::No);
     } else {
-      QMessageBox::about(this, "companion9x", WARNING);
-      res = QMessageBox::question(this, "companion9x",tr("Display previous message again at startup ?"),QMessageBox::Yes | QMessageBox::No);
+      QMessageBox::about(this, "Companion", WARNING);
+      res = QMessageBox::question(this, "Companion",tr("Display previous message again at startup ?"),QMessageBox::Yes | QMessageBox::No);
     }
     if (res == QMessageBox::No) {
       settings.setValue("warningId", WARNING_ID);
@@ -249,7 +249,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
       QString version = qba.mid(i+14, 4);
 
       if (version.isNull()) {
-          QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
+          QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
           return;
       }
       double vnum=version.toDouble();
@@ -263,7 +263,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
       if (c9xver< vnum) {
 #if defined WIN32 || !defined __GNUC__ // || defined __APPLE__  // OSX should only notify of updates since no update packages are available. 
         showcheckForUpdatesResult = false; // update is available - do not show dialog
-        int ret = QMessageBox::question(this, "companion9x", tr("A new version of companion9x is available (version %1)<br>"
+        int ret = QMessageBox::question(this, "Companion", tr("A new version of Companion is available (version %1)<br>"
                                                             "Would you like to download it?").arg(version) ,
                                         QMessageBox::Yes | QMessageBox::No);
 
@@ -284,21 +284,21 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
           }
         }
 #else
-        QMessageBox::warning(this, tr("New release available"), tr("A new release of companion is available please check the repository"));
+        QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available please check the repository"));
 #endif            
       } else {
         if (showcheckForUpdatesResult && check1done && check2done)
-          QMessageBox::information(this, "companion9x", tr("No updates available at this time."));
+          QMessageBox::information(this, "Companion", tr("No updates available at this time."));
       }
     } else {
       if(check1done && check2done)
-        QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
+        QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
     }
 }
 
 void MainWindow::updateDownloaded()
 {
-    int ret = QMessageBox::question(this, "companion9x", tr("Would you like to launch the installer?") ,
+    int ret = QMessageBox::question(this, "Companion", tr("Would you like to launch the installer?") ,
                                      QMessageBox::Yes | QMessageBox::No);
     if (ret == QMessageBox::Yes) {
       if(QDesktopServices::openUrl(QUrl::fromLocalFile(installer_fileName)))
@@ -362,7 +362,7 @@ void MainWindow::reply1Accepted()
               errormsg=tr("Compilation server too busy, try later");
               break;
             case 4:
-              errormsg=tr("Compilation server requires registration, please check opentx web site");
+              errormsg=tr("Compilation server requires registration, please check OpenTX web site");
               break;
             default:
               errormsg=tr("Unknown server failure, try later");
@@ -402,7 +402,7 @@ void MainWindow::reply1Accepted()
             errormsg=tr("Compilation server too busy, try later");
             break;
           case 4:
-            errormsg=tr("Compilation server requires registration, please check opentx web site");
+            errormsg=tr("Compilation server requires registration, please check OpenTX web site");
             break;
           default:
             errormsg=tr("Unknown server failure, try later");
@@ -433,7 +433,7 @@ void MainWindow::reply1Accepted()
         }
         settings.setValue(downloadedFW, currentFWrev);
         if (autoflash) {
-          int ret = QMessageBox::question(this, "companion9x", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No);
+          int ret = QMessageBox::question(this, "Companion", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No);
           if (ret == QMessageBox::Yes) {
             burnToFlash(downloadedFWFilename);
           }
@@ -470,7 +470,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
       QString newrev=qba.mid(k).replace('"', "").trimmed();
 
       if(!cres) {
-        QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
+        QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
         int server = settings.value("fwserver",0).toInt();
         server++;
         settings.setValue("fwserver",server);
@@ -490,6 +490,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
           showcheckForUpdatesResult = false; // update is available - do not show dialog
           QString rn = GetFirmware(fwToUpdate)->rnurl;
           QAbstractButton *rnButton;
+          msgBox.setWindowTitle("Companion");
           msgBox.setInformativeText(tr("Firmware %1 does not seem to have ever been downloaded.\nVersion %2 is available.\nDo you want to download it now ?").arg(fwToUpdate).arg(NewFwRev));
           QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole);
           msgBox.addButton(trUtf8("No"), QMessageBox::NoRole);
@@ -502,7 +503,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
           if( msgBox.clickedButton() == rnButton ) {
             contributorsDialog *cd = new contributorsDialog(this,2,rn);
             cd->exec();
-            int ret2 = QMessageBox::question(this, "companion9x", tr("Do you want to download release %1 now ?").arg(NewFwRev),
+            int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 now ?").arg(NewFwRev),
                   QMessageBox::Yes | QMessageBox::No);
             if (ret2 == QMessageBox::Yes) {
               download = true;
@@ -518,7 +519,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
           showcheckForUpdatesResult = false; // update is available - do not show dialog
           QString rn = GetFirmware(fwToUpdate)->rnurl;
           QAbstractButton *rnButton;
-          msgBox.setText("companion9x");
+          msgBox.setText("Companion");
           msgBox.setInformativeText(tr("A new version of %1 firmware is available (current %2 - newer %3).\nDo you want to download it now ?").arg(fwToUpdate).arg(OldFwRev).arg(NewFwRev));
           QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole);
           msgBox.addButton(trUtf8("No"), QMessageBox::NoRole);
@@ -532,7 +533,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
             warning=0;
             contributorsDialog *cd = new contributorsDialog(this,2,rn);
             cd->exec();
-            int ret2 = QMessageBox::question(this, "companion9x", tr("Do you want to download release %1 now ?").arg(NewFwRev),
+            int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 now ?").arg(NewFwRev),
                   QMessageBox::Yes | QMessageBox::No);
             if (ret2 == QMessageBox::Yes) {
               download = true;
@@ -546,10 +547,10 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
           }
         } else {
           if(showcheckForUpdatesResult && check1done && check2done)
-            QMessageBox::information(this, "companion9x", tr("No updates available at this time."));
+            QMessageBox::information(this, "Companion", tr("No updates available at this time."));
         }
         if (ignore) {
-          int res = QMessageBox::question(this, "companion9x",tr("Ignore this version (r%1)?").arg(rev), QMessageBox::Yes | QMessageBox::No);
+          int res = QMessageBox::question(this, "Companion",tr("Ignore this version (r%1)?").arg(rev), QMessageBox::Yes | QMessageBox::No);
           if (res==QMessageBox::Yes)   {
             settings.beginGroup("FwRevisions");
             settings.setValue(fwToUpdate, NewFwRev);
@@ -559,7 +560,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
           if (warning>0) {
             QString rn = GetFirmware(fwToUpdate)->rnurl;
             if (!rn.isEmpty()) {
-              int ret2 = QMessageBox::warning(this, "companion9x", tr("Release notes contain very important informations. Do you want to see them now ?"), QMessageBox::Yes | QMessageBox::No);
+              int ret2 = QMessageBox::warning(this, "Companion", tr("Release notes contain very important informations. Do you want to see them now ?"), QMessageBox::Yes | QMessageBox::No);
               if (ret2 == QMessageBox::Yes) {
                 contributorsDialog *cd = new contributorsDialog(this,2,rn);
                 cd->exec();
@@ -592,11 +593,11 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
           }
         }
       } else {
-        QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
+        QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
       }
     } else {
       if(check1done && check2done) {
-        QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
+        QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
         int server = settings.value("fwserver",0).toInt();
         server++;
         settings.setValue("fwserver",server);
@@ -718,13 +719,13 @@ void MainWindow::loadProfile()
       settings.setValue("profileId", profnum);
       current_firmware_variant = GetFirmwareVariant(firmware_id);
       FirmwareInfo *firmware = GetCurrentFirmware();    
-      setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name));
+      setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
       // settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath());
       foreach (QMdiSubWindow *window, mdiArea->subWindowList()) {
         MdiChild *mdiChild = qobject_cast<MdiChild *>(window->widget());
         mdiChild->eepromInterfaceChanged();
       }
-      setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
+      setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
     }
 }
 
@@ -735,7 +736,7 @@ void MainWindow::unloadProfile()
     QSettings settings("companion9x", "companion9x");
     settings.setValue("ActiveProfile",0);
     FirmwareInfo *firmware = GetCurrentFirmware();    
-    setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name));
+    setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
 }
 
 void MainWindow::preferences()
@@ -744,9 +745,9 @@ void MainWindow::preferences()
     pd->exec();
     FirmwareInfo *firmware = GetCurrentFirmware();    
     if (ActiveProfile) {
-      setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
+      setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
     } else {
-      setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name));
+      setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
     }
 
     foreach (QMdiSubWindow *window, mdiArea->subWindowList()) {
@@ -1082,10 +1083,10 @@ void MainWindow::burnExtenalToEEPROM()
     cd->exec();
     if (!fileName.isEmpty()) {
       settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath());
-      int ret = QMessageBox::question(this, "companion9x", tr("Write Models and settings from %1 to the Tx?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
+      int ret = QMessageBox::question(this, "Companion", tr("Write Models and settings from %1 to the Tx?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
       if (ret != QMessageBox::Yes) return;
       if (!isValidEEPROM(fileName))
-        ret = QMessageBox::question(this, "companion9x", tr("The file %1\nhas not been recognized as a valid Models and Settings file\nWrite anyway ?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
+        ret = QMessageBox::question(this, "Companion", tr("The file %1\nhas not been recognized as a valid Models and Settings file\nWrite anyway ?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
       if (ret != QMessageBox::Yes) return;
       bool backupEnable = settings.value("backupEnable", true).toBool();
       QString backupPath = settings.value("backupPath", "").toString();
@@ -1489,15 +1490,16 @@ void MainWindow::logFile()
 
 void MainWindow::about()
 {
-    QString aboutStr = "<center><img src=\":/images/companion9x-title.png\"><br>";
-    aboutStr.append(tr("Copyright") +" Bertrand Songis & Romolo Manfredini &copy; 2011- 2013<br>");
-    aboutStr.append(QString("<a href='http://code.google.com/p/companion9x/'>http://code.google.com/p/companion9x/</a><br>")+tr("Version %1 (revision %2), %3").arg(C9X_VERSION).arg(C9X_REVISION).arg(__DATE__)+QString("<br/><br/>"));
-    aboutStr.append(tr("The companion9x project was originally forked from eePe")+QString(" <a href='http://code.google.com/p/eepe'>http://code.google.com/p/eepe</a><br/><br/>"));
+    QString aboutStr = "<center><img src=\":/images/companion-title.png\"></center><br>";
+    aboutStr.append("OpenTX Home Page: <a href='http://opentx.github.io'>http://open-tx.org</a><br><br>");
+    aboutStr.append(tr("The Companion project was originally forked from eePe")+QString(" <a href='http://code.google.com/p/eepe'>http://code.google.com/p/eepe</a><br/><br/>"));
     aboutStr.append(tr("If you've found this program useful, please support by"));
     aboutStr.append(" <a href='" DONATE_STR "'>");
-    aboutStr.append(tr("donating") + "</a></center>");
+    aboutStr.append(tr("donating") + "</a><br><br>");
+    aboutStr.append(tr("Version %1 (revision %2), %3").arg(C9X_VERSION).arg(C9X_REVISION).arg(__DATE__)+QString("<br/><br/>"));
+    aboutStr.append(tr("Copyright") +" Bertrand Songis & Romolo Manfredini &copy; 2011- 2014<br>");
 
-    QMessageBox::about(this, tr("About companion9x"),aboutStr);
+    QMessageBox::about(this, tr("About Companion"),aboutStr);
 }
 
 void MainWindow::updateMenus()
@@ -1624,15 +1626,15 @@ void MainWindow::createActions()
     connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences()));
 
     checkForUpdatesAct = new QAction(QIcon(":/images/update.png"), tr("&Check for updates..."), this);
-    checkForUpdatesAct->setStatusTip(tr("Check for new version of companion9x/er9x"));
+    checkForUpdatesAct->setStatusTip(tr("Check for new version of Companion"));
     connect(checkForUpdatesAct, SIGNAL(triggered()), this, SLOT(doUpdates()));
 
     contributorsAct = new QAction(QIcon(":/images/contributors.png"), tr("Contributors &List..."), this);
-    contributorsAct->setStatusTip(tr("Show companion9x contributors list"));
+    contributorsAct->setStatusTip(tr("Show Companion contributors list"));
     connect(contributorsAct, SIGNAL(triggered()), this, SLOT(contributors()));
 
     changelogAct = new QAction(QIcon(":/images/changelog.png"), tr("ChangeLog..."), this);
-    changelogAct->setStatusTip(tr("Show companion9x changelog"));
+    changelogAct->setStatusTip(tr("Show Companion changelog"));
     connect(changelogAct, SIGNAL(triggered()), this, SLOT(changelog()));
 
     fwchangelogAct = new QAction(QIcon(":/images/changelog.png"), tr("Firmware ChangeLog..."), this);
diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
index 6fbd16afa..3145cecff 100644
--- a/companion/src/mdichild.cpp
+++ b/companion/src/mdichild.cpp
@@ -44,7 +44,7 @@
 #include "xmlinterface.h"
 #include "hexinterface.h"
 #include "mainwindow.h"
-#include "modeledit.h"
+#include "modeledit/modeledit.h"
 #include "generaledit.h"
 #include "avroutputdialog.h"
 #include "burnconfigdialog.h"
@@ -144,13 +144,16 @@ void MdiChild::on_SimulateTxButton_clicked()
 {
   if (GetEepromInterface()->getSimulator()) {
     if (GetEepromInterface()->getCapability(SimulatorType)==1) {
-      xsimulatorDialog sd(this);
-      sd.loadParams(radioData);
-      sd.exec();
-    } else {
-      simulatorDialog sd(this);
-      sd.loadParams(radioData);
-      sd.exec();
+      xsimulatorDialog * sd = new xsimulatorDialog(this);
+      sd->loadParams(radioData);
+      sd->exec();
+      delete sd;
+    }
+    else {
+      simulatorDialog * sd = new simulatorDialog(this);
+      sd->loadParams(radioData);
+      sd->exec();
+      delete sd;
     }
   }
   else {
@@ -179,12 +182,12 @@ void MdiChild::OpenEditWindow(bool wizard=false)
       QSettings settings("companion9x", "companion9x");
       bool wizardEnable=settings.value("wizardEnable", true).toBool();
       if (wizardEnable) {
-        ret = QMessageBox::question(this, tr("companion9x"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No);
+        ret = QMessageBox::question(this, tr("Companion"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No);
         if (ret == QMessageBox::Yes) {
           wizard=true;
         } else {
           qSleep(500);
-          ret = QMessageBox::question(this, tr("companion9x"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No);
+          ret = QMessageBox::question(this, tr("Companion"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No);
           if (ret == QMessageBox::No) {
             settings.setValue("wizardEnable", false);
           }
@@ -192,9 +195,9 @@ void MdiChild::OpenEditWindow(bool wizard=false)
       }
     }
     ModelEdit *t = new ModelEdit(radioData, (row - 1), wizard, this);
-    if (isNew && !wizard) t->applyBaseTemplate();
+    // TODO if (isNew && !wizard) t->applyBaseTemplate();
     t->setWindowTitle(tr("Editing model %1: ").arg(row) + model.name);
-    connect(t, SIGNAL(modelValuesChanged()), this, SLOT(setModified()));
+    connect(t, SIGNAL(modified()), this, SLOT(setModified()));
     //t->exec();
     t->show();
   }
@@ -467,7 +470,7 @@ bool MdiChild::maybeSave()
 {
   if (fileChanged) {
     QMessageBox::StandardButton ret;
-    ret = QMessageBox::warning(this, tr("companion9x"),
+    ret = QMessageBox::warning(this, tr("Companion"),
         tr("%1 has been modified.\n"
            "Do you want to save your changes?").arg(userFriendlyCurrentFile()),
         QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
diff --git a/companion/src/modelconfigdialog.cpp b/companion/src/modelconfigdialog.cpp
index d9e245107..49c4a8df0 100644
--- a/companion/src/modelconfigdialog.cpp
+++ b/companion/src/modelconfigdialog.cpp
@@ -9,7 +9,7 @@ modelConfigDialog::modelConfigDialog(RadioData &radioData, uint64_t * result, QW
     ui(new Ui::modelConfigDialog),
     radioData(radioData),
     result(result),
-    g_eeGeneral(radioData.generalSettings)
+    generalSettings(radioData.generalSettings)
 {
     ui->setupUi(this);
     rxLock=false;
@@ -930,4 +930,4 @@ void modelConfigDialog::asUpdate()
     ui->asspo2_CB->hide();
   }
   rxLock=false;
-}
\ No newline at end of file
+}
diff --git a/companion/src/modelconfigdialog.h b/companion/src/modelconfigdialog.h
index e5418a8a5..f8f508c71 100644
--- a/companion/src/modelconfigdialog.h
+++ b/companion/src/modelconfigdialog.h
@@ -23,7 +23,7 @@ private:
     int ModelType;
     RadioData &radioData;
     uint64_t * result;
-    GeneralSettings g_eeGeneral;
+    GeneralSettings generalSettings;
     QStringList ruddercolor;
     QStringList aileroncolor;
     QStringList elevatorcolor;
diff --git a/companion/src/modeledit.cpp b/companion/src/modeledit.cpp
deleted file mode 100644
index b6b5aade1..000000000
--- a/companion/src/modeledit.cpp
+++ /dev/null
@@ -1,7433 +0,0 @@
-#include "modeledit.h"
-#include "ui_modeledit.h"
-#include "helpers.h"
-#include "edge.h"
-#include "node.h"
-#include "expodialog.h"
-#include "mixerdialog.h"
-#include "simulatordialog.h"
-#include "xsimulatordialog.h"
-#include "modelconfigdialog.h"
-#include <assert.h>
-#include <QtGui>
-#include <QApplication>
-
-#define BC_BIT_RUD (0x01)
-#define BC_BIT_ELE (0x02)
-#define BC_BIT_THR (0x04)
-#define BC_BIT_AIL (0x08)
-#define BC_BIT_P1  (0x10)
-#define BC_BIT_P2  (0x20)
-#define BC_BIT_P3  (0x40)
-#define BC_BIT_P4  (0x80)
-#define BC_BIT_REA  (0x80)
-#define BC_BIT_REB  (0x100)
-
-#define RUD  (1)
-#define ELE  (2)
-#define THR  (3)
-#define AIL  (4)
-
-#define GFX_MARGIN 16
-
-ModelEdit::ModelEdit(RadioData &radioData, uint8_t id, bool openWizard, bool isNew, QWidget *parent) :
-    QDialog(parent),
-    redrawCurve(true),
-    openWizard(openWizard),
-    isNew(isNew),
-    ui(new Ui::ModelEdit),
-    radioData(radioData),   
-    id_model(id),
-    g_model(radioData.models[id]),
-    g_eeGeneral(radioData.generalSettings)
-{
-    ui->setupUi(this);
-
-    setupMixerListWidget();
-    setupExposListWidget();
-
-    QSettings settings("companion9x", "companion9x");
-    ui->tabWidget->setCurrentIndex(settings.value("modelEditTab", 0).toInt());
-
-    QRegExp rx(CHAR_FOR_NAMES_REGEX);
-    ui->modelNameLE->setValidator(new QRegExpValidator(rx, this));
-    ui->phase0Name->setValidator(new QRegExpValidator(rx, this));
-    ui->phase1Name->setValidator(new QRegExpValidator(rx, this));
-    ui->phase2Name->setValidator(new QRegExpValidator(rx, this));
-    ui->phase3Name->setValidator(new QRegExpValidator(rx, this));
-    ui->phase4Name->setValidator(new QRegExpValidator(rx, this));
-    ui->phase5Name->setValidator(new QRegExpValidator(rx, this));
-    ui->phase6Name->setValidator(new QRegExpValidator(rx, this));
-    ui->phase7Name->setValidator(new QRegExpValidator(rx, this));
-    ui->phase8Name->setValidator(new QRegExpValidator(rx, this));
-    ui->cname_LE->setValidator(new QRegExpValidator(rx, this));
-  #ifdef PHONON
-    phononLock=false;
-    clickObject = new Phonon::MediaObject(this);
-    clickOutput = new Phonon::AudioOutput(Phonon::NoCategory, this);
-    Phonon::createPath(clickObject, clickOutput);
-    connect(clickObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)),  this, SLOT(mediaPlayer_state(Phonon::State,Phonon::State)));
-  #endif
-
-    tabModelEditSetup();
-    tabPhases();
-    tabExpos();
-    tabMixes();
-    tabLimits();
-    tabCurves();
-    tabCustomSwitches();
-    selectedSwitch=0;
-    int telTab=10;
-    int fswTab=9;
-
-    if (GetEepromInterface()->getCapability(FSSwitch)) {
-      ui->tabSafetySwitches->setDisabled(true);
-      ui->tabWidget->removeTab(8);
-      telTab--;
-      fswTab--;
-    } else {
-      tabSafetySwitches();
-    }
-
-    if (GetEepromInterface()->getCapability(CustomFunctions)==0 ) {
-      ui->tabCustomFunctions->setDisabled(true);
-      ui->tabWidget->removeTab(fswTab);
-      telTab--;
-    } else {
-      tabCustomFunctions();
-      selectedFunction=0;
-    }
-    tabTemplates();
-    tabHeli();
-    if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY) {
-      tabTelemetry();
-    } else {
-      ui->tabTelemetry->setDisabled(true);
-      ui->tabWidget->removeTab(telTab);
-    }
-    ui->tabWidget->setCurrentIndex(0);
-    ui->curvePreview->setMinimumWidth(240);
-    ui->curvePreview->setMinimumHeight(240);
-    resizeEvent();
-    QTimer::singleShot(0, this, SLOT(shrink()));
-    if (openWizard) {
-      QTimer::singleShot(1, this, SLOT(wizard()));
-    }
-}
-
-ModelEdit::~ModelEdit()
-{
-    delete ui;
-}
-
-
-float ModelEdit::getBarStep(int barId) 
-{
-    switch (barId-1) {
-      case TELEMETRY_SOURCE_TX_BATT:
-        return  0.1;
-        break;
-      case TELEMETRY_SOURCE_TIMER1:
-      case TELEMETRY_SOURCE_TIMER2:
-        return 3;
-        break;
-      case TELEMETRY_SOURCE_A1:
-      case TELEMETRY_SOURCE_A1_MIN:
-        return (ui->a1RatioSB->value()/255);
-        break;
-      case TELEMETRY_SOURCE_A2:
-      case TELEMETRY_SOURCE_A2_MIN:
-        return (ui->a2RatioSB->value()/255);
-        break;
-      case TELEMETRY_SOURCE_ALT:
-      case TELEMETRY_SOURCE_GPS_ALT:
-      case TELEMETRY_SOURCE_ALT_MAX:
-      case TELEMETRY_SOURCE_ALT_MIN:
-        return 8;
-        break;
-      case TELEMETRY_SOURCE_RPM:
-      case TELEMETRY_SOURCE_RPM_MAX:
-        return 50;
-        break;
-      case TELEMETRY_SOURCE_CELLS_SUM:
-      case TELEMETRY_SOURCE_VFAS:
-        return  0.1;
-        break;
-      case TELEMETRY_SOURCE_CELL:
-        return  0.02;
-        break;      
-      case TELEMETRY_SOURCE_HDG:
-        return  2;
-        break;
-      case TELEMETRY_SOURCE_DIST:
-      case TELEMETRY_SOURCE_DIST_MAX:
-        return  8;
-        break;
-      case TELEMETRY_SOURCE_CURRENT_MAX:
-      case TELEMETRY_SOURCE_CURRENT:
-        return  0.5;
-        break;
-      case TELEMETRY_SOURCE_POWER:
-        return  5;
-        break;
-      case TELEMETRY_SOURCE_CONSUMPTION:
-        return  20;
-        break;
-      case TELEMETRY_SOURCE_SPEED:
-      case TELEMETRY_SOURCE_SPEED_MAX:
-        if (g_model.frsky.imperial==1) {
-          return 1;
-        } else {
-          return 1.852;
-        }
-        break;
-      default:
-        return  1;
-        break;
-    }
-}
-
-void ModelEdit::setupExposListWidget()
-{
-    ExposlistWidget = new MixersList(this, true);
-    QPushButton * qbUp = new QPushButton(this);
-    QPushButton * qbDown = new QPushButton(this);
-    QPushButton * qbClear = new QPushButton(this);
-
-    qbUp->setText(tr("Move Up"));
-    qbUp->setIcon(QIcon(":/images/moveup.png"));
-    qbUp->setShortcut(QKeySequence(tr("Ctrl+Up")));
-    qbDown->setText(tr("Move Down"));
-    qbDown->setIcon(QIcon(":/images/movedown.png"));
-    qbDown->setShortcut(QKeySequence(tr("Ctrl+Down")));
-    qbClear->setText(tr("Clear Expo Settings"));
-    qbClear->setIcon(QIcon(":/images/clear.png"));
-
-    ui->exposLayout->addWidget(ExposlistWidget,1,1,1,3);
-    ui->exposLayout->addWidget(qbUp,2,1);
-    ui->exposLayout->addWidget(qbClear,2,2);
-    ui->exposLayout->addWidget(qbDown,2,3);
-
-    connect(ExposlistWidget,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(expolistWidget_customContextMenuRequested(QPoint)));
-    connect(ExposlistWidget,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(expolistWidget_doubleClicked(QModelIndex)));
-    connect(ExposlistWidget,SIGNAL(mimeDropped(int,const QMimeData*,Qt::DropAction)),this,SLOT(mimeExpoDropped(int,const QMimeData*,Qt::DropAction)));
-
-    connect(qbUp,SIGNAL(pressed()),SLOT(moveExpoUp()));
-    connect(qbDown,SIGNAL(pressed()),SLOT(moveExpoDown()));
-    connect(qbClear,SIGNAL(pressed()),SLOT(clearExpos()));
-
-    connect(ExposlistWidget,SIGNAL(keyWasPressed(QKeyEvent*)), this, SLOT(expolistWidget_KeyPress(QKeyEvent*)));
-}
-
-void ModelEdit::setupMixerListWidget()
-{
-    MixerlistWidget = new MixersList(this, false); // TODO enum
-    QPushButton * qbUp = new QPushButton(this);
-    QPushButton * qbDown = new QPushButton(this);
-    QPushButton * qbClear = new QPushButton(this);
-
-    qbUp->setText(tr("Move Up"));
-    qbUp->setIcon(QIcon(":/images/moveup.png"));
-    qbUp->setShortcut(QKeySequence(tr("Ctrl+Up")));
-    qbDown->setText(tr("Move Down"));
-    qbDown->setIcon(QIcon(":/images/movedown.png"));
-    qbDown->setShortcut(QKeySequence(tr("Ctrl+Down")));
-    qbClear->setText(tr("Clear Mixes"));
-    qbClear->setIcon(QIcon(":/images/clear.png"));
-
-    ui->mixersLayout->addWidget(MixerlistWidget,1,1,1,3);
-    ui->mixersLayout->addWidget(qbUp,2,1);
-    ui->mixersLayout->addWidget(qbClear,2,2);
-    ui->mixersLayout->addWidget(qbDown,2,3);
-
-    connect(MixerlistWidget,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(mixerlistWidget_customContextMenuRequested(QPoint)));
-    connect(MixerlistWidget,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(mixerlistWidget_doubleClicked(QModelIndex)));
-    connect(MixerlistWidget,SIGNAL(mimeDropped(int,const QMimeData*,Qt::DropAction)),this,SLOT(mimeMixerDropped(int,const QMimeData*,Qt::DropAction)));
-
-    connect(qbUp,SIGNAL(pressed()),SLOT(moveMixUp()));
-    connect(qbDown,SIGNAL(pressed()),SLOT(moveMixDown()));
-    connect(qbClear,SIGNAL(pressed()),SLOT(clearMixes()));
-
-    connect(MixerlistWidget,SIGNAL(keyWasPressed(QKeyEvent*)), this, SLOT(mixerlistWidget_KeyPress(QKeyEvent*)));
-}
-
-void ModelEdit::resizeEvent(QResizeEvent *event)
-{
-
-    if(ui->curvePreview->scene())
-    {
-        QRect qr = ui->curvePreview->contentsRect();
-        ui->curvePreview->scene()->setSceneRect(GFX_MARGIN, GFX_MARGIN, qr.width()-GFX_MARGIN*2, qr.height()-GFX_MARGIN*2);
-        drawCurve();
-    }
-
-    QDialog::resizeEvent(event);
-
-}
-
-void ModelEdit::applyBaseTemplate()
-{
-    clearMixes(false);
-    applyTemplate(0);
-    updateSettings();
-    tabMixes();
-}
-
-void ModelEdit::updateSettings()
-{
-    radioData.models[id_model] = g_model;
-    emit modelValuesChanged();
-}
-
-void ModelEdit::on_tabWidget_currentChanged(int index)
-{
-    QSettings settings("companion9x", "companion9x");
-    settings.setValue("modelEditTab",index);//ui->tabWidget->currentIndex());
-    resizeEvent();
-}
-
-void ModelEdit::fssldValueChanged()
-{
-    if (fsLock)
-      return;
-    fsLock=true;
-    QSpinBox * fssb1[] = { ui->fsm1SB_1, ui->fsm1SB_2,ui->fsm1SB_3,ui->fsm1SB_4,ui->fsm1SB_5,ui->fsm1SB_6,ui->fsm1SB_7,ui->fsm1SB_8,
-                                 ui->fsm1SB_9, ui->fsm1SB_10,ui->fsm1SB_11,ui->fsm1SB_12,ui->fsm1SB_13,ui->fsm1SB_14,ui->fsm1SB_15,ui->fsm1SB_16, NULL };
-    QSpinBox * fssb2[] = { ui->fsm2SB_1, ui->fsm2SB_2,ui->fsm2SB_3,ui->fsm2SB_4,ui->fsm2SB_5,ui->fsm2SB_6,ui->fsm2SB_7,ui->fsm2SB_8,
-                                 ui->fsm2SB_9, ui->fsm2SB_10,ui->fsm2SB_11,ui->fsm2SB_12,ui->fsm2SB_13,ui->fsm2SB_14,ui->fsm2SB_15,ui->fsm2SB_16, NULL };
-    QSlider *sl = qobject_cast<QSlider*>(sender());
-    int fsId=sl->objectName().mid(sl->objectName().lastIndexOf("_")+1).toInt()-1;
-    int moduleid=sl->objectName().mid(3,1).toInt();
-    if (moduleid==1) {
-      fssb1[fsId]->setValue(sl->value());
-    } else {
-      fssb2[fsId]->setValue(sl->value());
-    }
-    fsLock=false;
-}
-
-void ModelEdit::fssbValueChanged()
-{
-    if (fsLock)
-      return;
-    fsLock=true;
-    QSlider * fssld1[] = { ui->fsm1SL_1, ui->fsm1SL_2,ui->fsm1SL_3,ui->fsm1SL_4,ui->fsm1SL_5,ui->fsm1SL_6,ui->fsm1SL_7,ui->fsm1SL_8,
-                                 ui->fsm1SL_9, ui->fsm1SL_10,ui->fsm1SL_11,ui->fsm1SL_12,ui->fsm1SL_13,ui->fsm1SL_14,ui->fsm1SL_15,ui->fsm1SL_16, NULL };
-    QSlider * fssld2[] = { ui->fsm2SL_1, ui->fsm2SL_2,ui->fsm2SL_3,ui->fsm2SL_4,ui->fsm2SL_5,ui->fsm2SL_6,ui->fsm2SL_7,ui->fsm2SL_8,
-                                 ui->fsm2SL_9, ui->fsm2SL_10,ui->fsm2SL_11,ui->fsm2SL_12,ui->fsm2SL_13,ui->fsm2SL_14,ui->fsm2SL_15,ui->fsm2SL_16, NULL };
-    QSpinBox *sb = qobject_cast<QSpinBox*>(sender());
-    int fsId=sb->objectName().mid(sb->objectName().lastIndexOf("_")+1).toInt()-1;
-    int moduleid=sb->objectName().mid(3,1).toInt();
-    if (moduleid==1) {
-      fssld1[fsId]->setValue(sb->value());
-    } else {
-      fssld2[fsId]->setValue(sb->value());
-    }
-    fsLock=false;
-}
-
-void ModelEdit::fssldEdited()
-{
-    QSlider *sl = qobject_cast<QSlider*>(sender());
-    int fsId=sl->objectName().mid(sl->objectName().lastIndexOf("_")+1).toInt()-1;
-    int moduleid=sl->objectName().mid(3,1).toInt();
-    if (moduleid==1) {
-      g_model.moduleData[0].failsafeChannels[fsId]=sl->value();
-    } else {
-      g_model.moduleData[1].failsafeChannels[fsId]=sl->value();
-    }
-    updateSettings();
-}
-
-void ModelEdit::fssbEdited()
-{
-    QSpinBox *sb = qobject_cast<QSpinBox*>(sender());
-    int fsId=sb->objectName().mid(sb->objectName().lastIndexOf("_")+1).toInt()-1;
-    int moduleid=sb->objectName().mid(3,1).toInt();
-    if (moduleid==1) {
-      g_model.moduleData[0].failsafeChannels[fsId]=sb->value();
-    } else {
-      g_model.moduleData[1].failsafeChannels[fsId]=sb->value();
-    }
-    updateSettings();
-}
-
-void ModelEdit::tabModelEditSetup()
-{
-    //name
-    QLabel * pmsl[] = {ui->swwarn_label, ui->swwarn0_label, ui->swwarn4_label, NULL};
-    QCheckBox * pmchkb[] = {ui->swwarn1_ChkB,ui->swwarn2_ChkB,ui->swwarn3_ChkB,ui->swwarn5_ChkB,ui->swwarn6_ChkB, NULL};
-    QSlider * tpmsld[] = {ui->chkSA, ui->chkSB, ui->chkSC, ui->chkSD, ui->chkSE, ui->chkSF, ui->chkSG, NULL};
-    QSlider * fssld1[] = { ui->fsm1SL_1, ui->fsm1SL_2,ui->fsm1SL_3,ui->fsm1SL_4,ui->fsm1SL_5,ui->fsm1SL_6,ui->fsm1SL_7,ui->fsm1SL_8,
-                                 ui->fsm1SL_9, ui->fsm1SL_10,ui->fsm1SL_11,ui->fsm1SL_12,ui->fsm1SL_13,ui->fsm1SL_14,ui->fsm1SL_15,ui->fsm1SL_16, NULL };
-    QSlider * fssld2[] = { ui->fsm2SL_1, ui->fsm2SL_2,ui->fsm2SL_3,ui->fsm2SL_4,ui->fsm2SL_5,ui->fsm2SL_6,ui->fsm2SL_7,ui->fsm2SL_8,
-                                 ui->fsm2SL_9, ui->fsm2SL_10,ui->fsm2SL_11,ui->fsm2SL_12,ui->fsm2SL_13,ui->fsm2SL_14,ui->fsm2SL_15,ui->fsm2SL_16, NULL };
-    QSpinBox * fssb1[] = { ui->fsm1SB_1, ui->fsm1SB_2,ui->fsm1SB_3,ui->fsm1SB_4,ui->fsm1SB_5,ui->fsm1SB_6,ui->fsm1SB_7,ui->fsm1SB_8,
-                                 ui->fsm1SB_9, ui->fsm1SB_10,ui->fsm1SB_11,ui->fsm1SB_12,ui->fsm1SB_13,ui->fsm1SB_14,ui->fsm1SB_15,ui->fsm1SB_16, NULL };
-    QSpinBox * fssb2[] = { ui->fsm2SB_1, ui->fsm2SB_2,ui->fsm2SB_3,ui->fsm2SB_4,ui->fsm2SB_5,ui->fsm2SB_6,ui->fsm2SB_7,ui->fsm2SB_8,
-                                 ui->fsm2SB_9, ui->fsm2SB_10,ui->fsm2SB_11,ui->fsm2SB_12,ui->fsm2SB_13,ui->fsm2SB_14,ui->fsm2SB_15,ui->fsm2SB_16, NULL };
-    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-      ui->modelNameLE->setMaxLength(12);
-    } else {
-      ui->modelNameLE->setMaxLength(10);
-    }
-    ui->modelNameLE->setText(g_model.name);
-    fsLock=true;
-    if (GetEepromInterface()->getCapability(NumModules)<2) {
-      ui->rf2_GB->hide();
-    }
-
-    if (!GetEepromInterface()->getCapability(HasFailsafe)) {
-      ui->FSGB_1 ->hide();
-      ui->FSGB_2->hide();
-      ui->ModelSetupTab->setTabEnabled(1,0);
-    } else {
-      if (GetEepromInterface()->getCapability(HasFailsafe)<32) {
-        ui->FSGB_2->hide();      
-      }
-
-      for (int i=0; fssld1[i]; i++) {
-        fssld1[i]->setValue(g_model.moduleData[0].failsafeChannels[i]);
-        fssld2[i]->setValue(g_model.moduleData[1].failsafeChannels[i]);
-        fssb1[i]->setValue(g_model.moduleData[0].failsafeChannels[i]);
-        fssb2[i]->setValue(g_model.moduleData[1].failsafeChannels[i]);
-        connect(fssld1[i],SIGNAL(valueChanged(int)),this,SLOT(fssldValueChanged()));
-        connect(fssld2[i],SIGNAL(valueChanged(int)),this,SLOT(fssldValueChanged()));
-        connect(fssb1[i],SIGNAL(valueChanged(int)),this,SLOT(fssbValueChanged()));
-        connect(fssb2[i],SIGNAL(valueChanged(int)),this,SLOT(fssbValueChanged()));
-        connect(fssld1[i],SIGNAL(sliderReleased()),this,SLOT(fssldEdited()));
-        connect(fssld2[i],SIGNAL(sliderReleased()),this,SLOT(fssldEdited()));
-        connect(fssb1[i],SIGNAL(editingFinished()),this,SLOT(fssbEdited()));
-        connect(fssb2[i],SIGNAL(editingFinished()),this,SLOT(fssbEdited()));
-      }
-    }
-    fsLock=false;
-    //timer1 mode direction value
-    populateTimerSwitchCB(ui->timer1ModeCB,g_model.timers[0].mode,GetEepromInterface()->getCapability(TimerTriggerB));
-    int min = g_model.timers[0].val/60;
-    int sec = g_model.timers[0].val%60;
-    ui->timer1ValTE->setTime(QTime(0,min,sec));
-    ui->timer1DirCB->setCurrentIndex(g_model.timers[0].dir);
-    if (!GetEepromInterface()->getCapability(ModelVoice)) {
-      ui->modelVoice_SB->hide();
-      ui->modelVoice_label->hide();
-    } else {
-      ui->modelVoice_SB->setValue(g_model.modelVoice+260);
-    }
-    if (!GetEepromInterface()->getCapability(PerModelThrottleInvert)) {
-      ui->label_thrrev->hide();
-      ui->thrrevChkB->hide();
-    } else {
-      ui->thrrevChkB->setChecked(g_model.throttleReversed);
-    }
-    if (!GetEepromInterface()->getCapability(ModelImage)) {
-      ui->modelImage_CB->hide();
-      ui->modelImage_label->hide();
-      ui->modelImage_image->hide();
-    } else {
-      modelImageLock=true;
-      QStringList items;
-      items.append("");
-      QSettings settings("companion9x", "companion9x");
-      QString path=settings.value("sdPath", ".").toString();
-      path.append("/BMP/");
-      QDir qd(path);
-      int vml= GetEepromInterface()->getCapability(VoicesMaxLength)+4;
-      if (qd.exists()) {
-        QStringList filters;
-        filters << "*.bmp" << "*.bmp";
-        foreach ( QString file, qd.entryList(filters, QDir::Files) ) {
-          QFileInfo fi(file);
-          QString temp=fi.completeBaseName();
-          if (!items.contains(temp) && temp.length()<=vml) {
-            items.append(temp);
-          }
-        }
-      }
-      if (!items.contains(g_model.bitmap)) {
-        items.append(g_model.bitmap);      
-      }
-      items.sort();
-      ui->modelImage_CB->clear();
-      foreach ( QString file, items ) {
-        ui->modelImage_CB->addItem(file);
-        if (file==g_model.bitmap) {
-          ui->modelImage_CB->setCurrentIndex(ui->modelImage_CB->count()-1);
-          QString fileName=path;
-          fileName.append(g_model.bitmap);
-          fileName.append(".bmp");
-          QImage image(fileName);
-          if (image.isNull()) {
-            fileName=path;
-            fileName.append(g_model.bitmap);
-            fileName.append(".BMP");
-            image.load(fileName);
-          }
-          if (!image.isNull()) {
-            ui->modelImage_image->setPixmap(QPixmap::fromImage(image.scaled( 64,32)));;
-          }
-        }
-      }
-      modelImageLock=false;
-    }
-
-    if (!GetEepromInterface()->getCapability(pmSwitchMask)) {
-      for (int i=0; pmsl[i]; i++) {
-        pmsl[i]->hide();
-      }
-      for (int i=0; pmchkb[i]; i++) {
-        pmchkb[i]->hide();
-      }
-      ui->tswwarn0_CB->hide(); 
-      for (int i=0; tpmsld[i]; i++) {
-        tpmsld[i]->hide();
-      }
-      ui->swwarn0_line->hide();
-      ui->swwarn0_line->hide();
-      ui->swwarn0_CB->hide();
-      ui->swwarn4_CB->hide();
-      ui->swwarn_line0->hide();
-      ui->swwarn_line1->hide();
-      ui->swwarn_line2->hide();
-      ui->swwarn_line3->hide();
-      ui->swwarn_line4->hide();
-      ui->swwarn_line5->hide();
-      ui->tswwarn0_label->hide();
-      ui->tswwarn1_label->hide();
-      ui->tswwarn2_label->hide();
-      ui->tswwarn3_label->hide();
-      ui->tswwarn4_label->hide();
-      ui->tswwarn5_label->hide();
-      ui->tswwarn6_label->hide();
-      ui->tswwarn7_label->hide();
-    } else {
-      if (GetEepromInterface()->getCapability(Pots)==3) {
-        ui->swwarn0_CB->setCurrentIndex(g_model.switchWarningStates & 0x01);
-        ui->swwarn1_ChkB->setChecked(checkbit(g_model.switchWarningStates, 1));
-        ui->swwarn2_ChkB->setChecked(checkbit(g_model.switchWarningStates, 2));
-        ui->swwarn3_ChkB->setChecked(checkbit(g_model.switchWarningStates, 3));
-        ui->swwarn4_CB->setCurrentIndex((g_model.switchWarningStates & 0x30)>>4);
-        ui->swwarn5_ChkB->setChecked(checkbit(g_model.switchWarningStates, 6));
-        ui->swwarn6_ChkB->setChecked(checkbit(g_model.switchWarningStates, 7));
-        for (int i=0; pmchkb[i]; i++) {
-          connect(pmchkb[i], SIGNAL(stateChanged(int)),this,SLOT(startupSwitchEdited()));
-        }
-        connect(ui->swwarn0_CB,SIGNAL(currentIndexChanged(int)),this,SLOT(startupSwitchEdited()));
-        connect(ui->swwarn4_CB,SIGNAL(currentIndexChanged(int)),this,SLOT(startupSwitchEdited()));
-      } else {
-        ui->tswwarn0_CB->setCurrentIndex(g_model.switchWarningStates & 0x01);
-        uint16_t switchstate=(g_model.switchWarningStates>>1);
-        ui->chkSA->setValue(switchstate & 0x3);
-        switchstate >>= 2;
-        ui->chkSB->setValue(switchstate & 0x3);
-        switchstate >>= 2;
-        ui->chkSC->setValue(switchstate & 0x3);
-        switchstate >>= 2;
-        ui->chkSD->setValue(switchstate & 0x3);
-        switchstate >>= 2;
-        ui->chkSE->setValue(switchstate & 0x3);
-        switchstate >>= 2;
-        ui->chkSF->setValue((switchstate & 0x3)/2);
-        switchstate >>= 2;
-        ui->chkSG->setValue(switchstate & 0x3);
-        connect(ui->tswwarn0_CB,SIGNAL(currentIndexChanged(int)),this,SLOT(startupSwitchEdited()));
-        for (int i=0; tpmsld[i]; i++) {
-          connect(tpmsld[i], SIGNAL(valueChanged(int)),this,SLOT(startupSwitchEdited()));
-        }      
-      }
-    }
-    int ppmmax=GetEepromInterface()->getCapability(PPMFrameLength);
-    if (ppmmax>0) {
-      ui->ppmFrameLengthDSB->setMaximum(ppmmax);
-    }
-    if (!GetEepromInterface()->getCapability(InstantTrimSW)) {
-      ui->instantTrim_label->hide();
-      ui->instantTrim_CB->setDisabled(true);
-      ui->instantTrim_CB->hide();
-    } else {
-      switchEditLock=true;
-      int found=false;
-      for (int i=0; i< C9X_MAX_CUSTOM_FUNCTIONS; i++) {
-        if (g_model.funcSw[i].func==FuncInstantTrim) {
-          populateSwitchCB(ui->instantTrim_CB,g_model.funcSw[i].swtch,POPULATE_MSWITCHES & POPULATE_ONOFF);
-          found=true;
-          break;
-        }
-      }
-      if (found==false) {
-        populateSwitchCB(ui->instantTrim_CB,RawSwitch(),POPULATE_MSWITCHES & POPULATE_ONOFF);
-      }
-      switchEditLock=false;
-    }
-    if (GetEepromInterface()->getCapability(NoTimerDirs)) {
-      ui->timer1DirCB->hide();
-      ui->timer2DirCB->hide();
-    }
-    if (GetEepromInterface()->getCapability(NoThrExpo)) {
-      ui->label_thrExpo->hide();
-      ui->thrExpoChkB->hide();
-    }
-    if (!(GetEepromInterface()->getCapability(ExtendedTrims)>0)) {
-      ui->extendedTrimsChkB->hide();
-      ui->extendedTrims_label->hide();
-    }
-    if (!GetEepromInterface()->getCapability(HasTTrace)) {
-      ui->label_ttrace->hide();
-      ui->ttraceCB->hide();
-    } else {
-      populateTTraceCB(ui->ttraceCB,g_model.thrTraceSrc);
-    }
-    if (GetEepromInterface()->getCapability(RotaryEncoders)==0) {
-      ui->bcREaChkB->hide();
-      ui->bcREbChkB->hide();
-    }
-    if (GetEepromInterface()->getCapability(Pots)==3) {
-      ui->tswwarn0_CB->hide();
-      ui->tswwarn0_label->hide();
-      ui->tswwarn1_label->hide();
-      ui->tswwarn2_label->hide();
-      ui->tswwarn3_label->hide();
-      ui->tswwarn4_label->hide();
-      ui->tswwarn5_label->hide();
-      ui->tswwarn6_label->hide();
-      ui->tswwarn7_label->hide();
-      ui->chkSA->hide();
-      ui->chkSB->hide();
-      ui->chkSC->hide();
-      ui->chkSD->hide();
-      ui->chkSE->hide();
-      ui->chkSF->hide();
-      ui->chkSG->hide();
-      this->layout()->removeItem(ui->TaranisSwitchStartup);
-      ui->bcP4ChkB->hide();
-    } else {
-      ui->swwarn0_CB->hide();
-      ui->swwarn0_label->hide();
-      ui->swwarn0_line->hide();
-      ui->swwarn1_ChkB->hide();
-      ui->swwarn1_line->hide();
-      ui->swwarn2_ChkB->hide();
-      ui->swwarn3_ChkB->hide();
-      ui->swwarn4_CB->hide();
-      ui->swwarn4_label->hide();
-      ui->swwarn5_ChkB->hide();
-      ui->swwarn6_ChkB->hide();
-      ui->swwarn_line0->hide();
-      ui->swwarn_line1->hide();
-      ui->swwarn_line2->hide();
-      ui->swwarn_line3->hide();
-      ui->swwarn_line4->hide();
-      ui->swwarn_line5->hide();
-      this->layout()->removeItem(ui->StockSwitchStartup);
-      ui->bcP1ChkB->setText(tr("S1"));
-      ui->bcP2ChkB->setText(tr("S2"));
-      ui->bcP3ChkB->setText(tr("LS"));
-    }
-
-    if (!GetEepromInterface()->getCapability(PerModelThrottleWarning)) {
-      ui->thrwarnChkB->setDisabled(true);
-      ui->thrwarnChkB->hide();
-      ui->thrwarnLabel->hide();
-    } else {
-      switchEditLock=true;
-      ui->thrwarnChkB->setChecked(g_model.disableThrottleWarning);
-      switchEditLock=false;
-    }
-    if (!GetEepromInterface()->getCapability(TimerTriggerB)) {
-      ui->timer1ModeBCB->hide();
-      ui->timer1ModeB_label->hide();
-      ui->timer2ModeBCB->hide();
-      ui->timer2ModeB_label->hide();
-    } else {
-      populateTimerSwitchBCB(ui->timer1ModeBCB,g_model.timers[0].modeB,GetEepromInterface()->getCapability(TimerTriggerB));
-      populateTimerSwitchBCB(ui->timer2ModeBCB,g_model.timers[1].modeB,GetEepromInterface()->getCapability(TimerTriggerB));
-    }
-
-    int index=0;
-    int selindex;
-    int selindex2;
-    protocolEditLock=true; 
-    protocol2EditLock=true; 
-    ui->protocolCB->clear();
-    for (int i=0; i<PROTO_LAST; i++) {
-      if (GetEepromInterface()->isAvailable((Protocol)i)) {
-        ui->protocolCB->addItem(getProtocolStr(i), (QVariant)i);
-        if (g_model.moduleData[0].protocol == i) {
-          selindex = index;
-        }
-        index++;
-      }
-    }
-    if (GetEepromInterface()->getCapability(NumModules)>1) {
-      index=0;
-      ui->protocolCB_2->clear();
-      for (int i=0; i<PROTO_LAST; ++i) {
-        if (GetEepromInterface()->isAvailable((Protocol)i, 1)) {
-          ui->protocolCB_2->addItem(getProtocolStr(i), (QVariant)i);
-          if (g_model.moduleData[1].protocol == i) {
-            selindex2 = index;
-          }
-          index++;
-        }
-      }
-    }
-    if (GetEepromInterface()->getCapability(ModelTrainerEnable)) {
-      trainerEditLock=true;
-      if (!(g_model.trainerMode||g_model.traineron)) {
-        ui->protocolCB_3->setCurrentIndex(0);
-        ui->label_PPM_3->hide();
-        ui->ppmDelaySB_3->hide();
-        ui->label_PPMCH_3->hide();
-        ui->label_pulsePol_3->hide();
-        ui->pulsePolCB_3->hide();
-        ui->numChannelsSB_3->hide();
-        ui->label_ppmFrameLength_3->hide();
-        ui->ppmFrameLengthDSB_3->hide();
-        ui->label_numChannelsStart_3->hide();
-        ui->numChannelsStart_3->hide();      
-      } else {
-        ui->protocolCB_3->setCurrentIndex(1);
-        ui->label_PPM_3->show();
-        ui->ppmDelaySB_3->show();
-        ui->label_PPMCH_3->show();
-        ui->label_pulsePol_3->show();
-        ui->pulsePolCB_3->show();
-        ui->numChannelsSB_3->show();
-        ui->label_ppmFrameLength_3->show();
-        ui->ppmFrameLengthDSB_3->show();
-        ui->label_numChannelsStart_3->show();
-        ui->numChannelsStart_3->show();      
-      }
-      trainerEditLock=false;
-      on_protocolCB_3_currentIndexChanged(g_model.traineron||g_model.trainerMode);
-    } else {
-      ui->rf3_GB->hide();
-    }
-
-    ui->label_PPM->hide();
-    ui->ppmDelaySB->hide();
-    ui->label_PPMCH->hide();
-    ui->label_pulsePol->hide();
-    ui->pulsePolCB->hide();
-    ui->numChannelsSB->hide();
-    ui->label_ppmFrameLength->hide();
-    ui->ppmFrameLengthDSB->hide();
-    ui->label_DSM->hide();
-    ui->DSM_Type->hide();
-    ui->label_PXX->hide();
-    ui->pxxRxNum->hide();
-    ui->label_numChannelsStart->hide();
-    ui->numChannelsStart->hide();
-    ui->pxxRxNum->setEnabled(false);
-    ui->protocolCB->setCurrentIndex(selindex);
-    protocolEditLock=false;    
-    on_protocolCB_currentIndexChanged(selindex);
-    if (GetEepromInterface()->getCapability(NumModules)>1) {
-      ui->label_PPM_2->hide();
-      ui->ppmDelaySB_2->hide();
-      ui->label_PPMCH_2->hide();
-      ui->label_pulsePol_2->hide();
-      ui->pulsePolCB_2->hide();
-      ui->numChannelsSB_2->hide();
-      ui->label_ppmFrameLength_2->hide();
-      ui->ppmFrameLengthDSB_2->hide();
-      ui->label_DSM_2->hide();
-      ui->DSM_Type_2->hide();
-      ui->label_PXX_2->hide();
-      ui->pxxRxNum_2->hide();
-      ui->label_numChannelsStart_2->hide();
-      ui->numChannelsStart_2->hide();
-      ui->pxxRxNum_2->setEnabled(false);
-      ui->protocolCB_2->setCurrentIndex(selindex2);
-      protocol2EditLock=false;
-      on_protocolCB_2_currentIndexChanged(selindex2);
-    }
-
-    //timer2 mode direction value
-    if (GetEepromInterface()->getCapability(Timers)<2) {
-      ui->timer2DirCB->hide();
-      ui->timer2ValTE->hide();
-      ui->timer2DirCB->hide();
-      ui->timer2ModeCB->hide();
-      ui->timer2ModeBCB->hide();
-      ui->timer2ModeB_label->hide();
-      ui->label_timer2->hide();
-    } else {
-      populateTimerSwitchCB(ui->timer2ModeCB,g_model.timers[1].mode,GetEepromInterface()->getCapability(TimerTriggerB));
-      min = g_model.timers[1].val/60;
-      sec = g_model.timers[1].val%60;
-      ui->timer2ValTE->setTime(QTime(0,min,sec));
-      ui->timer2DirCB->setCurrentIndex(g_model.timers[1].dir);
-    }
-    if (!GetEepromInterface()->getCapability(PermTimers)) {
-      ui->timer1Perm->hide();
-      ui->timer2Perm->hide();
-      ui->timer1PermValue->hide();
-      ui->timer2PermValue->hide();
-    } else {
-      int sign=1;
-      int pvalue=g_model.timers[0].pvalue;
-      if (pvalue<0) {
-        pvalue=-pvalue;
-        sign=-1;
-      }
-      int hours=pvalue/3600;
-      pvalue-=hours*3600;
-      int minutes = pvalue/60;
-      int seconds = pvalue%60;
-      ui->timer1PermValue->setText(QString(" %1(%2:%3:%4)").arg(sign<0 ? "-" :" ").arg(hours,2,10,QLatin1Char('0')).arg(minutes,2,10,QLatin1Char('0')).arg(seconds,2,10,QLatin1Char('0')));
-      // QString QString::arg ( int a, int fieldWidth = 0, int base = 10, const QChar & fillChar = QLatin1Char( ' ' ) ) const
-      sign=1;
-      pvalue=g_model.timers[1].pvalue;
-      if (pvalue<0) {
-        pvalue=-pvalue;
-        sign=-1;
-      }    
-      hours=pvalue/3600;
-      pvalue-=hours*3600;
-      minutes = pvalue/60;
-      seconds = pvalue%60;
-      ui->timer2PermValue->setText(QString(" %1(%2:%3:%4)").arg(sign<0 ? "-" :" ").arg(hours,2,10,QLatin1Char('0')).arg(minutes,2,10,QLatin1Char('0')).arg(seconds,2,10,QLatin1Char('0')));
-      ui->timer1Perm->setChecked(g_model.timers[0].persistent);
-      ui->timer2Perm->setChecked(g_model.timers[1].persistent);
-    }
-    if (!GetEepromInterface()->getCapability(minuteBeep)) {
-      ui->timer1Minute->hide();
-      ui->timer2Minute->hide();
-    } else {
-      ui->timer1Minute->setChecked(g_model.timers[0].minuteBeep);
-      ui->timer2Minute->setChecked(g_model.timers[1].minuteBeep);
-    }
-
-    if (!GetEepromInterface()->getCapability(countdownBeep)) {
-      ui->timer1CountDownBeep->hide();
-      ui->timer2CountDownBeep->hide();
-    } else {
-      ui->timer1CountDownBeep->setChecked(g_model.timers[0].countdownBeep);
-      ui->timer2CountDownBeep->setChecked(g_model.timers[1].countdownBeep);
-    }
-
-    //trim inc, thro trim, thro expo, instatrim
-    ui->trimIncCB->setCurrentIndex(g_model.trimInc);
-    ui->thrExpoChkB->setChecked(g_model.thrExpo);
-    ui->thrTrimChkB->setChecked(g_model.thrTrim);
-
-    //center beep
-    ui->bcRUDChkB->setChecked(g_model.beepANACenter & BC_BIT_RUD);
-    ui->bcELEChkB->setChecked(g_model.beepANACenter & BC_BIT_ELE);
-    ui->bcTHRChkB->setChecked(g_model.beepANACenter & BC_BIT_THR);
-    ui->bcAILChkB->setChecked(g_model.beepANACenter & BC_BIT_AIL);
-    ui->bcP1ChkB->setChecked(g_model.beepANACenter & BC_BIT_P1);
-    ui->bcP2ChkB->setChecked(g_model.beepANACenter & BC_BIT_P2);
-    ui->bcP3ChkB->setChecked(g_model.beepANACenter & BC_BIT_P3);
-    ui->bcP4ChkB->setChecked(g_model.beepANACenter & BC_BIT_P4);
-    ui->bcREaChkB->setChecked(g_model.beepANACenter & BC_BIT_REA);
-    ui->bcREbChkB->setChecked(g_model.beepANACenter & BC_BIT_REB);
-
-    // PPM settings fields
-    ui->ppmDelaySB->setEnabled(g_model.moduleData[0].protocol == PPM);
-    ui->pulsePolCB->setCurrentIndex(g_model.moduleData[0].ppmPulsePol);
-    ui->ppmDelaySB->setEnabled(g_model.moduleData[0].protocol == PPM);
-    ui->ppmDelaySB->setValue(g_model.moduleData[0].ppmDelay);
-    // TODO? ui->numChannelsSB->setEnabled(g_model.moduleData[0].protocol == PPM);
-
-    ui->extendedLimitsChkB->setChecked(g_model.extendedLimits);
-    ui->T2ThrTrgChkB->setChecked(g_model.t2throttle);
-    if (!GetEepromInterface()->getCapability(Timer2ThrTrig)) {
-      ui->T2ThrTrg->hide();
-      ui->T2ThrTrgChkB->hide();
-    }
-    ui->ppmFrameLengthDSB->setValue(22.5+((double)g_model.moduleData[0].ppmFrameLength)*0.5);
-    if (!GetEepromInterface()->getCapability(PPMExtCtrl)) {
-      ui->ppmFrameLengthDSB->hide();
-      ui->label_ppmFrameLength->hide();
-    }
-    switch (g_model.moduleData[0].protocol) {
-      case PXX_DJT:
-      case PXX_XJT_X16:
-      case PXX_XJT_D8:
-      case PXX_XJT_LR12:
-        ui->pxxRxNum->setMinimum(0);
-        ui->pxxRxNum->setValue((g_model.modelId));
-        break;
-      case DSM2:
-        if (!GetEepromInterface()->getCapability(DSM2Indexes)) {
-          ui->pxxRxNum->setValue(1);
-        }
-        else {
-          ui->pxxRxNum->setMinimum(0);
-          ui->pxxRxNum->setValue((g_model.modelId));
-        }
-        ui->numChannelsSB->setValue(8);
-        break;
-      default:
-        ui->label_DSM->hide();
-        ui->DSM_Type->hide();
-        ui->DSM_Type->setEnabled(false);
-        ui->label_PXX->hide();
-        ui->pxxRxNum->hide();
-        ui->pxxRxNum->setEnabled(false);
-        ui->numChannelsSB->setValue(g_model.moduleData[0].channelsCount);
-        break;
-    }
-}
-
-void ModelEdit::on_modelVoice_SB_editingFinished()
-{
-    g_model.modelVoice=ui->modelVoice_SB->value()-260;
-    updateSettings();
-}
-
-void ModelEdit::on_timer1Perm_toggled(bool checked)
-{
-    g_model.timers[0].persistent=checked;
-    updateSettings();
-}
-
-void ModelEdit::on_timer2Perm_toggled(bool checked)
-{
-    g_model.timers[1].persistent=checked;
-    updateSettings();
-}
-
-void ModelEdit::on_timer1Minute_toggled(bool checked)
-{
-    g_model.timers[0].minuteBeep=checked;
-    updateSettings();
-}
-
-void ModelEdit::on_timer2Minute_toggled(bool checked)
-{
-    g_model.timers[1].minuteBeep=checked;
-    updateSettings();
-}
-
-void ModelEdit::on_timer1CountDownBeep_toggled(bool checked)
-{
-    g_model.timers[0].countdownBeep=checked;
-    updateSettings();
-}
-
-void ModelEdit::on_timer2CountDownBeep_toggled(bool checked)
-{
-    g_model.timers[1].countdownBeep=checked;
-    updateSettings();
-}
-
-void ModelEdit::displayOnePhaseOneTrim(unsigned int phase_idx, unsigned int chn, QComboBox *trimUse, QSpinBox *trimVal, QSlider *trimSlider)
-{
-    PhaseData *phase = &g_model.phaseData[phase_idx];
-    int trim = phase->trim[chn];
-    if (trimUse) populateTrimUseCB(trimUse, phase_idx);
-    if (phase->trimRef[chn] >= 0) {
-      if (trimUse) trimUse->setCurrentIndex(1 + phase->trimRef[chn] - (phase->trimRef[chn] >= (int)phase_idx ? 1 : 0));
-      trim = g_model.phaseData[g_model.getTrimFlightPhase(chn, phase_idx)].trim[chn];
-      trimVal->setEnabled(false);
-      trimSlider->setEnabled(false);
-    } else {
-      trimVal->setEnabled(true);
-      trimSlider->setEnabled(true);
-      if (trimUse) trimUse->setCurrentIndex(0);
-    }
-    int trimsMax = GetEepromInterface()->getCapability(ExtendedTrims);
-    if (trimsMax == 0 || !g_model.extendedTrims) {
-      trimsMax = 125;
-    }
-    /*else if (trimsMax == 500)
-      trimSlider->setTickInterval(50);*/
-    trimSlider->setRange(-trimsMax, +trimsMax);
-    trimVal->setRange(-trimsMax, +trimsMax);
-    trimVal->setValue(trim);
-    trimSlider->setValue(trim);
-    if (chn == 2 && g_eeGeneral.throttleReversed)
-      trimSlider->setInvertedAppearance(true);
-}
-
-void ModelEdit::displayOnePhase(unsigned int phase_idx, QLineEdit *name, QComboBox *sw, QDoubleSpinBox *fadeIn, QDoubleSpinBox *fadeOut, 
-                                                      QComboBox *trim1Use, QSpinBox *trim1, QLabel *trim1Label, QSlider *trim1Slider, 
-                                                      QComboBox *trim2Use, QSpinBox *trim2, QLabel *trim2Label, QSlider *trim2Slider, 
-                                                      QComboBox *trim3Use, QSpinBox *trim3, QLabel *trim3Label, QSlider *trim3Slider, 
-                                                      QComboBox *trim4Use, QSpinBox *trim4, QLabel *trim4Label, QSlider *trim4Slider, 
-                                                      QLabel *gv1Label, QComboBox *gv1Use,QSpinBox *gv1Value,
-                                                      QLabel *gv2Label, QComboBox *gv2Use,QSpinBox *gv2Value,
-                                                      QLabel *gv3Label, QComboBox *gv3Use,QSpinBox *gv3Value,
-                                                      QLabel *gv4Label, QComboBox *gv4Use,QSpinBox *gv4Value,
-                                                      QLabel *gv5Label, QComboBox *gv5Use,QSpinBox *gv5Value,
-                                                      QLabel *re1Label, QComboBox *re1Use,QSpinBox *re1Value,
-                                                      QLabel *re2Label, QComboBox *re2Use,QSpinBox *re2Value,bool doConnect=false)
-{
-    phasesLock=true;
-    PhaseData *phase = &g_model.phaseData[phase_idx];
-    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-      if (name) name->setMaxLength(10);
-    } else {
-      if (name) name->setMaxLength(6);
-    }
-
-    if (name) name->setText(phase->name);
-    if (sw) populateSwitchCB(sw, phase->swtch);
-
-    int scale=GetEepromInterface()->getCapability(SlowScale);
-    float range=GetEepromInterface()->getCapability(SlowRange);
-    int fades=GetEepromInterface()->getCapability(FlightPhasesHaveFades);
-    if (fades && fadeIn) {
-      fadeIn->setEnabled(true);
-      fadeOut->setEnabled(true);
-      fadeIn->setMaximum(range/scale);
-      fadeIn->setSingleStep(1.0/scale);
-      fadeIn->setDecimals((scale==1 ? 0 :1) );
-      if (fadeIn) {
-        fadeIn->setValue((double)phase->fadeIn/scale);
-      }
-      fadeOut->setMaximum(range/scale);
-      fadeOut->setSingleStep(1.0/scale);
-      fadeOut->setDecimals((scale==1 ? 0 :1));
-      if (fadeOut) {
-        fadeOut->setValue((double)phase->fadeOut/scale);
-      }
-    } else if ( fadeIn ) {
-      fadeIn->setDisabled(true);
-      fadeOut->setDisabled(true);
-    }
-    displayOnePhaseOneTrim(phase_idx, CONVERT_MODE(1)-1, trim1Use, trim1, trim1Slider);
-    displayOnePhaseOneTrim(phase_idx, CONVERT_MODE(2)-1, trim2Use, trim2, trim2Slider);
-    displayOnePhaseOneTrim(phase_idx, CONVERT_MODE(3)-1, trim3Use, trim3, trim3Slider);
-    displayOnePhaseOneTrim(phase_idx, CONVERT_MODE(4)-1, trim4Use, trim4, trim4Slider);
-
-    if (gv1Use) { 
-      populateGvarUseCB(gv1Use, phase_idx);
-      if (phase->gvars[0]>1024) {
-        gv1Use->setCurrentIndex(phase->gvars[0]-1024);
-      }
-    }
-    gv1Value->setMinimum(-1024);
-    gv1Value->setMaximum(1024);
-    if (phase->gvars[0]<1024) {
-      gv1Value->setValue(phase->gvars[0]);
-      gv1Value->setEnabled(true);
-    } else {
-      uint index=phase->gvars[0]-1025;
-      if (index>=phase_idx) {
-        index++;
-      }
-      PhaseData *phasegvar = &g_model.phaseData[index];
-      gv1Value->setValue(phasegvar->gvars[0]);
-      gv1Value->setDisabled(true);
-    }
-    if (gv2Use) {
-      populateGvarUseCB(gv2Use, phase_idx);
-      if (phase->gvars[1]>1024) {
-        gv2Use->setCurrentIndex(phase->gvars[1]-1024);
-      }    
-    }
-    gv2Value->setMinimum(-1024);
-    gv2Value->setMaximum(1024);
-    if (phase->gvars[1]<1024) {
-      gv2Value->setValue(phase->gvars[1]);
-      gv2Value->setEnabled(true);
-    } else {
-      uint index=phase->gvars[1]-1025;
-      if (index>=phase_idx) {
-        index++;
-      }
-      PhaseData *phasegvar = &g_model.phaseData[index];
-      gv2Value->setValue(phasegvar->gvars[1]);
-      gv2Value->setDisabled(true);
-    }
-    if (gv3Use) {
-      populateGvarUseCB(gv3Use, phase_idx);
-      if (phase->gvars[2]>1024) {
-        gv3Use->setCurrentIndex(phase->gvars[2]-1024);
-      }    
-    }
-    gv3Value->setMinimum(-1024);
-    gv3Value->setMaximum(1024);
-    if (phase->gvars[2]<1024) {
-      gv3Value->setValue(phase->gvars[2]);
-      gv3Value->setEnabled(true);
-    } else {
-      uint index=phase->gvars[2]-1025;
-      if (index>=phase_idx) {
-        index++;
-      }
-      PhaseData *phasegvar = &g_model.phaseData[index];
-      gv3Value->setValue(phasegvar->gvars[2]);
-      gv3Value->setDisabled(true);
-    }  
-    if (gv4Use) {
-      populateGvarUseCB(gv4Use, phase_idx);
-      if (phase->gvars[3]>1024) {
-        gv4Use->setCurrentIndex(phase->gvars[3]-1024);
-      }    
-    }
-    gv4Value->setMinimum(-1024);
-    gv4Value->setMaximum(1024);
-    if (phase->gvars[3]<1024) {
-      gv4Value->setValue(phase->gvars[3]);
-      gv4Value->setEnabled(true);
-    } else {
-      uint index=phase->gvars[3]-1025;
-      if (index>=phase_idx) {
-        index++;
-      }
-      PhaseData *phasegvar = &g_model.phaseData[index];
-      gv4Value->setValue(phasegvar->gvars[3]);
-      gv4Value->setDisabled(true);
-    }    
-    if (gv5Use) {
-      populateGvarUseCB(gv5Use, phase_idx);
-      if (phase->gvars[4]>1024) {
-        gv5Use->setCurrentIndex(phase->gvars[4]-1024);
-      }    
-    }
-    gv5Value->setMinimum(-1024);
-    gv5Value->setMaximum(1024);
-    if (phase->gvars[4]<1024) {
-      gv5Value->setValue(phase->gvars[4]);
-      gv5Value->setEnabled(true);
-    } else {
-      uint index=phase->gvars[4]-1025;
-      if (index>=phase_idx) {
-        index++;
-      }
-      PhaseData *phasegvar = &g_model.phaseData[index];
-      gv5Value->setValue(phasegvar->gvars[4]);
-      gv5Value->setDisabled(true);
-    }    
-    if (re1Value) {
-      re1Value->setMinimum(-1024);
-      re1Value->setMaximum(1024);
-    }
-    if (re2Value) {
-      re2Value->setMinimum(-1024);
-      re2Value->setMaximum(1024);
-    }  
-    if (re1Use) {
-      populateGvarUseCB(re1Use, phase_idx);
-      if (phase->rotaryEncoders[0]>1024) {
-        re1Use->setCurrentIndex(phase->rotaryEncoders[0]-1024);
-      }    
-    }
-    if (phase->rotaryEncoders[0]<1024) {
-      re1Value->setValue(phase->rotaryEncoders[0]);
-      re1Value->setEnabled(true);
-    } else {
-      uint index=phase->rotaryEncoders[0]-1025;
-      if (index>=phase_idx) {
-        index++;
-      }
-      PhaseData *phasegvar = &g_model.phaseData[index];
-      re1Value->setValue(phasegvar->rotaryEncoders[0]);
-      re1Value->setDisabled(true);
-    }  
-    if (re2Use) {
-      populateGvarUseCB(re2Use, phase_idx);
-      if (phase->rotaryEncoders[0]>1024) {
-        re1Use->setCurrentIndex(phase->rotaryEncoders[0]-1024);
-      }    
-    }
-    if (phase->rotaryEncoders[1]<1024) {
-      re2Value->setValue(phase->rotaryEncoders[1]);
-      re2Value->setEnabled(true);
-    } else {
-      uint index=phase->rotaryEncoders[1]-1025;
-      if (index>=phase_idx) {
-        index++;
-      }
-      PhaseData *phasegvar = &g_model.phaseData[index];
-      re2Value->setValue(phasegvar->rotaryEncoders[1]);
-      re2Value->setDisabled(true);
-    }  
-    if (GetEepromInterface()->getCapability(RotaryEncoders)<2) {
-      if (re2Label)
-        re2Label->hide();
-      if (re2Use)
-        re2Use->hide();
-      re2Value->hide();
-    }
-    if (GetEepromInterface()->getCapability(RotaryEncoders)<1) {
-      if (re1Label)
-        re1Label->hide();
-      if (re1Use)
-        re1Use->hide();
-      re1Value->hide();
-    }
-    QString labels[] = { tr("Rud"), tr("Ele"), tr("Thr"), tr("Ail") };
-    if (trim1Label) {
-      trim1Label->setText(labels[CONVERT_MODE(1)-1]);
-      trim2Label->setText(labels[CONVERT_MODE(2)-1]);
-      trim3Label->setText(labels[CONVERT_MODE(3)-1]);
-      trim4Label->setText(labels[CONVERT_MODE(4)-1]);
-    }
-    // the connects
-    if (doConnect) {
-      connect(name, SIGNAL(editingFinished()), this, SLOT(phaseName_editingFinished()));
-      if (sw!=NULL) {
-        connect(sw,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseSwitch_currentIndexChanged()));
-        connect(trim1Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseTrimUse_currentIndexChanged()));
-        connect(trim2Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseTrimUse_currentIndexChanged()));
-        connect(trim3Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseTrimUse_currentIndexChanged()));
-        connect(trim4Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseTrimUse_currentIndexChanged()));
-      }
-      if (gv1Use) connect(gv1Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseGVUse_currentIndexChanged()));
-      if (gv2Use) connect(gv2Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseGVUse_currentIndexChanged()));
-      if (gv3Use) connect(gv3Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseGVUse_currentIndexChanged()));
-      if (gv4Use) connect(gv4Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseGVUse_currentIndexChanged()));
-      if (gv5Use) connect(gv5Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseGVUse_currentIndexChanged()));
-      if (re1Use) connect(re1Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseREUse_currentIndexChanged()));
-      if (re2Use) connect(re2Use,SIGNAL(currentIndexChanged(int)),this,SLOT(phaseREUse_currentIndexChanged()));
-      connect(gv1Value,SIGNAL(editingFinished()),this,SLOT(phaseGVValue_editingFinished()));
-      connect(gv2Value,SIGNAL(editingFinished()),this,SLOT(phaseGVValue_editingFinished()));
-      connect(gv3Value,SIGNAL(editingFinished()),this,SLOT(phaseGVValue_editingFinished()));
-      connect(gv4Value,SIGNAL(editingFinished()),this,SLOT(phaseGVValue_editingFinished()));
-      connect(gv5Value,SIGNAL(editingFinished()),this,SLOT(phaseGVValue_editingFinished()));
-      connect(re1Value,SIGNAL(editingFinished()),this,SLOT(phaseREValue_editingFinished()));
-      connect(re2Value,SIGNAL(editingFinished()),this,SLOT(phaseREValue_editingFinished()));
-
-      connect(fadeIn,SIGNAL(editingFinished()),this,SLOT(phaseFadeIn_editingFinished()));
-      connect(fadeOut,SIGNAL(editingFinished()),this,SLOT(phaseFadeOut_editingFinished()));
-      connect(trim1,SIGNAL(valueChanged(int)),this,SLOT(phaseTrim_valueChanged()));
-      connect(trim2,SIGNAL(valueChanged(int)),this,SLOT(phaseTrim_valueChanged()));
-      connect(trim3,SIGNAL(valueChanged(int)),this,SLOT(phaseTrim_valueChanged()));
-      connect(trim4,SIGNAL(valueChanged(int)),this,SLOT(phaseTrim_valueChanged()));
-      connect(trim1Slider,SIGNAL(valueChanged(int)),this,SLOT(phaseTrimSlider_valueChanged()));
-      connect(trim2Slider,SIGNAL(valueChanged(int)),this,SLOT(phaseTrimSlider_valueChanged()));
-      connect(trim3Slider,SIGNAL(valueChanged(int)),this,SLOT(phaseTrimSlider_valueChanged()));
-      connect(trim4Slider,SIGNAL(valueChanged(int)),this,SLOT(phaseTrimSlider_valueChanged()));
-      phasesLock=false;  
-    }
-}
-
-void ModelEdit::tabPhases()
-{
-    QSpinBox * tmp[9][5]={
-      {ui->phase0GV1Value,ui->phase0GV2Value,ui->phase0GV3Value,ui->phase0GV4Value,ui->phase0GV5Value} ,
-      {ui->phase1GV1Value,ui->phase1GV2Value,ui->phase1GV3Value,ui->phase1GV4Value,ui->phase1GV5Value} ,
-      {ui->phase2GV1Value,ui->phase2GV2Value,ui->phase2GV3Value,ui->phase2GV4Value,ui->phase2GV5Value} ,
-      {ui->phase3GV1Value,ui->phase3GV2Value,ui->phase3GV3Value,ui->phase3GV4Value,ui->phase3GV5Value} ,
-      {ui->phase4GV1Value,ui->phase4GV2Value,ui->phase4GV3Value,ui->phase4GV4Value,ui->phase4GV5Value} ,
-      {ui->phase5GV1Value,ui->phase5GV2Value,ui->phase5GV3Value,ui->phase5GV4Value,ui->phase5GV5Value} ,
-      {ui->phase6GV1Value,ui->phase6GV2Value,ui->phase6GV3Value,ui->phase6GV4Value,ui->phase6GV5Value} ,
-      {ui->phase7GV1Value,ui->phase7GV2Value,ui->phase7GV3Value,ui->phase7GV4Value,ui->phase7GV5Value} ,
-      {ui->phase8GV1Value,ui->phase8GV2Value,ui->phase8GV3Value,ui->phase8GV4Value,ui->phase8GV5Value}
-    };
-
-    QSpinBox * tmp2[9][2]={
-      {ui->phase0RE1Value,ui->phase0RE2Value} ,
-      {ui->phase1RE1Value,ui->phase1RE2Value} ,
-      {ui->phase2RE1Value,ui->phase2RE2Value} ,
-      {ui->phase3RE1Value,ui->phase3RE2Value} ,
-      {ui->phase4RE1Value,ui->phase4RE2Value} ,
-      {ui->phase5RE1Value,ui->phase5RE2Value} ,
-      {ui->phase6RE1Value,ui->phase6RE2Value} ,
-      {ui->phase7RE1Value,ui->phase7RE2Value} ,
-      {ui->phase8RE1Value,ui->phase8RE2Value} ,    
-    };
-
-    memcpy(gvarsSB, tmp, sizeof(gvarsSB));
-    memcpy(reSB, tmp2, sizeof(reSB));
-
-    phasesLock = true;
-    int gvars=0;
-    if (GetEepromInterface()->getCapability(HasVariants)) {
-      if (GetCurrentFirmwareVariant() & GVARS_VARIANT)
-        gvars=1;
-    } else {
-      gvars=GetEepromInterface()->getCapability(Gvars);
-    }
-    if (!GetEepromInterface()->getCapability(RotaryEncoders)) {
-      ui->phase0reGB->hide();
-      ui->phase1reGB->hide();
-      ui->phase2reGB->hide();
-      ui->phase3reGB->hide();
-      ui->phase4reGB->hide();
-      ui->phase5reGB->hide();
-      ui->phase6reGB->hide();
-      ui->phase7reGB->hide();
-      ui->phase8reGB->hide();
-    }
-    if (!GetEepromInterface()->getCapability(GvarsFlightPhases) || gvars==0) {
-      if (!GetEepromInterface()->getCapability(Gvars) || gvars==0) {
-        ui->phase0gvGB->hide();
-      }
-      ui->phase1gvGB->hide();
-      ui->phase2gvGB->hide();
-      ui->phase3gvGB->hide();
-      ui->phase4gvGB->hide();
-      ui->phase5gvGB->hide();
-      ui->phase6gvGB->hide();
-      ui->phase7gvGB->hide();
-      ui->phase8gvGB->hide();
-    }
-
-    if (!GetEepromInterface()->getCapability(GvarsAreNamed)) {
-      ui->phase0GV1Name->hide();
-      ui->phase0GV2Name->hide();
-      ui->phase0GV3Name->hide();
-      ui->phase0GV4Name->hide();
-      ui->phase0GV5Name->hide();  
-      ui->phase0GV6Name->hide();
-      ui->phase0GV7Name->hide();  
-    }
-
-    if (GetEepromInterface()->getCapability(Gvars) &&  gvars==1) {
-      if (!GetEepromInterface()->getCapability(GvarsHaveSources)) {
-        ui->phase0GV1Source->hide();
-        ui->phase0GV2Source->hide();
-        ui->phase0GV3Source->hide();
-        ui->phase0GV4Source->hide();
-        ui->phase0GV5Source->hide();
-        ui->phase0GV6Source->hide();
-        ui->phase0GV7Source->hide();
-      } else {
-        populateGvSourceCB(ui->phase0GV1Source, g_model.gvsource[0]);
-        populateGvSourceCB(ui->phase0GV2Source, g_model.gvsource[1]);
-        populateGvSourceCB(ui->phase0GV3Source, g_model.gvsource[2]);
-        populateGvSourceCB(ui->phase0GV4Source, g_model.gvsource[3]);
-        populateGvSourceCB(ui->phase0GV5Source, g_model.gvsource[4]);  
-        connect(ui->phase0GV1Source,SIGNAL(currentIndexChanged(int)),this,SLOT(GVSource_currentIndexChanged()));
-        connect(ui->phase0GV2Source,SIGNAL(currentIndexChanged(int)),this,SLOT(GVSource_currentIndexChanged()));
-        connect(ui->phase0GV3Source,SIGNAL(currentIndexChanged(int)),this,SLOT(GVSource_currentIndexChanged()));
-        connect(ui->phase0GV4Source,SIGNAL(currentIndexChanged(int)),this,SLOT(GVSource_currentIndexChanged()));
-        connect(ui->phase0GV5Source,SIGNAL(currentIndexChanged(int)),this,SLOT(GVSource_currentIndexChanged()));
-      }
-      if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-        ui->phase0GV1Name->setMaxLength(10);
-        ui->phase0GV2Name->setMaxLength(10);
-        ui->phase0GV3Name->setMaxLength(10);
-        ui->phase0GV4Name->setMaxLength(10);
-        ui->phase0GV5Name->setMaxLength(10);
-      } else {
-        ui->phase0GV1Name->setMaxLength(6);
-        ui->phase0GV2Name->setMaxLength(6);
-        ui->phase0GV3Name->setMaxLength(6);
-        ui->phase0GV4Name->setMaxLength(6);
-        ui->phase0GV5Name->setMaxLength(6);      
-      }
-
-      ui->phase0GV1Name->setText(g_model.gvars_names[0]);
-      ui->phase0GV2Name->setText(g_model.gvars_names[1]);
-      ui->phase0GV3Name->setText(g_model.gvars_names[2]);
-      ui->phase0GV4Name->setText(g_model.gvars_names[3]);
-      ui->phase0GV5Name->setText(g_model.gvars_names[4]);
-      connect(ui->phase0GV1Name,SIGNAL(editingFinished()),this,SLOT(GVName_editingFinished()));
-      connect(ui->phase0GV2Name,SIGNAL(editingFinished()),this,SLOT(GVName_editingFinished()));
-      connect(ui->phase0GV3Name,SIGNAL(editingFinished()),this,SLOT(GVName_editingFinished()));
-      connect(ui->phase0GV4Name,SIGNAL(editingFinished()),this,SLOT(GVName_editingFinished()));
-      connect(ui->phase0GV5Name,SIGNAL(editingFinished()),this,SLOT(GVName_editingFinished()));
-    }
-    if (gvars) {
-      if (GetEepromInterface()->getCapability(GvarsNum)<7) {
-        ui->phase0GV6Name->hide();
-        ui->phase0GV7Name->hide();
-        ui->phase0GV6Source->hide();
-        ui->phase0GV7Source->hide();
-        ui->phase0GV6Value->hide();
-        ui->phase0GV7Value->hide();
-        ui->phase0GV6_Label->hide();
-        ui->phase0GV7_Label->hide();
-      } else {
-        populateGvSourceCB(ui->phase0GV6Source, g_model.gvsource[5]);
-        populateGvSourceCB(ui->phase0GV7Source, g_model.gvsource[6]);  
-        connect(ui->phase0GV6Source,SIGNAL(currentIndexChanged(int)),this,SLOT(GVSource_currentIndexChanged()));
-        connect(ui->phase0GV7Source,SIGNAL(currentIndexChanged(int)),this,SLOT(GVSource_currentIndexChanged()));
-        ui->phase0GV6Name->setText(g_model.gvars_names[5]);
-        ui->phase0GV7Name->setText(g_model.gvars_names[6]);
-        connect(ui->phase0GV6Name,SIGNAL(editingFinished()),this,SLOT(GVName_editingFinished()));
-        connect(ui->phase0GV7Name,SIGNAL(editingFinished()),this,SLOT(GVName_editingFinished()));
-        ui->phase0GV6Value->setValue(g_model.phaseData[0].gvars[5]);
-        ui->phase0GV7Value->setValue(g_model.phaseData[0].gvars[6]);
-        connect(ui->phase0GV6Value,SIGNAL(editingFinished()),this,SLOT(phaseGVValue_editingFinished()));
-        connect(ui->phase0GV7Value,SIGNAL(editingFinished()),this,SLOT(phaseGVValue_editingFinished()));
-      }
-    }
-
-    displayOnePhase(0, ui->phase0Name, NULL,                   ui->phase0FadeIn, ui->phase0FadeOut, NULL,                      ui->phase0Trim1Value, ui->phase0Trim1Label, ui->phase0Trim1Slider, NULL,                       ui->phase0Trim2Value, ui->phase0Trim2Label, ui->phase0Trim2Slider, NULL,                       ui->phase0Trim3Value, ui->phase0Trim3Label, ui->phase0Trim3Slider, NULL,                       ui->phase0Trim4Value, ui->phase0Trim4Label, ui->phase0Trim4Slider, ui->phase0GV1_Label, NULL                    , ui->phase0GV1Value, ui->phase0GV2_Label, NULL                    , ui->phase0GV2Value, ui->phase0GV3_Label, NULL                    , ui->phase0GV3Value, ui->phase0GV4_Label, NULL                    , ui->phase0GV4Value, ui->phase0GV5_Label, NULL                    , ui->phase0GV5Value,ui->phase0REA_Label,NULL, ui->phase0RE1Value,ui->phase0REB_Label, NULL, ui->phase0RE2Value, true);
-    displayOnePhase(1, ui->phase1Name, ui->phase1Switch, ui->phase1FadeIn, ui->phase1FadeOut, ui->phase1Trim1Use, ui->phase1Trim1Value, ui->phase1Trim1Label, ui->phase1Trim1Slider, ui->phase1Trim2Use, ui->phase1Trim2Value, ui->phase1Trim2Label, ui->phase1Trim2Slider, ui->phase1Trim3Use, ui->phase1Trim3Value, ui->phase1Trim3Label, ui->phase1Trim3Slider, ui->phase1Trim4Use, ui->phase1Trim4Value, ui->phase1Trim4Label, ui->phase1Trim4Slider, ui->phase1GV1_Label, ui->phase1GV1Use, ui->phase1GV1Value, ui->phase1GV2_Label, ui->phase1GV2Use, ui->phase1GV2Value, ui->phase1GV3_Label, ui->phase1GV3Use, ui->phase1GV3Value, ui->phase1GV4_Label, ui->phase1GV4Use, ui->phase1GV4Value, ui->phase1GV5_Label, ui->phase1GV5Use, ui->phase1GV5Value,ui->phase1REA_Label, ui->phase1RE1Use, ui->phase1RE1Value,ui->phase1REB_Label, ui->phase1RE2Use, ui->phase1RE2Value, true);
-    displayOnePhase(2, ui->phase2Name, ui->phase2Switch, ui->phase2FadeIn, ui->phase2FadeOut, ui->phase2Trim1Use, ui->phase2Trim1Value, ui->phase2Trim1Label, ui->phase2Trim1Slider, ui->phase2Trim2Use, ui->phase2Trim2Value, ui->phase2Trim2Label, ui->phase2Trim2Slider, ui->phase2Trim3Use, ui->phase2Trim3Value, ui->phase2Trim3Label, ui->phase2Trim3Slider, ui->phase2Trim4Use, ui->phase2Trim4Value, ui->phase2Trim4Label, ui->phase2Trim4Slider, ui->phase2GV1_Label, ui->phase2GV1Use, ui->phase2GV1Value, ui->phase2GV2_Label, ui->phase2GV2Use, ui->phase2GV2Value, ui->phase2GV3_Label, ui->phase2GV3Use, ui->phase2GV3Value, ui->phase2GV4_Label, ui->phase2GV4Use, ui->phase2GV4Value, ui->phase2GV5_Label, ui->phase2GV5Use, ui->phase2GV5Value,ui->phase2REA_Label, ui->phase2RE1Use, ui->phase2RE1Value,ui->phase2REB_Label, ui->phase2RE2Use, ui->phase2RE2Value, true);
-    displayOnePhase(3, ui->phase3Name, ui->phase3Switch, ui->phase3FadeIn, ui->phase3FadeOut, ui->phase3Trim1Use, ui->phase3Trim1Value, ui->phase3Trim1Label, ui->phase3Trim1Slider, ui->phase3Trim2Use, ui->phase3Trim2Value, ui->phase3Trim2Label, ui->phase3Trim2Slider, ui->phase3Trim3Use, ui->phase3Trim3Value, ui->phase3Trim3Label, ui->phase3Trim3Slider, ui->phase3Trim4Use, ui->phase3Trim4Value, ui->phase3Trim4Label, ui->phase3Trim4Slider, ui->phase3GV1_Label, ui->phase3GV1Use, ui->phase3GV1Value, ui->phase3GV2_Label, ui->phase3GV2Use, ui->phase3GV2Value, ui->phase3GV3_Label, ui->phase3GV3Use, ui->phase3GV3Value, ui->phase3GV4_Label, ui->phase3GV4Use, ui->phase3GV4Value, ui->phase3GV5_Label, ui->phase3GV5Use, ui->phase3GV5Value,ui->phase3REA_Label, ui->phase3RE1Use, ui->phase3RE1Value,ui->phase3REB_Label, ui->phase3RE2Use, ui->phase3RE2Value, true);
-    displayOnePhase(4, ui->phase4Name, ui->phase4Switch, ui->phase4FadeIn, ui->phase4FadeOut, ui->phase4Trim1Use, ui->phase4Trim1Value, ui->phase4Trim1Label, ui->phase4Trim1Slider, ui->phase4Trim2Use, ui->phase4Trim2Value, ui->phase4Trim2Label, ui->phase4Trim2Slider, ui->phase4Trim3Use, ui->phase4Trim3Value, ui->phase4Trim3Label, ui->phase4Trim3Slider, ui->phase4Trim4Use, ui->phase4Trim4Value, ui->phase4Trim4Label, ui->phase4Trim4Slider, ui->phase4GV1_Label, ui->phase4GV1Use, ui->phase4GV1Value, ui->phase4GV2_Label, ui->phase4GV2Use, ui->phase4GV2Value, ui->phase4GV3_Label, ui->phase4GV3Use, ui->phase4GV3Value, ui->phase4GV4_Label, ui->phase4GV4Use, ui->phase4GV4Value, ui->phase4GV5_Label, ui->phase4GV5Use, ui->phase4GV5Value,ui->phase4REA_Label, ui->phase4RE1Use, ui->phase4RE1Value,ui->phase4REB_Label, ui->phase4RE2Use, ui->phase4RE2Value, true);
-    displayOnePhase(5, ui->phase5Name, ui->phase5Switch, ui->phase5FadeIn, ui->phase5FadeOut, ui->phase5Trim1Use, ui->phase5Trim1Value, ui->phase5Trim1Label, ui->phase5Trim1Slider, ui->phase5Trim2Use, ui->phase5Trim2Value, ui->phase5Trim2Label, ui->phase5Trim2Slider, ui->phase5Trim3Use, ui->phase5Trim3Value, ui->phase5Trim3Label, ui->phase5Trim3Slider, ui->phase5Trim4Use, ui->phase5Trim4Value, ui->phase5Trim4Label, ui->phase5Trim4Slider, ui->phase5GV1_Label, ui->phase5GV1Use, ui->phase5GV1Value, ui->phase5GV2_Label, ui->phase5GV2Use, ui->phase5GV2Value, ui->phase5GV3_Label, ui->phase5GV3Use, ui->phase5GV3Value, ui->phase5GV4_Label, ui->phase5GV4Use, ui->phase5GV4Value, ui->phase5GV5_Label, ui->phase5GV5Use, ui->phase5GV5Value,ui->phase5REA_Label, ui->phase5RE1Use, ui->phase5RE1Value,ui->phase5REB_Label, ui->phase5RE2Use, ui->phase5RE2Value, true);
-    displayOnePhase(6, ui->phase6Name, ui->phase6Switch, ui->phase6FadeIn, ui->phase6FadeOut, ui->phase6Trim1Use, ui->phase6Trim1Value, ui->phase6Trim1Label, ui->phase6Trim1Slider, ui->phase6Trim2Use, ui->phase6Trim2Value, ui->phase6Trim2Label, ui->phase6Trim2Slider, ui->phase6Trim3Use, ui->phase6Trim3Value, ui->phase6Trim3Label, ui->phase6Trim3Slider, ui->phase6Trim4Use, ui->phase6Trim4Value, ui->phase6Trim4Label, ui->phase6Trim4Slider, ui->phase6GV1_Label, ui->phase6GV1Use, ui->phase6GV1Value, ui->phase6GV2_Label, ui->phase6GV2Use, ui->phase6GV2Value, ui->phase6GV3_Label, ui->phase6GV3Use, ui->phase6GV3Value, ui->phase6GV4_Label, ui->phase6GV4Use, ui->phase6GV4Value, ui->phase6GV5_Label, ui->phase6GV5Use, ui->phase6GV5Value,ui->phase6REA_Label, ui->phase6RE1Use, ui->phase6RE1Value,ui->phase6REB_Label, ui->phase6RE2Use, ui->phase6RE2Value, true);
-    displayOnePhase(7, ui->phase7Name, ui->phase7Switch, ui->phase7FadeIn, ui->phase7FadeOut, ui->phase7Trim1Use, ui->phase7Trim1Value, ui->phase7Trim1Label, ui->phase7Trim1Slider, ui->phase7Trim2Use, ui->phase7Trim2Value, ui->phase7Trim2Label, ui->phase7Trim2Slider, ui->phase7Trim3Use, ui->phase7Trim3Value, ui->phase7Trim3Label, ui->phase7Trim3Slider, ui->phase7Trim4Use, ui->phase7Trim4Value, ui->phase7Trim4Label, ui->phase7Trim4Slider, ui->phase7GV1_Label, ui->phase7GV1Use, ui->phase7GV1Value, ui->phase7GV2_Label, ui->phase7GV2Use, ui->phase7GV2Value, ui->phase7GV3_Label, ui->phase7GV3Use, ui->phase7GV3Value, ui->phase7GV4_Label, ui->phase7GV4Use, ui->phase7GV4Value, ui->phase7GV5_Label, ui->phase7GV5Use, ui->phase7GV5Value,ui->phase7REA_Label, ui->phase7RE1Use, ui->phase7RE1Value,ui->phase7REB_Label, ui->phase7RE2Use, ui->phase7RE2Value, true);
-    displayOnePhase(8, ui->phase8Name, ui->phase8Switch, ui->phase8FadeIn, ui->phase8FadeOut, ui->phase8Trim1Use, ui->phase8Trim1Value, ui->phase8Trim1Label, ui->phase8Trim1Slider, ui->phase8Trim2Use, ui->phase8Trim2Value, ui->phase8Trim2Label, ui->phase8Trim2Slider, ui->phase8Trim3Use, ui->phase8Trim3Value, ui->phase8Trim3Label, ui->phase8Trim3Slider, ui->phase8Trim4Use, ui->phase8Trim4Value, ui->phase8Trim4Label, ui->phase8Trim4Slider, ui->phase8GV1_Label, ui->phase8GV1Use, ui->phase8GV1Value, ui->phase8GV2_Label, ui->phase8GV2Use, ui->phase8GV2Value, ui->phase8GV3_Label, ui->phase8GV3Use, ui->phase8GV3Value, ui->phase8GV4_Label, ui->phase8GV4Use, ui->phase8GV4Value, ui->phase8GV5_Label, ui->phase8GV5Use, ui->phase8GV5Value,ui->phase8REA_Label, ui->phase8RE1Use, ui->phase8RE1Value,ui->phase8REB_Label, ui->phase8RE2Use, ui->phase8RE2Value, true);
-
-    QSlider * tmpsliders[9][4]={
-      {ui->phase0Trim1Slider,ui->phase0Trim2Slider,ui->phase0Trim3Slider,ui->phase0Trim4Slider},
-      {ui->phase1Trim1Slider,ui->phase1Trim2Slider,ui->phase1Trim3Slider,ui->phase1Trim4Slider},
-      {ui->phase2Trim1Slider,ui->phase2Trim2Slider,ui->phase2Trim3Slider,ui->phase2Trim4Slider},
-      {ui->phase3Trim1Slider,ui->phase3Trim2Slider,ui->phase3Trim3Slider,ui->phase3Trim4Slider},
-      {ui->phase4Trim1Slider,ui->phase4Trim2Slider,ui->phase4Trim3Slider,ui->phase4Trim4Slider},
-      {ui->phase5Trim1Slider,ui->phase5Trim2Slider,ui->phase5Trim3Slider,ui->phase5Trim4Slider},
-      {ui->phase6Trim1Slider,ui->phase6Trim2Slider,ui->phase6Trim3Slider,ui->phase6Trim4Slider},
-      {ui->phase7Trim1Slider,ui->phase7Trim2Slider,ui->phase7Trim3Slider,ui->phase7Trim4Slider},
-      {ui->phase8Trim1Slider,ui->phase8Trim2Slider,ui->phase8Trim3Slider,ui->phase8Trim4Slider}
-    };
-    QSpinBox * tmpspinbox[9][4]={
-      {ui->phase0Trim1Value,ui->phase0Trim2Value,ui->phase0Trim3Value,ui->phase0Trim4Value},
-      {ui->phase1Trim1Value,ui->phase1Trim2Value,ui->phase1Trim3Value,ui->phase1Trim4Value},
-      {ui->phase2Trim1Value,ui->phase2Trim2Value,ui->phase2Trim3Value,ui->phase2Trim4Value},
-      {ui->phase3Trim1Value,ui->phase3Trim2Value,ui->phase3Trim3Value,ui->phase3Trim4Value},
-      {ui->phase4Trim1Value,ui->phase4Trim2Value,ui->phase4Trim3Value,ui->phase4Trim4Value},
-      {ui->phase5Trim1Value,ui->phase5Trim2Value,ui->phase5Trim3Value,ui->phase5Trim4Value},
-      {ui->phase6Trim1Value,ui->phase6Trim2Value,ui->phase6Trim3Value,ui->phase6Trim4Value},
-      {ui->phase7Trim1Value,ui->phase7Trim2Value,ui->phase7Trim3Value,ui->phase7Trim4Value},
-      {ui->phase8Trim1Value,ui->phase8Trim2Value,ui->phase8Trim3Value,ui->phase8Trim4Value}
-    };
-    memcpy(phasesTrimSliders,tmpsliders,sizeof(phasesTrimSliders));
-    memcpy(phasesTrimValues,tmpspinbox,sizeof(phasesTrimValues));
-
-    int phases = GetEepromInterface()->getCapability(FlightPhases);
-    if (phases < 9) {
-      ui->phase8->setDisabled(true);
-      ui->phases->removeTab(8);
-    }
-    if (phases < 8) {
-      ui->phase7->setDisabled(true);
-      ui->phases->removeTab(7);
-    }
-    if (phases < 7) {
-      ui->phase6->setDisabled(true);
-      ui->phases->removeTab(6);
-    }
-    if (phases < 6) {
-      ui->phase5->setDisabled(true);
-      ui->phases->removeTab(5);
-    }
-    if (phases < 5) {
-      ui->phase4->setDisabled(true);
-      ui->phases->removeTab(4);
-    }
-    if (phases < 4) {
-      ui->phase3->setDisabled(true);
-      ui->phases->removeTab(3);
-    }
-    if (phases < 3) {
-      ui->phase2->setDisabled(true);
-      ui->phases->removeTab(2);
-    }
-    if (phases < 2) {
-      ui->phase1->setDisabled(true);
-      ui->phases->removeTab(1);
-      ui->phase0Name->setDisabled(true);
-      ui->phase0FadeIn->setDisabled(true);
-      ui->phase0FadeOut->setDisabled(true);
-    }
-    if ( GetEepromInterface()->getCapability(FlightPhasesAreNamed) ) {
-      for (int i=0; i < phases; i++) {
-        QString PhaseName=g_model.phaseData[i].name;
-        QString TabName;
-        if (i==0) { 
-          TabName.append(QObject::tr("Flight Mode 0 (Default)"));
-        } else {
-          TabName.append(QObject::tr("FM %1").arg(i));
-        }
-        if (!PhaseName.isEmpty()) {
-          TabName.append(" (");
-          TabName.append(PhaseName);
-          TabName.append(")");
-        }
-        ui->phases->setTabText(i,TabName);
-      }
-    } else {
-      QLineEdit * tmp[]= { ui->phase0Name,ui->phase1Name,ui->phase2Name,ui->phase3Name,ui->phase4Name,ui->phase5Name,ui->phase6Name,ui->phase7Name,ui->phase8Name};
-      QLabel * tmp2[] = { ui->label_fm0name,ui->label_fm1name,ui->label_fm2name,ui->label_fm3name,ui->label_fm4name,ui->label_fm5name,ui->label_fm6name,ui->label_fm7name,ui->label_fm8name};
-      for (int i=0; i < phases; i++) {
-        tmp[i]->hide();
-        tmp2[i]->hide();
-      }
-    }
-    ui->phases->setCurrentIndex(0);
-    phasesLock = false;
-}
-
-void ModelEdit::on_phases_currentChanged(int index)
-{
-    phasesLock = true;
-    switch(index) {
-      case 1:
-        displayOnePhase(1, NULL, NULL, NULL, NULL, NULL, ui->phase1Trim1Value, NULL, ui->phase1Trim1Slider, NULL, ui->phase1Trim2Value, NULL, ui->phase1Trim2Slider, NULL, ui->phase1Trim3Value, NULL, ui->phase1Trim3Slider, NULL, ui->phase1Trim4Value, NULL, ui->phase1Trim4Slider, NULL, NULL, ui->phase1GV1Value, NULL, NULL, ui->phase1GV2Value, NULL, NULL, ui->phase1GV3Value, NULL, NULL, ui->phase1GV4Value, NULL, NULL, ui->phase1GV5Value,NULL,NULL, ui->phase1RE1Value,NULL,NULL, ui->phase1RE2Value);
-        break;
-      case 2:
-        displayOnePhase(2, NULL, NULL, NULL, NULL, NULL, ui->phase2Trim1Value, NULL, ui->phase2Trim1Slider, NULL, ui->phase2Trim2Value, NULL, ui->phase2Trim2Slider, NULL, ui->phase2Trim3Value, NULL, ui->phase2Trim3Slider, NULL, ui->phase2Trim4Value, NULL, ui->phase2Trim4Slider, NULL, NULL, ui->phase2GV1Value, NULL, NULL, ui->phase2GV2Value, NULL, NULL, ui->phase2GV3Value, NULL, NULL, ui->phase2GV4Value, NULL, NULL, ui->phase2GV5Value,NULL,NULL, ui->phase2RE1Value,NULL,NULL, ui->phase2RE2Value);
-        break;
-      case 3:
-        displayOnePhase(3, NULL, NULL, NULL, NULL, NULL, ui->phase3Trim1Value, NULL, ui->phase3Trim1Slider, NULL, ui->phase3Trim2Value, NULL, ui->phase3Trim2Slider, NULL, ui->phase3Trim3Value, NULL, ui->phase3Trim3Slider, NULL, ui->phase3Trim4Value, NULL, ui->phase3Trim4Slider, NULL, NULL, ui->phase3GV1Value, NULL, NULL, ui->phase3GV2Value, NULL, NULL, ui->phase3GV3Value, NULL, NULL, ui->phase3GV4Value, NULL, NULL, ui->phase3GV5Value,NULL,NULL, ui->phase3RE1Value,NULL,NULL, ui->phase3RE2Value);
-        break;
-      case 4:
-        displayOnePhase(4, NULL, NULL, NULL, NULL, NULL, ui->phase4Trim1Value, NULL, ui->phase4Trim1Slider, NULL, ui->phase4Trim2Value, NULL, ui->phase4Trim2Slider, NULL, ui->phase4Trim3Value, NULL, ui->phase4Trim3Slider, NULL, ui->phase4Trim4Value, NULL, ui->phase4Trim4Slider, NULL, NULL, ui->phase4GV1Value, NULL, NULL, ui->phase4GV2Value, NULL, NULL, ui->phase4GV3Value, NULL, NULL, ui->phase4GV4Value, NULL, NULL, ui->phase4GV5Value,NULL,NULL, ui->phase4RE1Value,NULL,NULL, ui->phase4RE2Value);
-        break;
-      case 5:
-        displayOnePhase(5, NULL, NULL, NULL, NULL, NULL, ui->phase5Trim1Value, NULL, ui->phase5Trim1Slider, NULL, ui->phase5Trim2Value, NULL, ui->phase5Trim2Slider, NULL, ui->phase5Trim3Value, NULL, ui->phase5Trim3Slider, NULL, ui->phase5Trim4Value, NULL, ui->phase5Trim4Slider, NULL, NULL, ui->phase5GV1Value, NULL, NULL, ui->phase5GV2Value, NULL, NULL, ui->phase5GV3Value, NULL, NULL, ui->phase5GV4Value, NULL, NULL, ui->phase5GV5Value,NULL,NULL, ui->phase5RE1Value,NULL,NULL, ui->phase5RE2Value);
-        break;
-      case 6:
-        displayOnePhase(6, NULL, NULL, NULL, NULL, NULL, ui->phase6Trim1Value, NULL, ui->phase6Trim1Slider, NULL, ui->phase6Trim2Value, NULL, ui->phase6Trim2Slider, NULL, ui->phase6Trim3Value, NULL, ui->phase6Trim3Slider, NULL, ui->phase6Trim4Value, NULL, ui->phase6Trim4Slider, NULL, NULL, ui->phase6GV1Value, NULL, NULL, ui->phase6GV2Value, NULL, NULL, ui->phase6GV3Value, NULL, NULL, ui->phase6GV4Value, NULL, NULL, ui->phase6GV5Value,NULL,NULL, ui->phase6RE1Value,NULL,NULL, ui->phase6RE2Value);
-        break;
-      case 7:
-        displayOnePhase(7, NULL, NULL, NULL, NULL, NULL, ui->phase7Trim1Value, NULL, ui->phase7Trim1Slider, NULL, ui->phase7Trim2Value, NULL, ui->phase7Trim2Slider, NULL, ui->phase7Trim3Value, NULL, ui->phase7Trim3Slider, NULL, ui->phase7Trim4Value, NULL, ui->phase7Trim4Slider, NULL, NULL, ui->phase7GV1Value, NULL, NULL, ui->phase7GV2Value, NULL, NULL, ui->phase7GV3Value, NULL, NULL, ui->phase7GV4Value, NULL, NULL, ui->phase7GV5Value,NULL,NULL, ui->phase7RE1Value,NULL,NULL, ui->phase7RE2Value);
-        break;
-      case 8:
-        displayOnePhase(8, NULL, NULL, NULL, NULL, NULL, ui->phase8Trim1Value, NULL, ui->phase8Trim1Slider, NULL, ui->phase8Trim2Value, NULL, ui->phase8Trim2Slider, NULL, ui->phase8Trim3Value, NULL, ui->phase8Trim3Slider, NULL, ui->phase8Trim4Value, NULL, ui->phase8Trim4Slider, NULL, NULL, ui->phase8GV1Value, NULL, NULL, ui->phase8GV2Value, NULL, NULL, ui->phase8GV3Value, NULL, NULL, ui->phase8GV4Value, NULL, NULL, ui->phase8GV5Value,NULL,NULL, ui->phase8RE1Value,NULL,NULL, ui->phase8RE2Value);
-        break;
-    }
-    phasesLock = false;
-}
-
-void ModelEdit::tabExpos()
-{
-    // curDest -> destination channel
-    // i -> mixer number
-    QByteArray qba;
-    ExposlistWidget->clear();
-    int curDest = -1;
-
-    for(int i=0; i<C9X_MAX_EXPOS; i++) {
-      ExpoData *md = &g_model.expoData[i];
-
-      if (md->mode==0) break;
-      QString str = "";
-      while(curDest<(int)md->chn-1) {
-        curDest++;
-        str = getStickStr(curDest);
-        qba.clear();
-        qba.append((quint8)-curDest-1);
-        QListWidgetItem *itm = new QListWidgetItem(str);
-        itm->setData(Qt::UserRole,qba);
-        ExposlistWidget->addItem(itm);
-      }
-
-      if(curDest!=(int)md->chn) {
-        str = getStickStr(md->chn);
-        curDest = md->chn;
-      } else {
-        str = "   ";
-      }
-
-      switch (md->mode) {
-        case (1): str += " <-"; break;
-        case (2): str += " ->"; break;
-        default:  str += "   "; break;
-      };
-
-      str += tr("Weight") + getGVarString(md->weight).rightJustified(6, ' ');
-      if (!GetEepromInterface()->getCapability(ExpoIsCurve)) {
-        if (md->expo!=0)
-          str += " " + tr("Expo") + getGVarString(md->expo, true).rightJustified(7, ' ');
-      } else {
-        if (md->curveMode==0 && md->curveParam!=0)  
-          str += " " + tr("Expo") + getGVarString(md->curveParam, true).rightJustified(7, ' ');
-      }
-      if (GetEepromInterface()->getCapability(FlightPhases)) {
-        if(md->phases) {
-          if (md->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
-            int mask=1;
-            int first=0;
-            for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases);i++) {
-              if (!(md->phases & mask)) {
-                first++;
-              }
-              mask <<=1;
-            }
-            if (first>1) {
-              str += " " + tr("Flight modes") + QString("(");
-            } else {
-              str += " " + tr("Flight mode") + QString("(");
-            }
-            mask=1;
-            first=1;
-            for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases);i++) {
-              if (!(md->phases & mask)) {
-                if (!first) {
-                  str += QString(", ")+ QString("%1").arg(getPhaseName(i+1, g_model.phaseData[i].name));
-                } else {
-                  str += QString("%1").arg(getPhaseName(i+1,g_model.phaseData[i].name));
-                  first=0;
-                }
-              }
-              mask <<=1;
-            }
-            str += QString(")");
-          } else {
-            str += tr("DISABLED")+QString(" !!!");
-          }
-        }
-      } 
-      if (md->swtch.type != SWITCH_TYPE_NONE) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
-      if (md->curveMode)
-        if (md->curveParam) str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(md->curveParam));
-      if (GetEepromInterface()->getCapability(HasExpoNames)) {
-        QString ExpoName;
-        ExpoName.append(md->name);
-        if (!ExpoName.isEmpty()) {
-          str+=QString("(%1)").arg(ExpoName);
-        }
-      }
-      qba.clear();
-      qba.append((quint8)i);
-      qba.append((const char*)md, sizeof(ExpoData));
-      QListWidgetItem *itm = new QListWidgetItem(str);
-      itm->setData(Qt::UserRole,qba);  // expo number
-      ExposlistWidget->addItem(itm);   //(str);
-    }
-
-    while(curDest<NUM_STICKS-1) {
-      curDest++;
-      QString str = getStickStr(curDest);
-      qba.clear();
-      qba.append((quint8)-curDest-1);
-      QListWidgetItem *itm = new QListWidgetItem(str);
-      itm->setData(Qt::UserRole,qba); // add new expo
-      ExposlistWidget->addItem(itm);
-    }
-}
-
-void ModelEdit::exposEdited()
-{
-    updateSettings();
-}
-
-void ModelEdit::tabMixes()
-{
-    // curDest -> destination channel4
-    // i -> mixer number
-    QByteArray qba;
-    MixerlistWidget->clear();
-    unsigned int curDest = 0;
-    int i;
-    unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
-    int showNames=ui->showNames_Ckb->isChecked();
-    for(i=0; i<GetEepromInterface()->getCapability(Mixes); i++) {
-      MixData *md = &g_model.mixData[i];
-      if ((md->destCh==0) || (md->destCh>outputs+(unsigned int)GetEepromInterface()->getCapability(ExtraChannels))) continue; 
-      QString str = "";
-      while(curDest<(md->destCh-1)) {
-        curDest++;
-        if (curDest > outputs) {
-          str = tr("X%1  ").arg(curDest-outputs);
-        } else {
-          str = tr("CH%1%2").arg(curDest/10).arg(curDest%10);
-          if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
-            QString name=g_model.limitData[curDest-1].name;
-            if (!name.isEmpty()) {
-              name.append("     ");
-              str=name.left(6);
-            }
-          }
-        }
-        qba.clear();
-        qba.append((quint8)-curDest);
-        QListWidgetItem *itm = new QListWidgetItem(str);
-        itm->setData(Qt::UserRole,qba);
-        MixerlistWidget->addItem(itm);
-      }
-
-      if (md->destCh > outputs) {
-        str = tr("X%1  ").arg(md->destCh-outputs);
-      } else {
-        str = tr("CH%1%2").arg(md->destCh/10).arg(md->destCh%10);
-        str.append("  ");
-        if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
-          QString name=g_model.limitData[md->destCh-1].name;
-          if (!name.isEmpty()) {
-            name.append("     ");
-            str=name.left(6);
-          }
-        }
-      }
-      if (curDest != md->destCh) {
-        curDest = md->destCh;
-      } else {
-        str.fill(' ');
-      }
-
-      switch(md->mltpx) {
-        case (1): str += " *"; break;
-        case (2): str += " R"; break;
-        default:  str += "  "; break;
-      };
-
-      str += " " + getGVarString(md->weight, true).rightJustified(6, ' ');
-      str += md->srcRaw.toString();
-      unsigned int fpCount = GetEepromInterface()->getCapability(FlightPhases);
-      if (GetEepromInterface()->getCapability(FlightPhases)) {
-        if(md->phases) {
-          if (md->phases!=(unsigned int)(1<<fpCount)-1) {
-            int mask=1;
-            int first=0;
-            for (unsigned int i=0; i<fpCount; i++) {
-              if (!(md->phases & mask)) {
-                first++;
-              }
-              mask <<=1;
-            }
-            if (first>1) {
-              str += " " + tr("Flight modes") + QString("(");
-            } else {
-              str += " " + tr("Flight mode") + QString("(");
-            }
-            mask=1;
-            first=1;
-            for (unsigned int i=0; i<fpCount; i++) {
-              if (!(md->phases & mask)) {
-                if (!first) {
-                  str += QString(", ")+ QString("%1").arg(getPhaseName(i+1, g_model.phaseData[i].name));
-                }
-                else {
-                  str += QString("%1").arg(getPhaseName(i+1,g_model.phaseData[i].name));
-                  first=0;
-                }
-              }
-              mask <<=1;
-            }
-            str += QString(")");
-          } else {
-            str += tr("DISABLED")+QString(" !!!");
-          }
-        }
-      }
-      if(md->swtch.type != SWITCH_TYPE_NONE) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
-      if(md->carryTrim>0) {
-        str += " " +tr("No Trim");
-      } else if (md->carryTrim<0) {
-        str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
-      }
-      if(md->noExpo) {
-        str += " " +tr("No DR/Expo");
-      } 
-      if (GetEepromInterface()->getCapability(MixFmTrim) && md->enableFmTrim==1) {
-        if (md->sOffset) str += " " + tr("FMTrim") + QString("(%1%)").arg(md->sOffset);
-      } else {
-        if (md->sOffset) str += " " + tr("Offset") + getGVarString(md->sOffset);
-      }
-      if (md->differential) str += " " + tr("Diff") + getGVarString(md->differential);
-      if (md->curve) str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(md->curve));
-      int scale=GetEepromInterface()->getCapability(SlowScale);
-      if (scale==0)
-        scale=1;
-      if (md->delayDown || md->delayUp)
-        str += tr(" Delay(u%1:d%2)").arg((double)md->delayUp/scale).arg((double)md->delayDown/scale);
-      if (md->speedDown || md->speedUp)
-        str += tr(" Slow(u%1:d%2)").arg((double)md->speedUp/scale).arg((double)md->speedDown/scale);
-      if (md->mixWarn)  str += tr(" Warn(%1)").arg(md->mixWarn);
-      if (GetEepromInterface()->getCapability(HasMixerNames)) {
-        QString MixerName;
-        MixerName.append(md->name);
-        if (!MixerName.isEmpty()) {
-          str+=QString("(%1)").arg(MixerName);
-        }
-      }
-      qba.clear();
-      qba.append((quint8)i);
-      qba.append((const char*)md, sizeof(MixData));
-      QListWidgetItem *itm = new QListWidgetItem(str);
-      itm->setData(Qt::UserRole,qba);  // mix number
-      MixerlistWidget->addItem(itm);//(str);
-    }
-
-    while(curDest<outputs+GetEepromInterface()->getCapability(ExtraChannels)) {
-      curDest++;
-      QString str;
-
-      if (curDest > outputs) {
-        str = tr("X%1  ").arg(curDest-outputs);
-      } else {
-        str = tr("CH%1%2").arg(curDest/10).arg(curDest%10);
-        if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
-          QString name=g_model.limitData[curDest-1].name;
-          if (!name.isEmpty()) {
-            name.append("     ");
-            str=name.left(6);
-          }
-        }
-      }
-      qba.clear();
-      qba.append((quint8)-curDest);
-      QListWidgetItem *itm = new QListWidgetItem(str);
-      itm->setData(Qt::UserRole,qba); // add new mixer
-      MixerlistWidget->addItem(itm);
-    }
-}
-
-void ModelEdit::mixesEdited()
-{
-    updateSettings();
-}
-
-
-void ModelEdit::tabHeli()
-{
-    updateHeliTab();
-
-    connect(ui->swashTypeCB,SIGNAL(currentIndexChanged(int)),this,SLOT(heliEdited()));
-    connect(ui->swashCollectiveCB,SIGNAL(currentIndexChanged(int)),this,SLOT(heliEdited()));
-    connect(ui->swashRingValSB,SIGNAL(editingFinished()),this,SLOT(heliEdited()));
-    connect(ui->swashInvertELE,SIGNAL(stateChanged(int)),this,SLOT(heliEdited()));
-    connect(ui->swashInvertAIL,SIGNAL(stateChanged(int)),this,SLOT(heliEdited()));
-    connect(ui->swashInvertCOL,SIGNAL(stateChanged(int)),this,SLOT(heliEdited()));
-}
-
-void ModelEdit::updateHeliTab()
-{
-    heliEditLock = true;
-
-    ui->swashTypeCB->setCurrentIndex(g_model.swashRingData.type);
-    populateSourceCB(ui->swashCollectiveCB, g_model.swashRingData.collectiveSource, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS);
-    ui->swashRingValSB->setValue(g_model.swashRingData.value);
-    ui->swashInvertELE->setChecked(g_model.swashRingData.invertELE);
-    ui->swashInvertAIL->setChecked(g_model.swashRingData.invertAIL);
-    ui->swashInvertCOL->setChecked(g_model.swashRingData.invertCOL);
-
-    heliEditLock = false;
-}
-
-void ModelEdit::heliEdited()
-{
-    if(heliEditLock) return;
-    g_model.swashRingData.type  = ui->swashTypeCB->currentIndex();
-    g_model.swashRingData.collectiveSource = ui->swashCollectiveCB->itemData(ui->swashCollectiveCB->currentIndex()).toInt();
-    g_model.swashRingData.value = ui->swashRingValSB->value();
-    g_model.swashRingData.invertELE = ui->swashInvertELE->isChecked();
-    g_model.swashRingData.invertAIL = ui->swashInvertAIL->isChecked();
-    g_model.swashRingData.invertCOL = ui->swashInvertCOL->isChecked();
-    updateSettings();
-}
-
-void ModelEdit::tabLimits()
-{
-    limitEditLock=true;
-    int chnames=GetEepromInterface()->getCapability(HasChNames);
-    QRegExp rx(CHAR_FOR_NAMES_REGEX);
-    foreach(QLineEdit *le, findChildren<QLineEdit *>(QRegExp("CHName_[0-9]+"))) {
-      int len=le->objectName().mid(le->objectName().lastIndexOf("_")+1).toInt()-1;
-      if (chnames ) {
-        QString name=g_model.limitData[len].name;
-        if (name.trimmed().isEmpty()) {
-          le->setText(tr("CH %1").arg(len+1));
-        } else {
-          le->setText(name);
-        }
-        le->setValidator(new QRegExpValidator(rx, this));
-        le->setEnabled(true);
-        le->setReadOnly(false);
-        connect(le, SIGNAL(editingFinished()), this, SLOT(limitNameEdited()));
-      } else {
-        le->setText(tr("CH %1").arg(len+1));
-        le->setDisabled(true);
-        le->setReadOnly(true);
-      }
-    }
-    limitEditLock=false;
-    foreach(QDoubleSpinBox *sb, findChildren<QDoubleSpinBox *>(QRegExp("offsetDSB_[0-9]+"))) {
-      int sbn=sb->objectName().mid(sb->objectName().lastIndexOf("_")+1).toInt()-1;
-      sb->setValue(g_model.limitData[sbn].offset/10.0);
-      connect(sb, SIGNAL(editingFinished()), this, SLOT(limitOffsetEdited()));
-    }
-
-    foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("minSB_[0-9]+"))) {
-      int sbn=sb->objectName().mid(sb->objectName().lastIndexOf("_")+1).toInt()-1;
-      sb->setValue(g_model.limitData[sbn].min);
-      connect(sb, SIGNAL(editingFinished()), this, SLOT(limitEdited()));
-    }
-
-    foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("maxSB_[0-9]+"))) {
-      int sbn=sb->objectName().mid(sb->objectName().lastIndexOf("_")+1).toInt()-1;
-      sb->setValue(g_model.limitData[sbn].max);
-      connect(sb, SIGNAL(editingFinished()), this, SLOT(limitEdited()));
-    }
-
-    foreach(QComboBox *cb, findChildren<QComboBox *>(QRegExp("chInvCB_[0-9]+"))) {
-      int cbn=cb->objectName().mid(cb->objectName().lastIndexOf("_")+1).toInt()-1;
-      cb->setCurrentIndex((g_model.limitData[cbn].revert) ? 1 : 0);
-      connect(cb, SIGNAL(currentIndexChanged(int)), this, SLOT(limitInvEdited()));
-    }
-    if (GetEepromInterface()->getCapability(PPMCenter)) {
-      foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("ppmcenter_[0-9]+"))) {
-        int sbn=sb->objectName().mid(sb->objectName().lastIndexOf("_")+1).toInt()-1;
-        sb->setValue(g_model.limitData[sbn].ppmCenter+1500);
-        connect(sb, SIGNAL(editingFinished()), this, SLOT(ppmcenterEdited()));
-      }
-    } else {
-      foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("ppmcenter_[0-9]+"))) {
-        sb->hide();
-      }
-      ui->ppmc_label1->hide();
-      ui->ppmc_label2->hide();
-    }
-
-    if (GetEepromInterface()->getCapability(SYMLimits)) {
-      foreach(QCheckBox *ckb, findChildren<QCheckBox *>(QRegExp("symckb_[0-9]+"))) {
-        int ckbn=ckb->objectName().mid(ckb->objectName().lastIndexOf("_")+1).toInt()-1;
-        ckb->setChecked(g_model.limitData[ckbn].symetrical);
-        connect(ckb, SIGNAL(toggled(bool)), this, SLOT(limitSymEdited()));
-      }
-    } else {
-      foreach(QCheckBox *ckb, findChildren<QCheckBox *>(QRegExp("symckb_[0-9]+"))) {
-        ckb->hide();
-      }
-      ui->label_sym01->hide();
-      ui->label_sym02->hide();
-    }
-
-    if (GetEepromInterface()->getCapability(Outputs)<17) {
-      ui->limitGB2->hide();
-    }
-    setLimitMinMax();
-}
-
-void ModelEdit::updateCurvesTab()
-{
-    ControlCurveSignal(true);
-    foreach(QCheckBox *ChkB, findChildren<QCheckBox *>(QRegExp("plotCB_[0-9]+"))) {
-      int ChkBn=ChkB->objectName().mid(ChkB->objectName().lastIndexOf("_")+1).toInt()-1;
-      ChkB->setChecked(plot_curve[ChkBn]);
-    }
-    ControlCurveSignal(false);
-}
-
-
-void ModelEdit::tabCurves()
-{
-    QSpinBox* tmpy[17] = {
-      ui->curvePt01_y, ui->curvePt02_y, ui->curvePt03_y, ui->curvePt04_y, ui->curvePt05_y,
-      ui->curvePt06_y, ui->curvePt07_y, ui->curvePt08_y, ui->curvePt09_y, ui->curvePt10_y,
-      ui->curvePt11_y, ui->curvePt12_y, ui->curvePt13_y, ui->curvePt14_y, ui->curvePt15_y,
-      ui->curvePt16_y, ui->curvePt17_y };
-    QSpinBox* tmpx[17] = {
-      ui->curvePt01_x, ui->curvePt02_x, ui->curvePt03_x, ui->curvePt04_x, ui->curvePt05_x,
-      ui->curvePt06_x, ui->curvePt07_x, ui->curvePt08_x, ui->curvePt09_x, ui->curvePt10_x,
-      ui->curvePt11_x, ui->curvePt12_x, ui->curvePt13_x, ui->curvePt14_x, ui->curvePt15_x,
-      ui->curvePt16_x, ui->curvePt17_x };
-
-    QPushButton * editb[16]= {
-      ui->curveEdit_1,ui->curveEdit_2,ui->curveEdit_3,ui->curveEdit_4,
-      ui->curveEdit_5,ui->curveEdit_6,ui->curveEdit_7,ui->curveEdit_8,
-      ui->curveEdit_9,ui->curveEdit_10,ui->curveEdit_11,ui->curveEdit_12,
-      ui->curveEdit_13,ui->curveEdit_14,ui->curveEdit_15,ui->curveEdit_16 };
-
-    QPushButton * resetb[16]= {
-      ui->resetCurve_1,ui->resetCurve_2,ui->resetCurve_3,ui->resetCurve_4,
-      ui->resetCurve_5,ui->resetCurve_6,ui->resetCurve_7,ui->resetCurve_8,
-      ui->resetCurve_9,ui->resetCurve_10,ui->resetCurve_11,ui->resetCurve_12,
-      ui->resetCurve_13,ui->resetCurve_14,ui->resetCurve_15,ui->resetCurve_16 };
-
-    QCheckBox * plotcb[16]= {
-      ui->plotCB_1,ui->plotCB_2,ui->plotCB_3,ui->plotCB_4,
-      ui->plotCB_5,ui->plotCB_6,ui->plotCB_7,ui->plotCB_8,
-      ui->plotCB_9,ui->plotCB_10,ui->plotCB_11,ui->plotCB_12,
-      ui->plotCB_13,ui->plotCB_14,ui->plotCB_15,ui->plotCB_16 };
-
-    memcpy(spny, tmpy, sizeof(spny));
-    memcpy(spnx, tmpx, sizeof(spnx));
-    int numcurves=GetEepromInterface()->getCapability(NumCurves);
-    if (numcurves==0) {
-      numcurves=16;
-    }
-
-    if (!GetEepromInterface()->getCapability(CustomCurves)){
-      ui->curvetype_CB->setDisabled(true);
-      int count=0;
-      for (int i=0; i< GetEepromInterface()->getCapability(NumCurves3); i++) {
-          g_model.curves[count].count=3;
-          g_model.curves[count].custom=false;
-          count++;
-      }
-      for (int i=0; i< GetEepromInterface()->getCapability(NumCurves5); i++) {
-          g_model.curves[count].count=5;
-          g_model.curves[count].custom=false;
-          count++;
-      }
-      for (int i=0; i< GetEepromInterface()->getCapability(NumCurves9); i++) {
-          g_model.curves[count].count=9;
-          g_model.curves[count].custom=false;
-          count++;
-      }
-      for (int i=count; i< 16; i++) {
-          editb[i]->hide();
-          plotcb[i]->hide();
-          resetb[i]->hide();
-      }
-
-    } else {
-      ui->curvetype_CB->setEnabled(true);
-    }
-    if (!GetEepromInterface()->getCapability(HasCvNames)){
-      ui->cname_LE->hide();
-      ui->cname_label->hide();
-    } else {    
-      ui->cname_LE->setText(g_model.curves[0].name);
-    }
-
-    for (int i=numcurves; i<16;i++) {
-      editb[i]->hide();
-      resetb[i]->hide();
-      plotcb[i]->hide();
-    }
-
-
-    for (int i=0; i<16;i++) {
-      plot_curve[i]=FALSE;
-    }
-    redrawCurve=true;
-    drawing=false;
-#ifdef __APPLE__
-    ui->curveEdit_1->setStyleSheet("color: #00007f;");
-    ui->curveEdit_2->setStyleSheet("color: #007f00;");
-    ui->curveEdit_3->setStyleSheet("color: #7f0000;");
-    ui->curveEdit_4->setStyleSheet("color: #007f7f;");
-    ui->curveEdit_5->setStyleSheet("color: #7f007f;");
-    ui->curveEdit_6->setStyleSheet("color: #7f7f00;");
-    ui->curveEdit_7->setStyleSheet("color: #7f7f7f;");
-    ui->curveEdit_8->setStyleSheet("color: #0000ff;");
-    ui->curveEdit_9->setStyleSheet("color: #007fff;");
-    ui->curveEdit_10->setStyleSheet("color: #7f00ff;");
-    ui->curveEdit_11->setStyleSheet("color: #00ff00;");
-    ui->curveEdit_12->setStyleSheet("color: #00ff7f;");
-    ui->curveEdit_13->setStyleSheet("color: #7fff00;");
-    ui->curveEdit_14->setStyleSheet("color: #ff0000;");
-    ui->curveEdit_15->setStyleSheet("color: #ff007f;");
-    ui->curveEdit_16->setStyleSheet("color: #ff7f00;");
-#else  
-    ui->curveEdit_1->setStyleSheet("background-color: #00007f; color: white;");
-    ui->curveEdit_2->setStyleSheet("background-color: #007f00; color: white;");
-    ui->curveEdit_3->setStyleSheet("background-color: #7f0000; color: white;");
-    ui->curveEdit_4->setStyleSheet("background-color: #007f7f; color: white;");
-    ui->curveEdit_5->setStyleSheet("background-color: #7f007f; color: white;");
-    ui->curveEdit_6->setStyleSheet("background-color: #7f7f00; color: white;");
-    ui->curveEdit_7->setStyleSheet("background-color: #7f7f7f; color: white;");
-    ui->curveEdit_8->setStyleSheet("background-color: #0000ff; color: white;");
-    ui->curveEdit_9->setStyleSheet("background-color: #007fff; color: white;");
-    ui->curveEdit_10->setStyleSheet("background-color: #7f00ff; color: white;");
-    ui->curveEdit_11->setStyleSheet("background-color: #00ff00; color: white;");
-    ui->curveEdit_12->setStyleSheet("background-color: #00ff7f; color: white;");
-    ui->curveEdit_13->setStyleSheet("background-color: #7fff00; color: white;");
-    ui->curveEdit_14->setStyleSheet("background-color: #ff0000; color: white;");
-    ui->curveEdit_15->setStyleSheet("background-color: #ff007f; color: white;");
-    ui->curveEdit_16->setStyleSheet("background-color: #ff7f00; color: white;");
-#endif
-    updateCurvesTab();
-
-    QGraphicsScene *scene = new QGraphicsScene(ui->curvePreview);
-    scene->setItemIndexMethod(QGraphicsScene::NoIndex);
-    ui->curvePreview->setScene(scene);
-    currentCurve = 0;
-
-    connect(ui->clearMixesPB,SIGNAL(pressed()),this,SLOT(clearCurves()));
-
-    foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("curvePt[0-9]+"))) {
-      connect(sb, SIGNAL(valueChanged(int)), this, SLOT(curvePointEdited()));
-    }
-
-    foreach(QPushButton *pb, findChildren<QPushButton *>(QRegExp("resetCurve_[0-9]+"))) {
-      connect(pb, SIGNAL(clicked()), this, SLOT(resetCurve()));
-    }
-
-    foreach(QPushButton *pb, findChildren<QPushButton *>(QRegExp("curveEdit_[0-9]+"))) {
-      connect(pb, SIGNAL(clicked()), this, SLOT(editCurve()));
-    }
-
-    foreach(QCheckBox *ChkB, findChildren<QCheckBox *>(QRegExp("plotCB_[0-9]+"))) {
-      connect(ChkB, SIGNAL(toggled(bool)), this, SLOT(plotCurve(bool)));
-    }
-    setCurrentCurve(currentCurve);
-    ui->ca_coeff_SB->hide();
-    ui->ca_coeff_label->hide();
-    ui->ca_ymid_SB->hide();
-    ui->ca_ymid_label->hide();
-}
-
-void ModelEdit::on_ca_ctype_CB_currentIndexChanged()
-{
-    int index=ui->ca_ctype_CB->currentIndex();
-    switch (index) {
-      case 0:
-        ui->ca_coeff_SB->hide();
-        ui->ca_coeff_label->hide();
-        ui->ca_ymid_SB->hide();
-        ui->ca_ymid_label->hide();
-        ui->ca_ymin_SB->show();
-        ui->ca_ymin_label->show();
-        ui->ca_ymin_SB->setValue(-100);
-        ui->ca_ymax_SB->setValue(100);
-        break;
-      case 1:
-        ui->ca_coeff_SB->show();
-        ui->ca_coeff_label->show();
-        ui->ca_ymid_SB->hide();
-        ui->ca_ymid_label->hide();
-        ui->ca_ymin_SB->show();
-        ui->ca_ymin_label->show();
-        ui->ca_ymin_SB->setValue(-100);
-        ui->ca_ymax_SB->setValue(100);
-        break;
-      case 2:
-        ui->ca_coeff_SB->show();
-        ui->ca_coeff_label->show();
-        ui->ca_ymid_SB->hide();
-        ui->ca_ymid_label->hide();
-        ui->ca_ymin_SB->hide();
-        ui->ca_ymin_label->hide();
-        ui->ca_ymax_SB->setValue(100);      
-        break;
-      case 3:
-        ui->ca_coeff_SB->show();
-        ui->ca_coeff_label->show();
-        ui->ca_ymid_SB->show();
-        ui->ca_ymid_label->show();
-        ui->ca_ymin_SB->hide();
-        ui->ca_ymin_label->hide();
-        ui->ca_ymid_SB->setValue(0);
-        ui->ca_ymax_SB->setValue(100);      
-        break;
-    }
-}
-
-void ModelEdit::on_ca_apply_PB_clicked()
-{
-    int index=ui->ca_ctype_CB->currentIndex();
-    float x;
-    int y;
-    int invert=0;
-    float a;
-    if (index==0) {
-      a=(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/200.0;
-      int numpoints=g_model.curves[currentCurve].count;
-      for (int i=0; i<numpoints; i++) {
-        if (g_model.curves[currentCurve].custom) {
-          x=(g_model.curves[currentCurve].points[i].x+100);
-        } else {
-          x=(200.0/(numpoints-1))*i;
-        }
-        y=ui->ca_ymin_SB->value()+a*x;
-        switch (ui->ca_side_CB->currentIndex()) {
-          case 0:
-            g_model.curves[currentCurve].points[i].y=y;
-            break;
-          case 1:
-            if (x>=100) {
-              g_model.curves[currentCurve].points[i].y=y;
-            }
-            break;
-          case 2:
-            if (x<100) {
-              g_model.curves[currentCurve].points[i].y=y;
-            }
-            break;
-        }
-      }
-    } else if (index==1) {
-      int numpoints=g_model.curves[currentCurve].count;
-      for (int i=0; i<numpoints; i++) {
-        if (g_model.curves[currentCurve].custom) {
-          x=((g_model.curves[currentCurve].points[i].x)+100)/2.0;
-        } else {
-          x=(100.0/(numpoints-1))*i;
-        }
-        a=ui->ca_coeff_SB->value();
-        if (a>=0) {
-          y=round(c9xexpou(x,a)*(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/100.0+ui->ca_ymin_SB->value());
-        } else {
-          a=-a;
-          x=100-x;
-          y=round((100.0-c9xexpou(x,a))*(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/100.0+ui->ca_ymin_SB->value());
-        }
-        switch (ui->ca_side_CB->currentIndex()) {
-          case 0:
-            g_model.curves[currentCurve].points[i].y=y;
-            break;
-          case 1:
-            if (x>=50) {
-              g_model.curves[currentCurve].points[i].y=y;
-            }
-            break;
-          case 2:
-            if (x<50) {
-              g_model.curves[currentCurve].points[i].y=y;
-            }
-            break;
-        }
-      }
-    } else if (index==2) {
-      int numpoints=g_model.curves[currentCurve].count;
-      for (int i=0; i<numpoints; i++) {
-        if (g_model.curves[currentCurve].custom) {
-          x=(g_model.curves[currentCurve].points[i].x);
-        } else {
-          x=-100.0+(200.0/(numpoints-1))*i;
-        }
-        a=ui->ca_coeff_SB->value();
-        if (x<0) {
-          x=-x;
-          invert=1; 
-        } else {
-          invert=0;
-        }
-        if (a>=0) {
-          y=round(c9xexpou(x,a)*(ui->ca_ymax_SB->value()/100.0));
-        } else {
-          a=-a;
-          x=100-x;
-          y=round((100.0-c9xexpou(x,a))*(ui->ca_ymax_SB->value()/100.0));
-        }
-        switch (ui->ca_side_CB->currentIndex()) {
-          case 0:
-            if (invert==1) {
-              g_model.curves[currentCurve].points[i].y=-y;
-            } else {
-              g_model.curves[currentCurve].points[i].y=y;
-            }
-            break;
-          case 1:
-            if (invert==0) {
-              g_model.curves[currentCurve].points[i].y=y;
-            }
-            break;
-          case 2:
-            if (invert==1) {
-              g_model.curves[currentCurve].points[i].y=-y;
-            }
-            break;
-        }      
-      }
-    } else if (index==3) {
-      int numpoints=g_model.curves[currentCurve].count;
-      for (int i=0; i<numpoints; i++) {
-        if (g_model.curves[currentCurve].custom) {
-          x=(g_model.curves[currentCurve].points[i].x);
-        } else {
-          x=-100.0+(200.0/(numpoints-1))*i;
-        }
-        int pos=(x>=0);
-        a=ui->ca_coeff_SB->value();
-        if (x<0) {
-          x=-x;
-        }
-        if (a>=0) {
-          y=round(c9xexpou(x,a)*((ui->ca_ymax_SB->value()-ui->ca_ymid_SB->value())/100.0)+ui->ca_ymid_SB->value());
-        } else {
-          a=-a;
-          x=100-x;
-          y=round((100.0-c9xexpou(x,a))*((ui->ca_ymax_SB->value()-ui->ca_ymid_SB->value())/100.0)+ui->ca_ymid_SB->value());
-        }
-        switch (ui->ca_side_CB->currentIndex()) {
-          case 0:
-            g_model.curves[currentCurve].points[i].y=y;
-            break;
-          case 1:
-            if (pos) {
-              g_model.curves[currentCurve].points[i].y=y;
-            }
-            break;
-          case 2:
-            if (!pos) {
-              g_model.curves[currentCurve].points[i].y=y;
-            }
-            break;
-        }
-      }
-    }  
-    updateSettings();
-    setCurrentCurve(currentCurve);
-    drawCurve();
-}
-
-void ModelEdit::limitSymEdited()
-{
-    QCheckBox *ckb = qobject_cast<QCheckBox*>(sender());
-    int limitId=ckb->objectName().mid(ckb->objectName().lastIndexOf("_")+1).toInt()-1;
-    g_model.limitData[limitId].symetrical = (ckb->checkState() ? 1 : 0);
-    updateSettings(); 
-}
-
-void ModelEdit::limitNameEdited()
-{
-    if(limitEditLock) return;
-    limitEditLock=true;
-    QLineEdit *le = qobject_cast<QLineEdit*>(sender());
-    int limitId=le->objectName().mid(le->objectName().lastIndexOf("_")+1).toInt()-1;
-    int i=0;
-    if (le->text()==tr("CH %1").arg(limitId+1)) {
-      le->setText("");
-    }
-    for (i=0; i<le->text().toAscii().length(); i++) {
-      g_model.limitData[limitId].name[i]=le->text().toAscii().at(i);
-    }
-    if (le->text().trimmed().isEmpty()) {
-      le->setText(tr("CH %1").arg(limitId+1));
-    }
-    g_model.limitData[limitId].name[i]=0;
-    updateSettings();
-    tabMixes();
-    limitEditLock=false;
-}
-
-
-void ModelEdit::limitOffsetEdited()
-{
-    QDoubleSpinBox *dsb = qobject_cast<QDoubleSpinBox*>(sender());
-    int limitId=dsb->objectName().mid(dsb->objectName().lastIndexOf("_")+1).toInt()-1;
-    g_model.limitData[limitId].offset = round(dsb->value()*10);
-    updateSettings(); 
-}
-
-void ModelEdit::limitEdited()
-{
-    QSpinBox *sb = qobject_cast<QSpinBox*>(sender());
-    int limitId=sb->objectName().mid(sb->objectName().lastIndexOf("_")+1).toInt()-1;
-    if (sb->objectName().indexOf("max")!=-1) {
-      g_model.limitData[limitId].max = sb->value();
-    }
-    else {
-      g_model.limitData[limitId].min = sb->value();
-    }
-    updateSettings();
-}
-
-void ModelEdit::limitInvEdited()
-{
-    QComboBox *cb = qobject_cast<QComboBox*>(sender());
-    int limitId=cb->objectName().mid(cb->objectName().lastIndexOf("_")+1).toInt()-1;
-    g_model.limitData[limitId].revert = cb->currentIndex();
-    updateSettings();
-}
-
-void ModelEdit::ppmcenterEdited()
-{
-    QSpinBox *sb = qobject_cast<QSpinBox*>(sender());
-    int limitId=sb->objectName().mid(sb->objectName().lastIndexOf("_")+1).toInt()-1;
-    g_model.limitData[limitId].ppmCenter = sb->value()-1500;
-    updateSettings();
-}
-
-void ModelEdit::startupSwitchEdited()
-{
-    if (GetEepromInterface()->getCapability(Pots)==3) {
-      uint8_t i= 0;
-      i|=(uint8_t)ui->swwarn0_CB->currentIndex();
-      if (i==1) {
-        ui->swwarn1_ChkB->setDisabled(true) ;
-        ui->swwarn2_ChkB->setDisabled(true) ;
-        ui->swwarn3_ChkB->setDisabled(true) ;
-        ui->swwarn4_CB->setDisabled(true) ;
-        ui->swwarn5_ChkB->setDisabled(true) ;
-        ui->swwarn6_ChkB->setDisabled(true) ;
-      } else {
-        ui->swwarn1_ChkB->setEnabled(true) ;
-        ui->swwarn2_ChkB->setEnabled(true) ;
-        ui->swwarn3_ChkB->setEnabled(true) ;
-        ui->swwarn4_CB->setEnabled(true) ;
-        ui->swwarn5_ChkB->setEnabled(true) ;
-        ui->swwarn6_ChkB->setEnabled(true) ;
-        i|=(ui->swwarn1_ChkB->isChecked() ? 1 : 0)<<1;
-        i|=(ui->swwarn2_ChkB->isChecked() ? 1 : 0)<<2;
-        i|=(ui->swwarn3_ChkB->isChecked() ? 1 : 0)<<3;
-        i|=((uint8_t)ui->swwarn4_CB->currentIndex() & 0x03)<<4;
-        i|=(ui->swwarn5_ChkB->isChecked() ? 1 : 0)<<6;
-        i|=(ui->swwarn6_ChkB->isChecked() ? 1 : 0)<<7;
-      }
-      g_model.switchWarningStates=i;
-    } else {
-      uint16_t i= 0;
-      i|=(uint16_t)ui->tswwarn0_CB->currentIndex();
-      if (i==1) {
-        ui->chkSA->setDisabled(true);
-        ui->chkSB->setDisabled(true);
-        ui->chkSC->setDisabled(true);
-        ui->chkSD->setDisabled(true);
-        ui->chkSE->setDisabled(true);
-        ui->chkSF->setDisabled(true);
-        ui->chkSG->setDisabled(true);
-      } else {
-        ui->chkSA->setEnabled(true);
-        ui->chkSB->setEnabled(true);
-        ui->chkSC->setEnabled(true);
-        ui->chkSD->setEnabled(true);
-        ui->chkSE->setEnabled(true);
-        ui->chkSF->setEnabled(true);
-        ui->chkSG->setEnabled(true);
-        i|=(((uint16_t)ui->chkSA->value())<<1);
-        i|=(((uint16_t)ui->chkSB->value())<<3);
-        i|=(((uint16_t)ui->chkSC->value())<<5);
-        i|=(((uint16_t)ui->chkSD->value())<<7);
-        i|=(((uint16_t)ui->chkSE->value())<<9);
-        i|=(((uint16_t)ui->chkSF->value())<<12);
-        i|=(((uint16_t)ui->chkSG->value())<<13);
-      }
-      g_model.switchWarningStates=i;
-    }
-    updateSettings();
-}
-
-void ModelEdit::setCurrentCurve(int curveId)
-{
-    currentCurve = curveId;
-    curvesLock=true;
-    QString ss = "QSpinBox { background-color:rgb(255, 255, 127);}";
-    for (int i=0; i<g_model.curves[currentCurve].count;i++) {
-      spny[i]->show();
-      spny[i]->setValue(g_model.curves[currentCurve].points[i].y);
-      if (!g_model.curves[currentCurve].custom || i==0 || i==(g_model.curves[currentCurve].count-1)) {
-        spnx[i]->hide();
-        if (i==0) {
-            spnx[i]->setValue(-100);
-        }
-        if (i==(g_model.curves[currentCurve].count-1)) {
-            spnx[i]->setValue(100);
-        }
-      } else {
-        spnx[i]->show();
-        spnx[i]->setMaximum(g_model.curves[currentCurve].points[i+1].x-1);
-        spnx[i]->setMinimum(g_model.curves[currentCurve].points[i-1].x+1);
-        spnx[i]->setValue(g_model.curves[currentCurve].points[i].x);
-      }
-    }
-    for (int i=g_model.curves[currentCurve].count; i<17;i++) {
-      spny[i]->hide();
-      spnx[i]->hide();
-    }
-    int index=0;
-    if (g_model.curves[currentCurve].count==3) {
-      index=0;
-    } else if (g_model.curves[currentCurve].count==5) {
-      index=2;
-    } else if (g_model.curves[currentCurve].count==9) {
-      index=4;
-    }  else if (g_model.curves[currentCurve].count==17) {
-      index=6;
-    }
-    if (g_model.curves[currentCurve].custom) {
-      index++;
-    }
-    if (!GetEepromInterface()->getCapability(HasCvNames)){
-      ui->cname_LE->hide();
-      ui->cname_label->hide();
-    } else {
-      ui->cname_LE->setText(g_model.curves[currentCurve].name);
-    }
-
-    ui->curvetype_CB->setCurrentIndex(index);
-    curvesLock=false;
-}
-
-void ModelEdit::curvePointEdited()
-{
-    if (curvesLock) {
-      return;
-    }
-  /*  for (int i=1; i< g_model.curves[currentCurve].count-1; i++) {
-      if (g_model.curves[currentCurve].points[i].x>(100-g_model.curves[currentCurve].count+i)) {
-        g_model.curves[currentCurve].points[i].x=(100-g_model.curves[currentCurve].count+i);
-      }
-      if (g_model.curves[currentCurve].points[i].x<=g_model.curves[currentCurve].points[i-1].x) {
-        spnx[i]->setValue(spnx[i-1]->value()+1);
-      }
-    }
-  */ 
-    for (int i=0; i< 17; i++) {
-      g_model.curves[currentCurve].points[i].x=spnx[i]->value();
-      g_model.curves[currentCurve].points[i].y=spny[i]->value();
-    }
-    if (redrawCurve)
-      drawCurve();
-    updateSettings();
-}
-
-
-void ModelEdit::setSwitchWidgetVisibility(int i)
-{
-    RawSource source=RawSource(g_model.customSw[i].val1);
-    switch (getCSFunctionFamily(g_model.customSw[i].func))
-    {
-      case CS_FAMILY_VOFS:
-        cswitchSource1[i]->setVisible(true);
-        cswitchSource2[i]->setVisible(false);
-        cswitchValue[i]->setVisible(false);
-        cswitchOffset[i]->setVisible(true);
-        populateSourceCB(cswitchSource1[i], source, POPULATE_SOURCES | (GetEepromInterface()->getCapability(ExtraTrims) ? POPULATE_TRIMS : 0) | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
-        cswitchOffset[i]->setDecimals(source.getDecimals(g_model));
-        cswitchOffset[i]->setSingleStep(source.getStep(g_model));
-        if (g_model.customSw[i].func>CS_FN_ELESS && g_model.customSw[i].func<CS_FN_VEQUAL) {
-          cswitchOffset[i]->setMinimum(source.getStep(g_model)*-127);
-          cswitchOffset[i]->setMaximum(source.getStep(g_model)*127);
-          cswitchOffset[i]->setValue(source.getStep(g_model)*g_model.customSw[i].val2);
-        } else {
-          cswitchOffset[i]->setMinimum(source.getMin(g_model));
-          cswitchOffset[i]->setMaximum(source.getMax(g_model));
-          cswitchOffset[i]->setValue(source.getStep(g_model)*(g_model.customSw[i].val2+source.getRawOffset(g_model))+source.getOffset(g_model));
-        }
-        break;
-      case CS_FAMILY_VBOOL:
-        cswitchSource1[i]->setVisible(true);
-        cswitchSource2[i]->setVisible(true);
-        cswitchValue[i]->setVisible(false);
-        cswitchOffset[i]->setVisible(false);
-        populateSwitchCB(cswitchSource1[i], RawSwitch(g_model.customSw[i].val1));
-        populateSwitchCB(cswitchSource2[i], RawSwitch(g_model.customSw[i].val2));
-        break;
-      case CS_FAMILY_VCOMP:
-        cswitchSource1[i]->setVisible(true);
-        cswitchSource2[i]->setVisible(true);
-        cswitchValue[i]->setVisible(false);
-        cswitchOffset[i]->setVisible(false);
-        populateSourceCB(cswitchSource1[i], RawSource(g_model.customSw[i].val1), POPULATE_SOURCES | (GetEepromInterface()->getCapability(ExtraTrims) ? POPULATE_TRIMS : 0) | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
-        populateSourceCB(cswitchSource2[i], RawSource(g_model.customSw[i].val2), POPULATE_SOURCES | (GetEepromInterface()->getCapability(ExtraTrims) ? POPULATE_TRIMS : 0) | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
-        break;
-      case CS_FAMILY_TIMERS:
-        cswitchSource1[i]->setVisible(false);
-        cswitchSource2[i]->setVisible(false);
-        cswitchValue[i]->setVisible(true);
-        cswitchOffset[i]->setVisible(true);
-        cswitchOffset[i]->setDecimals(1);
-        cswitchOffset[i]->setMinimum(0.1);
-        cswitchOffset[i]->setMaximum(175);
-        float value=ValToTim(g_model.customSw[i].val2);
-        cswitchOffset[i]->setSingleStep(0.1);
-        if (value>60) {
-           cswitchOffset[i]->setSingleStep(1);
-        } else if (value>2) {
-          cswitchOffset[i]->setSingleStep(0.5);
-        }
-        cswitchOffset[i]->setValue(value);
-        
-        cswitchValue[i]->setDecimals(1);
-        cswitchValue[i]->setMinimum(0.1);
-        cswitchValue[i]->setMaximum(175);
-        value=ValToTim(g_model.customSw[i].val1);
-        cswitchValue[i]->setSingleStep(0.1);
-        if (value>60) {
-           cswitchValue[i]->setSingleStep(1);
-        } else if (value>2) {
-          cswitchValue[i]->setSingleStep(0.5);
-        }
-        cswitchValue[i]->setValue(value);
-        break;
-    }
-    cswitchAnd[i]->setVisible(true);
-    populateSwitchCB(cswitchAnd[i], RawSwitch(g_model.customSw[i].andsw), POPULATE_AND_SWITCHES);
-    if (GetEepromInterface()->getCapability(CustomSwitchesExt)) {
-      cswitchDuration[i]->setVisible(true);
-      cswitchDuration[i]->setValue(g_model.customSw[i].duration/2.0);
-      cswitchDelay[i]->setVisible(true);
-      cswitchDelay[i]->setValue(g_model.customSw[i].delay/2.0);
-    }
-}
-
-void ModelEdit::updateSwitchesTab()
-{
-    switchEditLock = true;
-    int num_csw=GetEepromInterface()->getCapability(CustomSwitches);
-    for (int i=0; i< num_csw; i++) {
-      populateCSWCB(csw[i], g_model.customSw[i].func);
-      setSwitchWidgetVisibility(i);
-    }
-    switchEditLock = false;
-}
-
-void ModelEdit::tabCustomSwitches()
-{
-    switchEditLock = true;
-    QComboBox* tmpcsw[C9X_NUM_CSW] = {ui->cswitchFunc_1, ui->cswitchFunc_2, ui->cswitchFunc_3, ui->cswitchFunc_4,
-      ui->cswitchFunc_5, ui->cswitchFunc_6, ui->cswitchFunc_7, ui->cswitchFunc_8,
-      ui->cswitchFunc_9, ui->cswitchFunc_10, ui->cswitchFunc_11, ui->cswitchFunc_12,
-      ui->cswitchFunc_13, ui->cswitchFunc_14, ui->cswitchFunc_15, ui->cswitchFunc_16,
-      ui->cswitchFunc_17, ui->cswitchFunc_18, ui->cswitchFunc_19, ui->cswitchFunc_20,
-      ui->cswitchFunc_21, ui->cswitchFunc_22, ui->cswitchFunc_23, ui->cswitchFunc_24,
-      ui->cswitchFunc_25, ui->cswitchFunc_26, ui->cswitchFunc_27, ui->cswitchFunc_28,
-      ui->cswitchFunc_29, ui->cswitchFunc_30, ui->cswitchFunc_31, ui->cswitchFunc_32 };
-    QLabel* cswlabel[C9X_NUM_CSW] = { ui->cswlabel_01, ui->cswlabel_02, ui->cswlabel_03, ui->cswlabel_04,
-      ui->cswlabel_05, ui->cswlabel_06, ui->cswlabel_07, ui->cswlabel_08,
-      ui->cswlabel_09, ui->cswlabel_10, ui->cswlabel_11, ui->cswlabel_12,
-      ui->cswlabel_13, ui->cswlabel_14, ui->cswlabel_15, ui->cswlabel_16,
-      ui->cswlabel_17, ui->cswlabel_18, ui->cswlabel_19, ui->cswlabel_20,
-      ui->cswlabel_21, ui->cswlabel_22, ui->cswlabel_23, ui->cswlabel_24, 
-      ui->cswlabel_25, ui->cswlabel_26, ui->cswlabel_27, ui->cswlabel_28, 
-      ui->cswlabel_29, ui->cswlabel_30, ui->cswlabel_31, ui->cswlabel_32};
-    
-    memcpy(csw, tmpcsw, sizeof(csw));
-    int num_csw=GetEepromInterface()->getCapability(CustomSwitches);
-    for(int i=0; i<16; i++) {
-      if (i<num_csw) {
-        tmpcsw[i]->setProperty("index",i);
-        cswitchSource1[i] = new QComboBox(this);
-        cswitchSource1[i]->setProperty("index",i);
-        connect(cswitchSource1[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customSwitchesEdited()));
-        ui->gridLayout_21->addWidget(cswitchSource1[i],i+1,2);
-        cswitchSource1[i]->setVisible(false);
-        cswitchValue[i] = new QDoubleSpinBox(this);
-        cswitchValue[i]->setMaximum(125);
-        cswitchValue[i]->setMinimum(-125);
-        cswitchValue[i]->setAccelerated(true);
-        cswitchValue[i]->setDecimals(0);
-        cswitchValue[i]->setProperty("index",i);
-        connect(cswitchValue[i],SIGNAL(editingFinished()),this,SLOT(customSwitchesEdited()));
-        ui->gridLayout_21->addWidget(cswitchValue[i],i+1,2);
-        cswitchValue[i]->setVisible(false);
-
-        cswitchSource2[i] = new QComboBox(this);
-        cswitchSource2[i]->setProperty("index",i);
-        connect(cswitchSource2[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customSwitchesEdited()));
-        ui->gridLayout_21->addWidget(cswitchSource2[i],i+1,3);
-        cswitchSource2[i]->setVisible(false);
-
-        cswitchOffset[i] = new QDoubleSpinBox(this);
-        cswitchOffset[i]->setProperty("index",i);
-        cswitchOffset[i]->setMaximum(125);
-        cswitchOffset[i]->setMinimum(-125);
-        cswitchOffset[i]->setAccelerated(true);
-        cswitchOffset[i]->setDecimals(0);
-        connect(cswitchOffset[i],SIGNAL(editingFinished()),this,SLOT(customSwitchesEdited()));
-        ui->gridLayout_21->addWidget(cswitchOffset[i],i+1,3);
-        cswitchOffset[i]->setVisible(false);
-        cswitchAnd[i] = new QComboBox(this);
-        cswitchAnd[i]->setProperty("index",i);
-        connect(cswitchAnd[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customSwitchesEdited()));
-        ui->gridLayout_21->addWidget(cswitchAnd[i],i+1,4);
-        cswitchAnd[i]->setVisible(false);
-        if (GetEepromInterface()->getCapability(CustomSwitchesExt)) {
-          cswitchDuration[i] = new QDoubleSpinBox(this);
-          cswitchDuration[i]->setProperty("index",i);
-          cswitchDuration[i]->setSingleStep(0.5);
-          cswitchDuration[i]->setMaximum(50);
-          cswitchDuration[i]->setMinimum(0);
-          cswitchDuration[i]->setAccelerated(true);
-          cswitchDuration[i]->setDecimals(1);
-          connect(cswitchDuration[i],SIGNAL(editingFinished()),this,SLOT(customSwitchesEdited()));
-          ui->gridLayout_21->addWidget(cswitchDuration[i],i+1,5);
-          cswitchDuration[i]->setVisible(false);
-
-          cswitchDelay[i] = new QDoubleSpinBox(this);
-          cswitchDelay[i]->setProperty("index",i);
-          cswitchDelay[i]->setSingleStep(0.5);
-          cswitchDelay[i]->setMaximum(50);
-          cswitchDelay[i]->setMinimum(0);
-          cswitchDelay[i]->setAccelerated(true);
-          cswitchDelay[i]->setDecimals(1);
-          connect(cswitchDelay[i],SIGNAL(editingFinished()),this,SLOT(customSwitchesEdited()));
-          ui->gridLayout_21->addWidget(cswitchDelay[i],i+1,6);
-          cswitchDelay[i]->setVisible(false);
-        } else {
-          ui->cswCol3->hide();
-          ui->cswCol4->hide();
-        }
-        connect(cswlabel[i],SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(csw_customContextMenuRequested(QPoint)));
-      } else {
-        csw[i]->hide();
-        cswlabel[i]->hide();
-      }
-    }
-    if (num_csw>16) {
-      for(int i=16; i<32; i++) {
-        if (i<=num_csw) {
-          tmpcsw[i]->setProperty("index",i);
-          cswitchSource1[i] = new QComboBox(this);
-          cswitchSource1[i]->setProperty("index",i);
-          connect(cswitchSource1[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customSwitchesEdited()));
-          ui->gridLayout_22->addWidget(cswitchSource1[i],i-15,2);
-          cswitchSource1[i]->setVisible(false);
-          cswitchValue[i] = new QDoubleSpinBox(this);
-          cswitchValue[i]->setProperty("index",i);
-          cswitchValue[i]->setMaximum(125);
-          cswitchValue[i]->setMinimum(-125);
-          cswitchValue[i]->setAccelerated(true);
-          cswitchValue[i]->setDecimals(0);
-          connect(cswitchValue[i],SIGNAL(editingFinished()),this,SLOT(customSwitchesEdited()));
-          ui->gridLayout_22->addWidget(cswitchValue[i],i-15,2);
-          cswitchValue[i]->setVisible(false);
-
-          cswitchSource2[i] = new QComboBox(this);
-          cswitchSource2[i]->setProperty("index",i);
-          connect(cswitchSource2[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customSwitchesEdited()));
-          ui->gridLayout_22->addWidget(cswitchSource2[i],i-15,3);
-          cswitchSource2[i]->setVisible(false);
-
-          cswitchOffset[i] = new QDoubleSpinBox(this);
-          cswitchOffset[i]->setProperty("index",i);
-          cswitchOffset[i]->setMaximum(125);
-          cswitchOffset[i]->setMinimum(-125);
-          cswitchOffset[i]->setAccelerated(true);
-          cswitchOffset[i]->setDecimals(0);
-          connect(cswitchOffset[i],SIGNAL(editingFinished()),this,SLOT(customSwitchesEdited()));
-          ui->gridLayout_22->addWidget(cswitchOffset[i],i-15,3);
-          cswitchOffset[i]->setVisible(false);
-          cswitchAnd[i] = new QComboBox(this);
-          cswitchAnd[i]->setProperty("index",i);
-          connect(cswitchAnd[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customSwitchesEdited()));
-          ui->gridLayout_22->addWidget(cswitchAnd[i],i-15,4);
-          cswitchAnd[i]->setVisible(false);
-          if (GetEepromInterface()->getCapability(CustomSwitchesExt)) {
-            cswitchDuration[i] = new QDoubleSpinBox(this);
-            cswitchDuration[i]->setProperty("index",i);
-            cswitchDuration[i]->setSingleStep(0.5);
-            cswitchDuration[i]->setMaximum(50);
-            cswitchDuration[i]->setMinimum(0);
-            cswitchDuration[i]->setAccelerated(true);
-            cswitchDuration[i]->setDecimals(1);
-            connect(cswitchDuration[i],SIGNAL(editingFinished()),this,SLOT(customSwitchesEdited()));
-            ui->gridLayout_22->addWidget(cswitchDuration[i],i-15,5);
-            cswitchDuration[i]->setVisible(false);
-
-            cswitchDelay[i] = new QDoubleSpinBox(this);
-            cswitchDelay[i]->setProperty("index",i);
-            cswitchDelay[i]->setSingleStep(0.5);
-            cswitchDelay[i]->setMaximum(50);
-            cswitchDelay[i]->setMinimum(0);
-            cswitchDelay[i]->setAccelerated(true);
-            cswitchDelay[i]->setDecimals(1);
-            connect(cswitchDelay[i],SIGNAL(editingFinished()),this,SLOT(customSwitchesEdited()));
-            ui->gridLayout_22->addWidget(cswitchDelay[i],i-15,6);
-            cswitchDelay[i]->setVisible(false);
-          } else {
-            ui->cswCol3_2->hide();
-            ui->cswCol4_2->hide();
-          }
-          connect(cswlabel[i],SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(csw_customContextMenuRequested(QPoint)));        
-        } else {
-          csw[i]->hide();
-          cswlabel[i]->hide();
-        }
-      }
-    } else {
-      ui->cswitchGB2->hide();
-    }
-    updateSwitchesTab();
-    //connects
-    for (int i=0; i<num_csw; i++) {
-      connect(csw[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customSwitchesEdited()));
-    }
-    switchEditLock = false;
-}
-
-void ModelEdit::tabCustomFunctions()
-{
-  switchEditLock = true;
-  int num_fsw = GetEepromInterface()->getCapability(CustomFunctions);
-
-  QStringList paramarmList;
-  if (!GetEepromInterface()->getCapability(VoicesAsNumbers)) {
-    for (int i=0; i<num_fsw; i++) {
-      if (g_model.funcSw[i].func==FuncPlayPrompt || g_model.funcSw[i].func==FuncBackgroundMusic) {
-        QString temp = g_model.funcSw[i].paramarm;
-        if (!temp.isEmpty()) {
-          if (!paramarmList.contains(temp)) {
-            paramarmList.append(temp);
-          }
-        }
-      }
-    }
-
-    QSettings settings("companion9x", "companion9x");
-    QString path=settings.value("sdPath", ".").toString();
-    path.append("/SOUNDS/");
-    QString lang=radioData.generalSettings.ttsLanguage;
-    if (lang.isEmpty())
-      lang="en";
-    path.append(lang);
-    QDir qd(path);
-    int vml= GetEepromInterface()->getCapability(VoicesMaxLength)+4;
-    if (qd.exists()) {
-      QStringList filters;
-      filters << "*.wav" << "*.WAV";
-      foreach ( QString file, qd.entryList(filters, QDir::Files) ) {
-        QFileInfo fi(file);
-        QString temp=fi.completeBaseName();
-        if (!paramarmList.contains(temp) && temp.length()<=vml) {
-          paramarmList.append(temp);
-        }
-      }
-    }
-  }
-
-  for (int i=0; i<num_fsw; i++) {
-    AssignFunc func = g_model.funcSw[i].func;
-    QGridLayout *layout = i >= 16 ? ui->fswitchlayout2 : ui->fswitchlayout1;
-
-    fswLabel[i] = new QLabel(this);
-    fswLabel[i]->setFrameStyle(QFrame::Panel | QFrame::Raised);
-    fswLabel[i]->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed);
-    fswLabel[i]->setContextMenuPolicy(Qt::CustomContextMenu);
-    fswLabel[i]->setMouseTracking(true);
-    fswLabel[i]->setProperty("FunctionId", i+1);
-    fswLabel[i]->setText(tr("CF%1").arg(i+1));
-    layout->addWidget(fswLabel[i],(i%16)+1,0);
-    connect(fswLabel[i],SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(fsw_customContextMenuRequested(QPoint)));
-
-    fswtchSwtch[i] = new QComboBox(this);
-    fswtchSwtch[i]->setProperty("functionIndex", i);
-    connect(fswtchSwtch[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customFunctionEdited()));
-    layout->addWidget(fswtchSwtch[i],(i%16)+1,1);
-    populateSwitchCB(fswtchSwtch[i], g_model.funcSw[i].swtch, POPULATE_MSWITCHES|POPULATE_ONOFF);
-
-    fswtchFunc[i] = new QComboBox(this);
-    fswtchFunc[i]->setProperty("functionIndex", i);
-    connect(fswtchFunc[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customFunctionEdited()));
-    layout->addWidget(fswtchFunc[i],(i%16)+1,2);
-    populateFuncCB(fswtchFunc[i], g_model.funcSw[i].func);
-
-    QHBoxLayout *paramLayout = new QHBoxLayout();
-    layout->addLayout(paramLayout, (i%16)+1, 3);
-
-    fswtchGVmode[i] = new QComboBox(this);
-    fswtchGVmode[i]->setProperty("functionIndex", i);
-    connect(fswtchGVmode[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customFunctionEdited()));
-    paramLayout->addWidget(fswtchGVmode[i]);
-    populateGVmodeCB(fswtchGVmode[i], g_model.funcSw[i].adjustMode);
-
-    fswtchParamGV[i] = new QCheckBox(this);
-    fswtchParamGV[i]->setProperty("functionIndex", i);
-    fswtchParamGV[i]->setText("GV");
-    fswtchParamGV[i]->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
-    connect(fswtchParamGV[i],SIGNAL(stateChanged(int)),this,SLOT(customFunctionEdited()));
-    paramLayout->addWidget(fswtchParamGV[i]);
-    
-    fswtchParam[i] = new QDoubleSpinBox(this);
-    fswtchParam[i]->setProperty("functionIndex", i);
-    fswtchParam[i]->setAccelerated(true);
-    fswtchParam[i]->setDecimals(0);
-    connect(fswtchParam[i],SIGNAL(editingFinished()),this,SLOT(customFunctionEdited()));
-    paramLayout->addWidget(fswtchParam[i]);
-
-    fswtchParamT[i] = new QComboBox(this);
-    fswtchParamT[i]->setProperty("functionIndex", i);
-    paramLayout->addWidget(fswtchParamT[i]);
-    populateFuncParamCB(fswtchParamT[i], func, g_model.funcSw[i].param, g_model.funcSw[i].adjustMode);
-    connect(fswtchParamT[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customFunctionEdited()));
-
-    fswtchParamArmT[i] = new QComboBox(this);
-    fswtchParamArmT[i]->setProperty("functionIndex", i);
-    populateFuncParamArmTCB(fswtchParamArmT[i],&g_model, g_model.funcSw[i].paramarm, paramarmList);
-    fswtchParamArmT[i]->setEditable(true);
-    paramLayout->addWidget(fswtchParamArmT[i]);
-
-    connect(fswtchParamArmT[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customFunctionEdited()));
-    connect(fswtchParamArmT[i],SIGNAL(editTextChanged ( const QString)),this,SLOT(customFunctionEdited()));
-
-#ifdef PHONON    
-    playBT[i] = new QPushButton(this);
-    playBT[i]->setObjectName(QString("play_%1").arg(i));
-    playBT[i]->setIcon(QIcon(":/images/play.png"));
-    paramLayout->addWidget(playBT[i]);
-    connect(playBT[i],SIGNAL(pressed()),this,SLOT(playMusic()));
-#endif    
-
-    QHBoxLayout *repeatLayout = new QHBoxLayout();
-    layout->addLayout(repeatLayout, (i%16)+1, 4);
-
-    fswtchRepeat[i] = new QComboBox(this);
-    fswtchRepeat[i]->setProperty("functionIndex", i);
-    connect(fswtchRepeat[i],SIGNAL(currentIndexChanged(int)),this,SLOT(customFunctionEdited()));
-    repeatLayout->addWidget(fswtchRepeat[i],(i%16)+1);
-    populateRepeatCB(fswtchRepeat[i], g_model.funcSw[i].repeatParam);
-
-    fswtchEnable[i] = new QCheckBox(this);
-    fswtchEnable[i]->setProperty("functionIndex", i);
-    fswtchEnable[i]->setText(tr("ON"));
-    repeatLayout->addWidget(fswtchEnable[i],(i%16)+1);
-    fswtchEnable[i]->setChecked(g_model.funcSw[i].enabled);
-    connect(fswtchEnable[i],SIGNAL(stateChanged(int)),this,SLOT(customFunctionEdited()));
-
-    refreshCustomFunction(i);
-  }
-
-  if (num_fsw <= 16) {
-    ui->FSwitchGB2->hide();
-  }
-
-  switchEditLock = false;
-}
-
-void ModelEdit::tabSafetySwitches()
-{
-    for(int i=0; i<NUM_SAFETY_CHNOUT; i++)
-    {
-        safetySwitchSwtch[i] = new QComboBox(this);
-        populateSwitchCB(safetySwitchSwtch[i],g_model.safetySw[i].swtch);
-        ui->grid_tabSafetySwitches->addWidget(safetySwitchSwtch[i],i+1,1);
-        connect(safetySwitchSwtch[i],SIGNAL(currentIndexChanged(int)),this,SLOT(safetySwitchesEdited()));
-
-        safetySwitchValue[i] = new QSpinBox(this);
-        safetySwitchValue[i]->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-        safetySwitchValue[i]->setMaximum(125);
-        safetySwitchValue[i]->setMinimum(-125);
-        safetySwitchValue[i]->setAccelerated(true);
-        safetySwitchValue[i]->setValue(g_model.safetySw[i].val);
-        ui->grid_tabSafetySwitches->addWidget(safetySwitchValue[i],i+1,2);
-        connect(safetySwitchValue[i],SIGNAL(editingFinished()),this,SLOT(safetySwitchesEdited()));
-    }
-}
-
-void ModelEdit::customFieldEdited()
-{
-  if (telemetryLock) return;
-  int cols=GetEepromInterface()->getCapability(TelemetryColsCSFields);
-  if (cols==0) cols=2;
-
-  for (int i=0; i<GetEepromInterface()->getCapability(TelemetryCSFields); i++) {
-    int screen=i/(4*cols);
-    int r=((i%(4*cols))%4);
-    int c=((i%(4*cols))/4);
-    if (g_model.frsky.screens[screen].type==0) {
-      g_model.frsky.screens[screen].body.lines[r].source[c]=csf[i]->currentIndex();
-    }
-  }
-  updateSettings();
-}
-
-void ModelEdit::customSwitchesEdited()
-{
-    if(switchEditLock) return;
-        
-    switchEditLock = true;
-    int i=-1;
-    QString indextext=sender()->property("index").toString();
-    if (!indextext.isEmpty()) {
-      i=indextext.toInt();
-    } else {
-      // should not happen
-      switchEditLock = false;
-      return;
-    }
-    bool chAr;
-    float value, step;
-    int newval;
-    chAr = (getCSFunctionFamily(g_model.customSw[i].func) != getCSFunctionFamily(csw[i]->itemData(csw[i]->currentIndex()).toInt()));
-    g_model.customSw[i].func = csw[i]->itemData(csw[i]->currentIndex()).toInt();
-    if(chAr) {
-      if (getCSFunctionFamily(g_model.customSw[i].func)==CS_FAMILY_TIMERS) {
-        g_model.customSw[i].val1 = -119;
-        g_model.customSw[i].val2 = -119;
-      } else {
-        g_model.customSw[i].val1 = 0;
-        g_model.customSw[i].val2 = 0;        
-      }
-      g_model.customSw[i].andsw = 0;
-      setSwitchWidgetVisibility(i);
-    }
-    if (GetEepromInterface()->getCapability(CustomSwitchesExt)) {
-      g_model.customSw[i].duration= (uint8_t)round(cswitchDuration[i]->value()*2);
-      g_model.customSw[i].delay= (uint8_t)round(cswitchDelay[i]->value()*2);
-    }
-    RawSource source;
-    switch (getCSFunctionFamily(g_model.customSw[i].func))
-    {
-      case (CS_FAMILY_VOFS):
-        if (g_model.customSw[i].val1 != cswitchSource1[i]->itemData(cswitchSource1[i]->currentIndex()).toInt()) {
-          source=RawSource(g_model.customSw[i].val1);
-          g_model.customSw[i].val1 = cswitchSource1[i]->itemData(cswitchSource1[i]->currentIndex()).toInt();
-          RawSource newSource = RawSource(g_model.customSw[i].val1);
-          if (newSource.type == SOURCE_TYPE_TELEMETRY) {
-            if (g_model.customSw[i].func>CS_FN_ELESS && g_model.customSw[i].func<CS_FN_VEQUAL) {
-              g_model.customSw[i].val2 = 0;
-            } else {
-              g_model.customSw[i].val2 = -128;
-            }
-          } else {
-            if (g_model.customSw[i].func>CS_FN_ELESS && g_model.customSw[i].func<CS_FN_VEQUAL) {
-              g_model.customSw[i].val2 = (cswitchOffset[i]->value()/source.getStep(g_model));
-            } else {
-              g_model.customSw[i].val2 = ((cswitchOffset[i]->value()-source.getOffset(g_model))/source.getStep(g_model))-source.getRawOffset(g_model);
-            }
-          }
-          setSwitchWidgetVisibility(i);
-       } else {
-          source=RawSource(g_model.customSw[i].val1);
-          if (g_model.customSw[i].func>CS_FN_ELESS && g_model.customSw[i].func<CS_FN_VEQUAL) {
-            g_model.customSw[i].val2 = (cswitchOffset[i]->value()/source.getStep(g_model));
-            cswitchOffset[i]->setValue(g_model.customSw[i].val2*source.getStep(g_model));
-          } else {
-            g_model.customSw[i].val2 = ((cswitchOffset[i]->value()-source.getOffset(g_model))/source.getStep(g_model))-source.getRawOffset(g_model);
-            cswitchOffset[i]->setValue((g_model.customSw[i].val2 +source.getRawOffset(g_model))*source.getStep(g_model)+source.getOffset(g_model));            
-          }
-        }
-        break;
-      case (CS_FAMILY_TIMERS): {
-        value=cswitchOffset[i]->value();
-        newval=TimToVal(value);
-        if (newval>g_model.customSw[i].val2) {
-          if (value >=60) {
-            value=round(value);
-            step=1;
-          } else if (value>=2) {
-            value=(round(value*2.0)/2);
-            step=0.5;
-          } else {
-            step=0.1;
-          }
-        } else {
-          if (value <=2) {
-            step=0.1;
-          } else if (value<=60) {
-            value=(round(value*2.0)/2);
-            step=0.5;
-          } else {
-            value=round(value);
-            step=1;            
-          }
-        }
-        g_model.customSw[i].val2=TimToVal(value);
-        value=ValToTim(g_model.customSw[i].val2);
-        cswitchOffset[i]->setValue(value);
-        cswitchOffset[i]->setSingleStep(step);
-
-        value=cswitchValue[i]->value();
-        newval=TimToVal(value);
-        if (newval>g_model.customSw[i].val1) {
-          if (value >=60) {
-            value=round(value);
-            step=1;
-          } else if (value>=2) {
-            value=(round(value*2.0)/2);
-            step=0.5;
-          } else {
-            step=0.1;
-          }
-        } else {
-          if (value <=2) {
-            step=0.1;
-          } else if (value<=60) {
-            value=(round(value*2.0)/2);
-            step=0.5;
-          } else {
-            value=round(value);
-            step=1;            
-          }
-        }
-        g_model.customSw[i].val1=TimToVal(value);
-        value=ValToTim(g_model.customSw[i].val1);
-        cswitchValue[i]->setValue(value);
-        cswitchValue[i]->setSingleStep(step);
-        break;
-        }          
-      case (CS_FAMILY_VBOOL):
-      case (CS_FAMILY_VCOMP):
-        g_model.customSw[i].val1 = cswitchSource1[i]->itemData(cswitchSource1[i]->currentIndex()).toInt();
-        g_model.customSw[i].val2 = cswitchSource2[i]->itemData(cswitchSource2[i]->currentIndex()).toInt();
-        break;
-    }
-    g_model.customSw[i].andsw = cswitchAnd[i]->itemData(cswitchAnd[i]->currentIndex()).toInt();
-    updateSettings();
-    switchEditLock = false;
-}
-
-#ifdef PHONON
-
-void ModelEdit::mediaPlayer_state(Phonon::State newState, Phonon::State oldState)
-{
-    if (phononLock)
-      return;
-    phononLock=true;
-    if ((newState==Phonon::StoppedState || newState==Phonon::PausedState)  && oldState==Phonon::PlayingState) {
-      clickObject->stop();
-      clickObject->clearQueue();
-      clickObject->clear();
-      for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
-        playBT[i]->setObjectName(QString("play_%1").arg(i));
-        playBT[i]->setIcon(QIcon(":/images/play.png"));   
-      }
-    }
-    if (newState==Phonon::ErrorState) {
-      clickObject->stop();
-      clickObject->clearQueue();
-      clickObject->clear();
-      for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
-        playBT[i]->setObjectName(QString("play_%1").arg(i));
-        playBT[i]->setIcon(QIcon(":/images/play.png"));   
-      }
-    }
-
-    phononLock=false;
-}
-#endif
-
-void ModelEdit::playMusic()
-{
-    QPushButton *playButton = qobject_cast<QPushButton*>(sender());
-    int index=playButton->objectName().mid(5,2).toInt();
-    QString function=playButton->objectName().left(4);
-    QSettings settings("companion9x", "companion9x");
-    QString path=settings.value("sdPath", ".").toString();
-    QDir qd(path);
-    QString track;
-    if (qd.exists()) {
-      if (GetEepromInterface()->getCapability(VoicesAsNumbers)) {
-        track=path+QString("/%1.wav").arg(int(fswtchParam[index]->value()),4,10,(const QChar)'0');
-      } else {
-        path.append("/SOUNDS/");
-        QString lang=radioData.generalSettings.ttsLanguage;
-        if (lang.isEmpty())
-          lang="en";
-        path.append(lang);
-        if (fswtchParamArmT[index]->currentText()!="----") {
-          track=path+"/"+fswtchParamArmT[index]->currentText()+".wav";
-        }
-      }
-      QFile file(track);
-      if (!file.exists()) {
-        QMessageBox::critical(this, tr("Error"), tr("Unable to find sound file %1!").arg(track));
-        track.clear();
-      }
-#ifdef PHONON
-      if (function=="play" && !track.isEmpty()) {
-        clickObject->clear();
-        clickObject->setCurrentSource(Phonon::MediaSource(track));
-        clickObject->play();
-        playBT[index]->setObjectName(QString("stop_%1").arg(index));
-        playBT[index]->setIcon(QIcon(":/images/stop.png"));
-      } else {
-        clickObject->stop();
-        clickObject->clear();
-        playBT[index]->setObjectName(QString("play_%1").arg(index));
-        playBT[index]->setIcon(QIcon(":/images/play.png"));      
-      }
-#endif
-    }
-}
-
-#define CUSTOM_FUNCTION_NUMERIC_PARAM  (1<<0)
-#define CUSTOM_FUNCTION_SOURCE_PARAM   (1<<1)
-#define CUSTOM_FUNCTION_FILE_PARAM     (1<<2)
-#define CUSTOM_FUNCTION_GV_MODE        (1<<3)
-#define CUSTOM_FUNCTION_GV_TOOGLE      (1<<4)
-#define CUSTOM_FUNCTION_ENABLE         (1<<5)
-#define CUSTOM_FUNCTION_REPEAT         (1<<6)
-#define CUSTOM_FUNCTION_PLAY           (1<<7)
-
-void ModelEdit::customFunctionEdited()
-{
-    if (switchEditLock) return;
-    switchEditLock = true;
-
-    int index = sender()->property("functionIndex").toInt();
-    refreshCustomFunction(index, true);
-
-    updateSettings();
-    switchEditLock = false;
-}
-
-void ModelEdit::refreshCustomFunction(int i, bool modified)
-{
-    unsigned int widgetsMask = 0;
-    if (modified) {
-      g_model.funcSw[i].swtch = RawSwitch(fswtchSwtch[i]->itemData(fswtchSwtch[i]->currentIndex()).toInt());
-      g_model.funcSw[i].func = (AssignFunc)fswtchFunc[i]->currentIndex();
-      g_model.funcSw[i].enabled =fswtchEnable[i]->isChecked();
-      g_model.funcSw[i].repeatParam = (AssignFunc)fswtchRepeat[i]->currentIndex();
-      g_model.funcSw[i].adjustMode = (AssignFunc)fswtchGVmode[i]->currentIndex();
-    }
-
-    int index = fswtchFunc[i]->currentIndex();
-
-    if (index>=FuncSafetyCh1 && index<=FuncSafetyCh16) {
-      fswtchParam[i]->setDecimals(0);
-      fswtchParam[i]->setSingleStep(1);
-      fswtchParam[i]->setMinimum(-125);
-      fswtchParam[i]->setMaximum(125);
-      if (modified) {
-        g_model.funcSw[i].param = fswtchParam[i]->value();
-      }
-      fswtchParam[i]->setValue(g_model.funcSw[i].param);
-      widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_ENABLE;
-    } else if (index==FuncLogs) {
-      fswtchParam[i]->setDecimals(1);
-      fswtchParam[i]->setMinimum(0);
-      fswtchParam[i]->setMaximum(25.5);
-      fswtchParam[i]->setSingleStep(0.1);    
-      if (modified) g_model.funcSw[i].param = fswtchParam[i]->value()*10.0;
-      fswtchParam[i]->setValue(g_model.funcSw[i].param/10.0);
-      widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_ENABLE;
-    } else if (index>=FuncAdjustGV1 && index<=FuncAdjustGV5) {
-      if (modified) g_model.funcSw[i].adjustMode = fswtchGVmode[i]->currentIndex();
-      widgetsMask |= CUSTOM_FUNCTION_GV_MODE + CUSTOM_FUNCTION_ENABLE;
-      if (g_model.funcSw[i].adjustMode==0) {
-        if (modified) g_model.funcSw[i].param = fswtchParam[i]->value();
-        fswtchParam[i]->setDecimals(0);
-        fswtchParam[i]->setSingleStep(1);
-        fswtchParam[i]->setMinimum(-125);
-        fswtchParam[i]->setMaximum(125);
-        fswtchParam[i]->setValue(g_model.funcSw[i].param);
-        widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM;
-      } else {
-        if (modified) g_model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
-        populateFuncParamCB(fswtchParamT[i], index, g_model.funcSw[i].param, g_model.funcSw[i].adjustMode);
-        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
-      }
-    } else if (index==FuncReset) {
-      if (modified) g_model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
-      populateFuncParamCB(fswtchParamT[i], index, g_model.funcSw[i].param);
-      widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
-    } else if (index==FuncVolume) {
-      if (modified) g_model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
-      populateFuncParamCB(fswtchParamT[i], index, g_model.funcSw[i].param);
-      widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_ENABLE;
-    } else if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) {
-      if (modified) g_model.funcSw[i].repeatParam = fswtchRepeat[i]->itemData(fswtchRepeat[i]->currentIndex()).toInt();
-      if (index != FuncBackgroundMusic) {
-        if (GetEepromInterface()->getCapability(HasFuncRepeat)) {
-          widgetsMask |= CUSTOM_FUNCTION_REPEAT;
-        }
-      }
-      if (index==FuncPlayValue) {
-        if (modified) g_model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
-        populateFuncParamCB(fswtchParamT[i], index, g_model.funcSw[i].param);
-        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_REPEAT;
-      } else if (index==FuncPlayPrompt || index==FuncPlayBoth) {
-        if (GetEepromInterface()->getCapability(VoicesAsNumbers)) {
-          fswtchParam[i]->setDecimals(0);
-          fswtchParam[i]->setSingleStep(1);
-          fswtchParam[i]->setMinimum(0);
-          if (index==FuncPlayPrompt) {
-            widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_REPEAT + CUSTOM_FUNCTION_GV_TOOGLE;
-          } else {
-            widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_REPEAT;
-            fswtchParamGV[i]->setChecked(false);
-          }
-          fswtchParam[i]->setMaximum(index==FuncPlayBoth ? 254 : 255);
-          if (modified) {
-            if (fswtchParamGV[i]->isChecked()) {
-              fswtchParam[i]->setMinimum(1);
-              g_model.funcSw[i].param = std::min(fswtchParam[i]->value(),5.0)+(fswtchParamGV[i]->isChecked() ? 250 : 0);
-            } else {
-              g_model.funcSw[i].param = fswtchParam[i]->value();
-            }
-          }
-          if (g_model.funcSw[i].param>250 && (index!=FuncPlayBoth)) {
-            fswtchParamGV[i]->setChecked(true);
-            fswtchParam[i]->setValue(g_model.funcSw[i].param-250);
-            fswtchParam[i]->setMaximum(5);
-          } else {
-            fswtchParamGV[i]->setChecked(false);
-            fswtchParam[i]->setValue(g_model.funcSw[i].param);
-          }
-          if (g_model.funcSw[i].param < 251)
-            widgetsMask |= CUSTOM_FUNCTION_PLAY;
-        } else {
-          widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
-          if (modified) {
-            memset(g_model.funcSw[i].paramarm, 0, sizeof(g_model.funcSw[i].paramarm));
-            int vml=GetEepromInterface()->getCapability(VoicesMaxLength);
-            if (fswtchParamArmT[i]->currentText() != "----") {
-              widgetsMask |= CUSTOM_FUNCTION_PLAY;
-              for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(),vml); j++) {
-                g_model.funcSw[i].paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
-              }
-            }
-          }
-        }
-      } else if (index==FuncBackgroundMusic) {
-        widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
-        if (modified) {
-          memset(g_model.funcSw[i].paramarm, 0, sizeof(g_model.funcSw[i].paramarm));
-          int vml=GetEepromInterface()->getCapability(VoicesMaxLength);
-          if (fswtchParamArmT[i]->currentText() != "----") {
-            widgetsMask |= CUSTOM_FUNCTION_PLAY;
-            for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(),vml); j++) {
-              g_model.funcSw[i].paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
-            }
-          }
-        }      
-      } else if (index==FuncPlaySound) {
-        if (modified) g_model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
-        populateFuncParamCB(fswtchParamT[i], index, g_model.funcSw[i].param);
-        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
-      } else if (index==FuncPlayHaptic) {
-        if (modified) g_model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
-        populateFuncParamCB(fswtchParamT[i], index, g_model.funcSw[i].param);
-        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
-      }
-   } else if (g_model.funcSw[i].swtch.type!=SWITCH_TYPE_NONE) {
-      if (modified) g_model.funcSw[i].param = fswtchParam[i]->value();
-      fswtchParam[i]->setDecimals(0);
-      fswtchParam[i]->setSingleStep(1);
-      fswtchParam[i]->setValue(g_model.funcSw[i].param);
-      if (index<=FuncInstantTrim) {
-        widgetsMask |= CUSTOM_FUNCTION_ENABLE;
-      }
-    }
-
-    fswtchParam[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_NUMERIC_PARAM);
-    fswtchParamGV[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_TOOGLE);
-    fswtchParamT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_SOURCE_PARAM);
-    fswtchParamArmT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_FILE_PARAM);
-    fswtchEnable[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_ENABLE);
-    if (!(widgetsMask & CUSTOM_FUNCTION_ENABLE)) fswtchEnable[i]->setChecked(false);
-    fswtchRepeat[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_REPEAT);
-    fswtchGVmode[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_MODE);
-#ifdef PHONON
-    playBT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_PLAY);
-#endif
-}
-
-void ModelEdit::tabTelemetry()
-{
-    QSettings settings("companion9x", "companion9x");
-    QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString();
-    float a1ratio;
-    float a2ratio;
-
-    QGroupBox* barsgb[3] = { ui->CS1Bars, ui->CS2Bars, ui->CS3Bars };
-    QGroupBox* numsgb[3] = { ui->CS1Nums, ui->CS2Nums, ui->CS3Nums };
-
-    QComboBox* barscb[12] = { ui->telBarCS1B1_CB, ui->telBarCS1B2_CB,  ui->telBarCS1B3_CB,  ui->telBarCS1B4_CB,
-                              ui->telBarCS2B1_CB, ui->telBarCS2B2_CB,  ui->telBarCS2B3_CB,  ui->telBarCS2B4_CB,
-                              ui->telBarCS3B1_CB, ui->telBarCS3B2_CB,  ui->telBarCS3B3_CB,  ui->telBarCS3B4_CB};
-    QDoubleSpinBox* minsb[12] = { ui->telMinCS1SB1,  ui->telMinCS1SB2,  ui->telMinCS1SB3,  ui->telMinCS1SB4,
-                                  ui->telMinCS2SB1,  ui->telMinCS2SB2,  ui->telMinCS2SB3,  ui->telMinCS2SB4,
-                                  ui->telMinCS3SB1,  ui->telMinCS3SB2,  ui->telMinCS3SB3,  ui->telMinCS3SB4};
-    QDoubleSpinBox* maxsb[12] = { ui->telMaxCS1SB1,  ui->telMaxCS1SB2,  ui->telMaxCS1SB3,  ui->telMaxCS1SB4,
-                                  ui->telMaxCS2SB1,  ui->telMaxCS2SB2,  ui->telMaxCS2SB3,  ui->telMaxCS2SB4,
-                                  ui->telMaxCS3SB1,  ui->telMaxCS3SB2,  ui->telMaxCS3SB3,  ui->telMaxCS3SB4};
-    QComboBox* tmp[36] = { ui->telemetryCS1F1_CB, ui->telemetryCS1F2_CB, ui->telemetryCS1F3_CB, ui->telemetryCS1F4_CB, ui->telemetryCS1F5_CB, ui->telemetryCS1F6_CB, ui->telemetryCS1F7_CB, ui->telemetryCS1F8_CB, ui->telemetryCS1F9_CB, ui->telemetryCS1F10_CB, ui->telemetryCS1F11_CB, ui->telemetryCS1F12_CB,
-                           ui->telemetryCS2F1_CB, ui->telemetryCS2F2_CB, ui->telemetryCS2F3_CB, ui->telemetryCS2F4_CB, ui->telemetryCS2F5_CB, ui->telemetryCS2F6_CB, ui->telemetryCS2F7_CB, ui->telemetryCS2F8_CB, ui->telemetryCS2F9_CB, ui->telemetryCS2F10_CB, ui->telemetryCS2F11_CB, ui->telemetryCS2F12_CB,
-                           ui->telemetryCS3F1_CB, ui->telemetryCS3F2_CB, ui->telemetryCS3F3_CB, ui->telemetryCS3F4_CB, ui->telemetryCS3F5_CB, ui->telemetryCS3F6_CB, ui->telemetryCS3F7_CB, ui->telemetryCS3F8_CB, ui->telemetryCS3F9_CB, ui->telemetryCS3F10_CB, ui->telemetryCS3F11_CB, ui->telemetryCS3F12_CB};
-
-    memcpy(barsGB, barsgb, sizeof(barsGB));
-    memcpy(numsGB, numsgb, sizeof(numsGB));
-    memcpy(barsCB, barscb, sizeof(barsCB));
-    memcpy(maxSB, maxsb, sizeof(maxSB));
-    memcpy(minSB, minsb, sizeof(minSB));
-    memcpy(csf, tmp, sizeof(csf));
-
-    telemetryLock=true;
-    ui->telemetryCSType1->setCurrentIndex(g_model.frsky.screens[0].type);
-    ui->telemetryCSType2->setCurrentIndex(g_model.frsky.screens[1].type);
-    ui->telemetryCSType3->setCurrentIndex(g_model.frsky.screens[2].type);
-
-    for (int i=0; i<3; i++) {
-      bool isNum = (g_model.frsky.screens[i].type==0);
-      barsGB[i]->setVisible(!isNum);
-      numsGB[i]->setVisible(isNum);
-    }
-
-    connect(ui->telemetryCSType1,SIGNAL(currentIndexChanged(int)),this,SLOT(ScreenTypeCBcurrentIndexChanged(int)));
-    connect(ui->telemetryCSType2,SIGNAL(currentIndexChanged(int)),this,SLOT(ScreenTypeCBcurrentIndexChanged(int)));
-    connect(ui->telemetryCSType3,SIGNAL(currentIndexChanged(int)),this,SLOT(ScreenTypeCBcurrentIndexChanged(int)));
-
-    //frsky Settings
-    if (!GetEepromInterface()->getCapability(TelemetryRSSIModel) ) {
-      ui->RSSIGB->hide();
-    }
-    ui->rssiAlarm1SB->setValue(g_model.frsky.rssiAlarms[0].value);
-    ui->rssiAlarm2SB->setValue(g_model.frsky.rssiAlarms[1].value);
-    ui->rssiAlarm1CB->setCurrentIndex(g_model.frsky.rssiAlarms[0].level);
-    ui->rssiAlarm2CB->setCurrentIndex(g_model.frsky.rssiAlarms[1].level);
-
-    if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
-      ui->AltitudeGPS_ChkB->hide();
-    } else {
-      ui->AltitudeGPS_ChkB->setChecked(g_model.frsky.FrSkyGpsAlt);
-    }
-    int varioCap=GetEepromInterface()->getCapability(HasVario);
-  //  if (IS_TARANIS(GetEepromInterface()->getBoard())) {   
-    if (false) {   
-      ui->AltitudeToolbar_ChkB->setChecked(g_model.frsky.altitudeDisplayed);
-    } else {
-      ui->AltitudeToolbar_ChkB->hide();  
-    }
-    if (!varioCap) {
-      ui->varioLimitMax_DSB->hide();
-      ui->varioLimitMinOff_ChkB->hide();
-      ui->varioLimitMin_DSB->hide();
-      ui->varioLimitCenterMin_DSB->hide();
-      ui->varioLimitCenterMax_DSB->hide();
-      ui->varioLimit_label->hide();
-      ui->VarioLabel_1->hide();
-      ui->VarioLabel_2->hide();
-      ui->VarioLabel_3->hide();
-      ui->VarioLabel_4->hide();
-      ui->varioSourceCB->hide();
-      ui->varioSource_label->hide();
-    } else {
-      if (!GetEepromInterface()->getCapability(HasVarioSink)) {
-        ui->varioLimitMinOff_ChkB->hide();
-        ui->varioLimitMin_DSB->hide();
-        ui->varioLimitCenterMin_DSB->hide();
-        ui->VarioLabel_1->hide();
-        ui->VarioLabel_2->hide();      
-      }
-      ui->varioLimitMin_DSB->setValue(g_model.frsky.varioMin-10);
-      ui->varioLimitMax_DSB->setValue(g_model.frsky.varioMax+10);
-      ui->varioLimitCenterMax_DSB->setValue((g_model.frsky.varioCenterMax/10.0)+0.5);
-      ui->varioSourceCB->setCurrentIndex(g_model.frsky.varioSource);
-      if (g_model.frsky.varioCenterMin==-16) {
-        ui->varioLimitMinOff_ChkB->setChecked(true);
-        ui->varioLimitCenterMin_DSB->setValue(-2.0);
-        ui->varioLimitCenterMin_DSB->setDisabled(true);
-      } else {
-        ui->varioLimitMinOff_ChkB->setChecked(false);
-        ui->varioLimitCenterMin_DSB->setValue((g_model.frsky.varioCenterMin/10.0)-0.5);
-      }
-      int mask=1;
-      for (int i=0; i< ui->varioSourceCB->count(); i++) {
-        if (!(varioCap&mask)) {
-          QModelIndex index = ui->varioSourceCB->model()->index(i, 0);
-          QVariant v(0);
-          ui->varioSourceCB->model()->setData(index, v, Qt::UserRole - 1);
-        }
-        mask <<=1;
-      }
-    }
-
-    if (!(GetEepromInterface()->getCapability(HasAltitudeSel)||GetEepromInterface()->getCapability(HasVario))) {
-      ui->altimetryGB->hide();
-    }
-    if (GetEepromInterface()->getCapability(NoTelemetryProtocol)) {
-      g_model.frsky.usrProto=1;
-      ui->frskyProtoCB->setDisabled(true);
-    } else {
-      ui->frskyProtoCB->setEnabled(true);
-    }
-
-    if (GetEepromInterface()->getCapability(TelemetryCSFields)==0) {
-      ui->groupBox_5->hide();
-    } else {
-      if (GetEepromInterface()->getCapability(TelemetryCSFields)==8) {
-        ui->tabCsView->removeTab(1);
-        ui->tabCsView->removeTab(2);
-      }
-      if (GetEepromInterface()->getCapability(TelemetryCSFields)==16) {
-        ui->tabCsView->removeTab(2);
-      }
-      int cols=GetEepromInterface()->getCapability(TelemetryColsCSFields);
-      if (cols==0) cols=2;
-      for (int screen=0; screen<(GetEepromInterface()->getCapability(TelemetryCSFields)/(4*cols)); screen++) {
-        for (int c=0; c<cols; c++) {
-          for (int r=0; r<4; r++) {
-            int index=screen*12+c*4+r;
-            if (g_model.frsky.screens[screen].type==0) {
-              populateCustomScreenFieldCB(csf[index], g_model.frsky.screens[screen].body.lines[r].source[c], (r<4), g_model.frsky.usrProto);
-            } else {
-              populateCustomScreenFieldCB(csf[index], 0, (r<4), g_model.frsky.usrProto);
-            }
-            connect(csf[index],SIGNAL(currentIndexChanged(int)),this,SLOT(customFieldEdited()));  
-          }
-        }
-        for (int c=cols; c<3; c++) {
-          for (int r=0; r<4; r++) {
-            int index=screen*12+c*4+r;
-            csf[index]->hide();
-          }
-        }
-      }   
-    }
-
-    if (!GetEepromInterface()->getCapability(TelemetryUnits)) {
-      ui->frskyUnitsCB->setDisabled(true);
-      int index=0;
-      if (firmware_id.contains("imperial")) {
-        index=1;
-      }
-      ui->frskyUnitsCB->setCurrentIndex(index);
-    }
-    if ((GetEepromInterface()->getCapability(Telemetry)&TM_HASWSHH)) {
-      ui->frskyProtoCB->addItem(tr("Winged Shadow How High"));
-    } else {
-      ui->frskyProtoCB->addItem(tr("Winged Shadow How High (not supported)"));
-    }
-    ui->a1UnitCB->setCurrentIndex(g_model.frsky.channels[0].type);
-    if (g_model.frsky.channels[0].type==0 || g_model.frsky.channels[0].type==1 || g_model.frsky.channels[0].type==2) {
-      a1ratio=(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier)/10.0;
-      ui->a1RatioSB->setDecimals(1);
-      ui->a1RatioSB->setMaximum(25.5*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
-    } else {
-      a1ratio=g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier;
-      ui->a1RatioSB->setDecimals(0);
-      ui->a1RatioSB->setMaximum(255*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
-    }
-    ui->a1RatioSB->setValue(a1ratio);
-
-    updateA1Fields();
-
-    if (g_model.frsky.channels[1].type==0 || g_model.frsky.channels[1].type==1 || g_model.frsky.channels[1].type==2) {
-      a2ratio=(g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier)/10.0;
-      ui->a2RatioSB->setDecimals(1);
-      ui->a2RatioSB->setMaximum(25.5*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
-    } else {
-      a2ratio=g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier;
-      ui->a2RatioSB->setDecimals(0);
-      ui->a2RatioSB->setMaximum(255*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
-    }
-    ui->a2RatioSB->setValue(a2ratio);
-    updateA2Fields();
-
-    ui->a11LevelCB->setCurrentIndex(g_model.frsky.channels[0].alarms[0].level);
-    ui->a11GreaterCB->setCurrentIndex(g_model.frsky.channels[0].alarms[0].greater);
-    ui->a12LevelCB->setCurrentIndex(g_model.frsky.channels[0].alarms[1].level);
-    ui->a12GreaterCB->setCurrentIndex(g_model.frsky.channels[0].alarms[1].greater);
-    ui->a2UnitCB->setCurrentIndex(g_model.frsky.channels[1].type);
-    ui->a21LevelCB->setCurrentIndex(g_model.frsky.channels[1].alarms[0].level);
-    ui->a21GreaterCB->setCurrentIndex(g_model.frsky.channels[1].alarms[0].greater);
-    ui->a22LevelCB->setCurrentIndex(g_model.frsky.channels[1].alarms[1].level);
-    ui->a22GreaterCB->setCurrentIndex(g_model.frsky.channels[1].alarms[1].greater);
-    if (!(GetEepromInterface()->getCapability(Telemetry)&TM_HASOFFSET)) {
-      ui->a1CalibSB->hide();
-      ui->a2CalibSB->hide();
-      ui->a1CalibLabel->hide();
-      ui->a2CalibLabel->hide();
-    } else {
-      ui->label_A1Max->setText(tr("Range"));
-      ui->label_A2Max->setText(tr("Range"));
-    }
-    ui->frskyProtoCB->setCurrentIndex(g_model.frsky.usrProto);
-    ui->frskyUnitsCB->setCurrentIndex(g_model.frsky.imperial);
-    ui->frskyBladesCB->setCurrentIndex(g_model.frsky.blades);
-    ui->frskyCurrentCB->setCurrentIndex(g_model.frsky.currentSource);
-    ui->frskyVoltCB->setCurrentIndex(g_model.frsky.voltsSource);
-
-    for (int screen=0; screen<2;screen++) {
-      for (int rows=0; rows<4; rows++) {
-        for (int cols=0; cols<3; cols++) {
-          int index=screen*12+cols*4+rows;
-          populateCustomScreenFieldCB(csf[index], g_model.frsky.screens[screen].body.lines[rows].source[cols], (rows<4), g_model.frsky.usrProto);
-        }
-      }
-    }
-
-    for (int j=0; j<12; j++) {
-      int screen = j/4;
-      int field = j%4;
-      populateCustomScreenFieldCB(barsCB[j], g_model.frsky.screens[screen].body.bars[field].source, false, g_model.frsky.usrProto);
-      switch (g_model.frsky.screens[screen].body.bars[field].source-1) {
-        case TELEMETRY_SOURCE_TX_BATT:
-        case TELEMETRY_SOURCE_A1:
-        case TELEMETRY_SOURCE_A1_MIN:
-        case TELEMETRY_SOURCE_A2:
-        case TELEMETRY_SOURCE_A2_MIN:
-        case TELEMETRY_SOURCE_CELLS_SUM:
-        case TELEMETRY_SOURCE_VFAS:
-        case TELEMETRY_SOURCE_CURRENT_MAX:
-        case TELEMETRY_SOURCE_CURRENT:
-          minsb[j]->setDecimals(1);
-          maxsb[j]->setDecimals(1);
-          break;
-        case TELEMETRY_SOURCE_CELL:
-          minsb[j]->setDecimals(2);
-          maxsb[j]->setDecimals(2);
-          break;
-        default:
-          minsb[j]->setDecimals(0);
-          maxsb[j]->setDecimals(0);
-      }
-      minsb[j]->setMinimum(getBarValue(g_model.frsky.screens[screen].body.bars[field].source, 0, &g_model.frsky));
-      minsb[j]->setMaximum(getBarValue(g_model.frsky.screens[screen].body.bars[field].source, 255, &g_model.frsky));
-      minsb[j]->setSingleStep(getBarStep(g_model.frsky.screens[screen].body.bars[field].source));
-      minsb[j]->setValue(getBarValue(g_model.frsky.screens[screen].body.bars[field].source, g_model.frsky.screens[screen].body.bars[field].barMin, &g_model.frsky));
-      maxsb[j]->setMinimum(getBarValue(g_model.frsky.screens[screen].body.bars[field].source, 0, &g_model.frsky));
-      maxsb[j]->setMaximum(getBarValue(g_model.frsky.screens[screen].body.bars[field].source, 255, &g_model.frsky));
-      maxsb[j]->setSingleStep(getBarStep(g_model.frsky.screens[screen].body.bars[field].source));
-      maxsb[j]->setValue(getBarValue(g_model.frsky.screens[screen].body.bars[field].source, (255-g_model.frsky.screens[screen].body.bars[field].barMax), &g_model.frsky));
-
-      if (g_model.frsky.screens[screen].body.bars[field].source==0 || g_model.frsky.screens[screen].type==0) {
-        minsb[j]->setDisabled(true);
-        maxsb[j]->setDisabled(true);
-      }
-      connect(barsCB[j],SIGNAL(currentIndexChanged(int)),this,SLOT(telBarCBcurrentIndexChanged(int)));
-      connect(maxSB[j],SIGNAL(editingFinished()),this,SLOT(telMaxSBeditingFinished()));
-      connect(minSB[j],SIGNAL(editingFinished()),this,SLOT(telMinSBeditingFinished()));
-    }
-    telemetryLock=false;
-}
-
-void ModelEdit::updateA1Fields()
-{
-    float a1ratio,a11value, a12value;
-    if (g_model.frsky.channels[0].ratio==0) {
-      ui->a11ValueSB->setMinimum(0);
-      ui->a11ValueSB->setMaximum(0);
-      ui->a12ValueSB->setMinimum(0);
-      ui->a12ValueSB->setMaximum(0);     
-      ui->a1CalibSB->setMinimum(0);
-      ui->a1CalibSB->setMaximum(0);
-      ui->a1CalibSB->setValue(0);
-      ui->a11ValueSB->setValue(0);
-      ui->a12ValueSB->setValue(0);
-      return;
-    }
-
-    if (g_model.frsky.channels[0].type==0 || g_model.frsky.channels[0].type==1 || g_model.frsky.channels[0].type==2) {
-      a1ratio=(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier)/10.0;
-      ui->a11ValueSB->setDecimals(2);
-      ui->a11ValueSB->setSingleStep(a1ratio/255.0);
-      ui->a12ValueSB->setDecimals(2);
-      ui->a12ValueSB->setSingleStep(a1ratio/255.0);
-      ui->a11ValueSB->setMinimum((g_model.frsky.channels[0].ratio*1.0*g_model.frsky.channels[0].offset)/2550.0);
-      ui->a11ValueSB->setMaximum(a1ratio+(g_model.frsky.channels[0].ratio*1.0*g_model.frsky.channels[0].offset)/2550.0);
-      ui->a12ValueSB->setMinimum((g_model.frsky.channels[0].offset*1.0*g_model.frsky.channels[0].ratio)/2550.0);
-      ui->a12ValueSB->setMaximum(a1ratio+(g_model.frsky.channels[0].offset*1.0*g_model.frsky.channels[0].ratio)/2550.0);
-    } else {
-      a1ratio=g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier;
-      ui->a11ValueSB->setDecimals(2);
-      ui->a11ValueSB->setSingleStep(a1ratio/255.0);
-      ui->a12ValueSB->setDecimals(2);
-      ui->a12ValueSB->setSingleStep(a1ratio/255.0);
-      ui->a11ValueSB->setMinimum((g_model.frsky.channels[0].offset*1.0*g_model.frsky.channels[0].ratio)/255.0);
-      ui->a11ValueSB->setMaximum(a1ratio+(g_model.frsky.channels[0].offset*1.0*g_model.frsky.channels[0].ratio)/255.0);
-      ui->a12ValueSB->setMinimum((g_model.frsky.channels[0].offset*1.0*g_model.frsky.channels[0].ratio)/255.0);
-      ui->a12ValueSB->setMaximum(a1ratio+(g_model.frsky.channels[0].offset*1.0*g_model.frsky.channels[0].ratio)/255.0);
-    }  
-    ui->a1CalibSB->setDecimals(2);
-    ui->a1CalibSB->setMaximum((a1ratio*127)/255.0);
-    ui->a1CalibSB->setMinimum((-a1ratio*128)/255.0);
-    ui->a1CalibSB->setSingleStep(a1ratio/255.0);
-    ui->a1CalibSB->setValue((g_model.frsky.channels[0].offset*a1ratio)/255);
-    a11value=a1ratio*(g_model.frsky.channels[0].alarms[0].value/255.0+g_model.frsky.channels[0].offset/255.0);
-    a12value=a1ratio*(g_model.frsky.channels[0].alarms[1].value/255.0+g_model.frsky.channels[0].offset/255.0);;
-    ui->a11ValueSB->setValue(a11value);
-    ui->a12ValueSB->setValue(a12value);
-}
-
-void ModelEdit::updateA2Fields()
-{
-    float a2ratio,a21value, a22value;
-    if (g_model.frsky.channels[1].ratio==0) {
-      ui->a21ValueSB->setMinimum(0);
-      ui->a21ValueSB->setMaximum(0);
-      ui->a22ValueSB->setMinimum(0);
-      ui->a22ValueSB->setMaximum(0);     
-      ui->a2CalibSB->setMinimum(0);
-      ui->a2CalibSB->setMaximum(0);
-      ui->a2CalibSB->setValue(0);
-      ui->a21ValueSB->setValue(0);
-      ui->a22ValueSB->setValue(0);
-      return;
-    }
-    if (g_model.frsky.channels[1].type==0) {
-      a2ratio=g_model.frsky.channels[1].ratio/10.0;
-      ui->a21ValueSB->setDecimals(2);
-      ui->a21ValueSB->setSingleStep(a2ratio/255.0);
-      ui->a22ValueSB->setDecimals(2);
-      ui->a22ValueSB->setSingleStep(a2ratio/255.0);
-      ui->a21ValueSB->setMinimum((g_model.frsky.channels[1].offset*1.0*g_model.frsky.channels[1].ratio)/2550.0);
-      ui->a21ValueSB->setMaximum(a2ratio+(g_model.frsky.channels[1].offset*1.0*g_model.frsky.channels[1].ratio)/2550.0);
-      ui->a22ValueSB->setMinimum((g_model.frsky.channels[1].offset*1.0*g_model.frsky.channels[1].ratio*1.0)/2550.0);
-      ui->a22ValueSB->setMaximum(a2ratio+(g_model.frsky.channels[1].offset*1.0*g_model.frsky.channels[1].ratio)/2550.0);
-    } else {
-      a2ratio=g_model.frsky.channels[1].ratio;
-      ui->a21ValueSB->setDecimals(2);
-      ui->a21ValueSB->setSingleStep(a2ratio/255.0);
-      ui->a22ValueSB->setDecimals(2);
-      ui->a22ValueSB->setSingleStep(a2ratio/255.0);
-      ui->a21ValueSB->setMinimum((g_model.frsky.channels[1].offset*1.0*g_model.frsky.channels[1].ratio)/255.0);
-      ui->a21ValueSB->setMaximum(a2ratio+(g_model.frsky.channels[1].offset*1.0*g_model.frsky.channels[1].ratio)/255.0);
-      ui->a22ValueSB->setMinimum((g_model.frsky.channels[1].offset*1.0*g_model.frsky.channels[1].ratio)/255.0);
-      ui->a22ValueSB->setMaximum(a2ratio+(g_model.frsky.channels[1].offset*1.0*g_model.frsky.channels[1].ratio)/255.0);
-    }  
-    ui->a2CalibSB->setDecimals(2);
-    ui->a2CalibSB->setMaximum((a2ratio*127)/255.0);
-    ui->a2CalibSB->setMinimum((-a2ratio*128)/255.0);
-    ui->a2CalibSB->setSingleStep(a2ratio/255.0);
-    ui->a2CalibSB->setValue((g_model.frsky.channels[1].offset*a2ratio)/255.0);
-    a21value=a2ratio*(g_model.frsky.channels[1].alarms[0].value/255.0+g_model.frsky.channels[1].offset/255.0);
-    a22value=a2ratio*(g_model.frsky.channels[1].alarms[1].value/255.0+g_model.frsky.channels[1].offset/255.0);
-    ui->a21ValueSB->setValue(a21value);
-    ui->a22ValueSB->setValue(a22value);
-}
-
-void ModelEdit::tabTemplates()
-{
-    ui->templateList->clear();
-    ui->templateList->addItem(tr("Simple 4-CH"));
-    ui->templateList->addItem(tr("T-Cut"));
-    ui->templateList->addItem(tr("Sticky T-Cut"));
-    ui->templateList->addItem(tr("V-Tail"));
-    ui->templateList->addItem(tr("Elevon\\Delta"));
-    ui->templateList->addItem(tr("Heli Setup"));
-    ui->templateList->addItem(tr("Heli Setup with gyro gain control"));
-    ui->templateList->addItem(tr("Gyro gain control"));
-    ui->templateList->addItem(tr("Heli Setup (Futaba's channel assignment style)"));
-    ui->templateList->addItem(tr("Heli Setup with gyro gain control (Futaba's channel assignment style)"));
-    ui->templateList->addItem(tr("Gyro gain control (Futaba's channel assignment style)"));
-    ui->templateList->addItem(tr("Servo Test"));
-    ui->templateList->addItem(tr("MultiCopter"));
-    ui->templateList->addItem(tr("Use Model Config Wizard"));
-}
-
-void ModelEdit::on_modelNameLE_editingFinished()
-{
-    int length=ui->modelNameLE->maxLength();
-    strncpy(g_model.name, ui->modelNameLE->text().toAscii(), length);
-    updateSettings();
-}
-
-void ModelEdit::on_modelImage_CB_currentIndexChanged(int index)
-{
-    if (modelImageLock)
-      return;
-    strncpy(g_model.bitmap, ui->modelImage_CB->currentText().toAscii(), GetEepromInterface()->getCapability(VoicesMaxLength));
-    QSettings settings("companion9x", "companion9x");
-    QString path=settings.value("sdPath", ".").toString();
-    path.append("/BMP/");
-    QDir qd(path);
-    if (qd.exists()) {
-      QString fileName=path;
-      fileName.append(g_model.bitmap);
-      fileName.append(".bmp");
-      QImage image(fileName);
-      if (image.isNull()) {
-        fileName=path;
-        fileName.append(g_model.bitmap);
-        fileName.append(".BMP");
-        image.load(fileName);
-      }
-      if (!image.isNull()) {
-        ui->modelImage_image->setPixmap(QPixmap::fromImage(image.scaled( 64,32)));;
-      } else {
-        ui->modelImage_image->clear();
-      }
-    } else {
-      ui->modelImage_image->clear();
-    }
-    updateSettings();
-}
-
-void ModelEdit::phaseName_editingFinished()
-{
-    QLineEdit *lineEdit = qobject_cast<QLineEdit*>(sender());
-    int phase = lineEdit->objectName().mid(5,1).toInt();
-    QString PhaseName=lineEdit->text();
-    QString TabName;
-    if (phase==0) { 
-      TabName.append(QObject::tr("Flight Mode 0 (Default)"));
-    } else {
-      TabName.append(QObject::tr("FM %1").arg(phase));
-    }
-
-    if (!PhaseName.isEmpty()) {
-      TabName.append(" (");
-      TabName.append(PhaseName);
-      TabName.append(")");
-    }
-    ui->phases->setTabText(phase,TabName);
-    int length=lineEdit->maxLength();
-    strncpy(g_model.phaseData[phase].name, lineEdit->text().toAscii(), length);
-    updateSettings();
-}
-
-void ModelEdit::phaseSwitch_currentIndexChanged()
-{
-    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
-    int phase = comboBox->objectName().mid(5,1).toInt();
-    g_model.phaseData[phase].swtch = RawSwitch(comboBox->itemData(comboBox->currentIndex()).toInt());
-    updateSettings();
-}
-
-void ModelEdit::phaseFadeIn_editingFinished()
-{
-    QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
-    int phase = spinBox->objectName().mid(5,1).toInt();
-    int scale=GetEepromInterface()->getCapability(SlowScale);  
-    g_model.phaseData[phase].fadeIn = round(spinBox->value()*scale);
-    updateSettings();
-}
-
-void ModelEdit::phaseFadeOut_editingFinished()
-{
-    QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
-    int phase = spinBox->objectName().mid(5,1).toInt();
-    int scale=GetEepromInterface()->getCapability(SlowScale);  
-    g_model.phaseData[phase].fadeOut = round(spinBox->value()*scale);
-    updateSettings();
-}
-
-void ModelEdit::on_timer1ModeCB_currentIndexChanged(int index)
-{
-    g_model.timers[0].mode = TimerMode(ui->timer1ModeCB->itemData(index).toInt());
-    updateSettings();
-}
-
-void ModelEdit::on_timer1DirCB_currentIndexChanged(int index)
-{
-    g_model.timers[0].dir = index;
-    updateSettings();
-}
-
-void ModelEdit::on_timer1ValTE_editingFinished()
-{
-    g_model.timers[0].val = ui->timer1ValTE->time().minute()*60 + ui->timer1ValTE->time().second();
-    updateSettings();
-}
-
-void ModelEdit::on_timer1ModeBCB_currentIndexChanged(int index)
-{
-    g_model.timers[0].modeB = ui->timer1ModeBCB->itemData(index).toInt();
-    updateSettings();
-}
-
-void ModelEdit::on_timer2ModeCB_currentIndexChanged(int index)
-{
-    g_model.timers[1].mode = TimerMode(ui->timer2ModeCB->itemData(index).toInt());
-    updateSettings();
-}
-
-void ModelEdit::on_timer2DirCB_currentIndexChanged(int index)
-{
-    g_model.timers[1].dir = index;
-    updateSettings();
-}
-
-void ModelEdit::on_timer2ValTE_editingFinished()
-{
-    g_model.timers[1].val = ui->timer2ValTE->time().minute()*60 + ui->timer2ValTE->time().second();
-    updateSettings();
-}
-
-void ModelEdit::on_timer2ModeBCB_currentIndexChanged(int index)
-{
-    g_model.timers[1].modeB = ui->timer2ModeBCB->itemData(index).toInt();
-    updateSettings();
-}
-
-void ModelEdit::on_trimIncCB_currentIndexChanged(int index)
-{
-    g_model.trimInc = index;
-    updateSettings();
-}
-
-void ModelEdit::on_ttraceCB_currentIndexChanged(int index)
-{
-    g_model.thrTraceSrc = index;
-    updateSettings();
-}
-
-void ModelEdit::on_pulsePolCB_currentIndexChanged(int index)
-{
-    g_model.moduleData[0].ppmPulsePol = index;
-    updateSettings();
-}
-
-void ModelEdit::on_pulsePolCB_2_currentIndexChanged(int index)
-{
-    g_model.moduleData[1].ppmPulsePol = index;
-    updateSettings();
-}
-
-void ModelEdit::on_pulsePolCB_3_currentIndexChanged(int index)
-{
-    g_model.moduleData[2].ppmPulsePol = index;
-    updateSettings();
-}
-
-void ModelEdit::on_protocolCB_currentIndexChanged(int index)
-{
-  if (!protocolEditLock) {
-    protocolEditLock=true;
-    
-    g_model.moduleData[0].protocol=(Protocol)ui->protocolCB->itemData(index).toInt();
-    int protocol=g_model.moduleData[0].protocol;
-  //  g_model.protocol = (Protocol)index;
-    if (protocol==PXX_XJT_D8 || protocol==OFF) {
-      ui->FSGB_1->hide();
-    } else {
-      ui->fsm1CB->setCurrentIndex(g_model.moduleData[0].failsafeMode);
-      on_fsm1CB_currentIndexChanged(g_model.moduleData[0].failsafeMode);
-      ui->FSGB_1->show();
-    }
-    updateSettings();
-
-    ui->ppmDelaySB->setEnabled(!protocol);
-    ui->numChannelsSB->setEnabled(!protocol);
-
-    if (GetEepromInterface()->getCapability(HasPPMStart)) {
-      ui->numChannelsSB->setSingleStep(1);
-    } else {
-      ui->numChannelsSB->setSingleStep(2);
-    }
-
-    switch (protocol) {
-      case OFF:
-        ui->label_PPM->hide();
-        ui->ppmDelaySB->hide();
-        ui->label_PPMCH->hide();
-        ui->label_pulsePol->hide();
-        ui->pulsePolCB->hide();
-        ui->numChannelsSB->hide();
-        ui->label_ppmFrameLength->hide();
-        ui->ppmFrameLengthDSB->hide();
-        ui->label_DSM->hide();
-        ui->DSM_Type->hide();
-        ui->label_PXX->hide();
-        ui->pxxRxNum->hide();
-        ui->label_numChannelsStart->hide();
-        ui->numChannelsStart->hide();
-        break;    
-      case PXX_XJT_X16:
-      case PXX_XJT_D8:
-      case PXX_XJT_LR12:
-      case PXX_DJT:
-        ui->label_PPM->hide();
-        ui->ppmDelaySB->hide();
-        ui->ppmDelaySB->setEnabled(false);
-        ui->label_PPMCH->show();
-        ui->label_pulsePol->hide();
-        ui->pulsePolCB->hide();
-        ui->numChannelsSB->show();
-        ui->numChannelsSB->setEnabled(true);
-        ui->label_ppmFrameLength->hide();
-        ui->ppmFrameLengthDSB->hide();
-        ui->ppmFrameLengthDSB->setEnabled(false);
-        ui->label_DSM->hide();
-        ui->DSM_Type->hide();
-        ui->DSM_Type->setEnabled(false);
-        ui->label_PXX->show();
-        ui->pxxRxNum->setMinimum(0);
-        ui->pxxRxNum->show();
-        ui->pxxRxNum->setEnabled(true);
-        ui->pxxRxNum->setValue((g_model.moduleData[0].channelsCount-8)/2+1);
-        ui->label_numChannelsStart->show();
-        ui->numChannelsStart->show();
-        ui->numChannelsStart->setValue(g_model.moduleData[0].channelsStart+1);
-        ui->numChannelsSB->setMinimum(g_model.moduleData[0].channelsStart+4);
-        ui->numChannelsSB->setValue(g_model.moduleData[0].channelsStart+g_model.moduleData[0].channelsCount);
-        break;
-      case LP45:
-      case DSM2:
-      case DSMX:
-        ui->label_pulsePol->hide();
-        ui->pulsePolCB->hide();
-        ui->label_PPM->hide();
-        ui->ppmDelaySB->hide();
-        ui->ppmDelaySB->setEnabled(false);
-        ui->label_PPMCH->hide();
-        ui->label_numChannelsStart->hide();
-        ui->numChannelsStart->hide();
-        ui->numChannelsSB->hide();
-        ui->numChannelsSB->setEnabled(false);
-        ui->label_ppmFrameLength->hide();
-        ui->ppmFrameLengthDSB->hide();
-        ui->ppmFrameLengthDSB->setEnabled(false);
-        if (!GetEepromInterface()->getCapability(DSM2Indexes)) {
-          ui->label_PXX->hide();
-          ui->pxxRxNum->hide();
-          ui->pxxRxNum->setEnabled(false);
-        }
-        else {
-          ui->pxxRxNum->setMinimum(0);
-          ui->pxxRxNum->setValue(g_model.modelId);
-          ui->label_PXX->show();
-          ui->pxxRxNum->show();
-          ui->pxxRxNum->setEnabled(true);         
-        }
-        ui->DSM_Type->setEnabled(false);
-        ui->label_DSM->hide();
-        ui->DSM_Type->hide();
-        break;
-      default:
-        if (GetEepromInterface()->getCapability(HasPPMStart)) {
-          ui->label_numChannelsStart->show();
-          ui->numChannelsStart->show();
-        }
-        else {
-          ui->label_numChannelsStart->hide();
-          ui->numChannelsStart->hide();
-        }
-        ui->numChannelsStart->setValue(g_model.moduleData[0].channelsStart+1);
-        ui->numChannelsSB->setMinimum(g_model.moduleData[0].channelsStart+4);
-        ui->numChannelsSB->setValue(g_model.moduleData[0].channelsStart + g_model.moduleData[0].channelsCount);
-        ui->label_pulsePol->show();
-        ui->pulsePolCB->show();
-        ui->label_DSM->hide();
-        ui->DSM_Type->hide();
-        ui->DSM_Type->setEnabled(false);
-        ui->label_PXX->hide();
-        ui->pxxRxNum->hide();
-        ui->pxxRxNum->setEnabled(false);
-        ui->label_PPM->show();
-        ui->ppmDelaySB->show();        
-        ui->ppmDelaySB->setEnabled(true);
-        ui->label_PPMCH->show();
-        ui->numChannelsSB->show();        
-        ui->numChannelsSB->setEnabled(true);
-        ui->ppmFrameLengthDSB->setEnabled(true);
-        ui->ppmFrameLengthDSB->setMinimum(g_model.moduleData[0].channelsCount*(g_model.extendedLimits ? 2.250 :2)+3.5);
-        if (GetEepromInterface()->getCapability(PPMExtCtrl)) {
-          ui->ppmFrameLengthDSB->show();
-          ui->label_ppmFrameLength->show();
-        }
-
-        break;
-    }
-    protocolEditLock=false;
-  }
-}
-
-void ModelEdit::on_protocolCB_2_currentIndexChanged(int index)
-{
-  if (!protocol2EditLock) {
-    protocol2EditLock=true;
-    
-    g_model.moduleData[1].protocol=(Protocol)ui->protocolCB_2->itemData(index).toInt();
-    int protocol=g_model.moduleData[1].protocol;
-    if (protocol==PXX_XJT_X16 || protocol==PXX_XJT_LR12) {
-      ui->FSGB_2->show();
-      ui->fsm2CB->setCurrentIndex(g_model.moduleData[1].failsafeMode);
-      on_fsm2CB_currentIndexChanged(g_model.moduleData[1].failsafeMode);
-    } else {
-      ui->FSGB_2->hide();
-    }
-  //  g_model.protocol = (Protocol)index;
-    updateSettings();
-
-    ui->ppmDelaySB_2->setEnabled(!protocol);
-    ui->numChannelsSB_2->setEnabled(!protocol);
-
-    if (GetEepromInterface()->getCapability(HasPPMStart)) {
-      ui->numChannelsSB_2->setSingleStep(1);
-    } else {
-      ui->numChannelsSB_2->setSingleStep(2);
-    }
-
-    switch (protocol) {
-      case OFF:
-        ui->label_PPM_2->hide();
-        ui->ppmDelaySB_2->hide();
-        ui->label_PPMCH_2->hide();
-        ui->label_pulsePol_2->hide();
-        ui->pulsePolCB_2->hide();
-        ui->numChannelsSB_2->hide();
-        ui->label_ppmFrameLength_2->hide();
-        ui->ppmFrameLengthDSB_2->hide();
-        ui->label_DSM_2->hide();
-        ui->DSM_Type_2->hide();
-        ui->label_PXX_2->hide();
-        ui->pxxRxNum_2->hide();
-        ui->label_numChannelsStart_2->hide();
-        ui->numChannelsStart_2->hide();
-        break;    
-      case PXX_XJT_X16:
-      case PXX_XJT_D8:
-      case PXX_XJT_LR12:
-      case PXX_DJT:
-        ui->label_PPM_2->hide();
-        ui->ppmDelaySB_2->hide();
-        ui->ppmDelaySB_2->setEnabled(false);
-        ui->label_PPMCH_2->show();
-        ui->label_pulsePol_2->hide();
-        ui->pulsePolCB_2->hide();
-        ui->numChannelsSB_2->show();
-        ui->numChannelsSB_2->setEnabled(true);
-        ui->label_ppmFrameLength_2->hide();
-        ui->ppmFrameLengthDSB_2->hide();
-        ui->ppmFrameLengthDSB_2->setEnabled(false);
-        ui->label_DSM_2->hide();
-        ui->DSM_Type_2->hide();
-        ui->DSM_Type_2->setEnabled(false);
-        ui->label_PXX_2->show();
-        ui->pxxRxNum_2->setMinimum(0);
-        ui->pxxRxNum_2->show();
-        ui->pxxRxNum_2->setEnabled(true);
-        ui->pxxRxNum_2->setValue(g_model.modelId);
-        ui->label_numChannelsStart_2->show();
-        ui->numChannelsStart_2->show();
-        ui->numChannelsStart_2->setValue(g_model.moduleData[1].channelsStart+1);
-        ui->numChannelsSB_2->setMinimum(g_model.moduleData[1].channelsStart+4);
-        ui->numChannelsSB_2->setValue(g_model.moduleData[1].channelsStart+g_model.moduleData[1].channelsCount);
-        break;
-      case LP45:
-      case DSM2:
-      case DSMX:
-        ui->label_pulsePol_2->hide();
-        ui->pulsePolCB_2->hide();
-        ui->label_PPM_2->hide();
-        ui->ppmDelaySB_2->hide();
-        ui->ppmDelaySB_2->setEnabled(false);
-        ui->label_PPMCH_2->hide();
-        ui->numChannelsSB_2->hide();
-        ui->numChannelsSB_2->setEnabled(false);
-        ui->label_ppmFrameLength_2->hide();
-        ui->ppmFrameLengthDSB_2->hide();
-        ui->ppmFrameLengthDSB_2->setEnabled(false);
-        if (!GetEepromInterface()->getCapability(DSM2Indexes)) {
-          ui->label_PXX_2->hide();
-          ui->pxxRxNum_2->hide();
-          ui->pxxRxNum_2->setEnabled(false);
-        } else {
-          ui->pxxRxNum_2->setMinimum(0);
-          ui->pxxRxNum_2->setValue(g_model.modelId);
-          ui->label_PXX_2->show();
-          ui->pxxRxNum_2->show();
-          ui->pxxRxNum_2->setEnabled(true);         
-        }
-        ui->DSM_Type_2->setEnabled(false);
-        ui->label_DSM_2->hide();
-        ui->DSM_Type_2->hide();
-        break;
-      default:
-        if (GetEepromInterface()->getCapability(HasPPMStart)) {
-          ui->label_numChannelsStart_2->show();
-          ui->numChannelsStart_2->show();
-        } else {
-          ui->label_numChannelsStart_2->hide();
-          ui->numChannelsStart_2->hide();
-        }
-        ui->numChannelsStart_2->setValue(g_model.moduleData[1].channelsStart+1);
-        ui->numChannelsSB_2->setMinimum(g_model.moduleData[1].channelsStart+4);
-        ui->numChannelsSB_2->setValue(g_model.moduleData[1].channelsStart+g_model.moduleData[1].channelsCount);
-        ui->label_pulsePol_2->show();
-        ui->pulsePolCB_2->show();
-        ui->pulsePolCB_2->setCurrentIndex(g_model.moduleData[1].ppmPulsePol);
-        ui->label_DSM_2->hide();
-        ui->DSM_Type_2->hide();
-        ui->DSM_Type_2->setEnabled(false);
-        ui->label_PXX_2->hide();
-        ui->pxxRxNum_2->hide();
-        ui->pxxRxNum_2->setEnabled(false);
-        ui->label_PPM_2->show();
-        ui->ppmDelaySB_2->show();        
-        ui->ppmDelaySB_2->setEnabled(true);
-        ui->ppmDelaySB_2->setValue(g_model.moduleData[1].ppmDelay);
-        ui->label_PPMCH_2->show();
-        ui->numChannelsSB_2->show();        
-        ui->numChannelsSB_2->setEnabled(true);
-        ui->ppmFrameLengthDSB_2->setEnabled(true);
-        ui->ppmFrameLengthDSB_2->setMinimum(g_model.moduleData[1].channelsCount*(g_model.extendedLimits ? 2.250 :2)+3.5);
-        if (GetEepromInterface()->getCapability(PPMExtCtrl)) {
-          ui->ppmFrameLengthDSB_2->show();
-          ui->label_ppmFrameLength_2->show();
-          ui->ppmFrameLengthDSB_2->setValue(g_model.moduleData[1].ppmFrameLength/2.0+22.5);
-        }
-        break;
-    }
-    protocol2EditLock=false;
-  }
-}
-
-void ModelEdit::on_protocolCB_3_currentIndexChanged(int index)
-{
-  if (!trainerEditLock) {
-    trainerEditLock=true;
-    
-    g_model.moduleData[2].protocol=ui->protocolCB_3->currentIndex();
-    g_model.trainerMode=ui->protocolCB_3->currentIndex();
-    updateSettings();
-    switch (index) {
-      case 0:
-        ui->label_PPM_3->hide();
-        ui->ppmDelaySB_3->hide();
-        ui->label_PPMCH_3->hide();
-        ui->label_pulsePol_3->hide();
-        ui->pulsePolCB_3->hide();
-        ui->numChannelsSB_3->hide();
-        ui->label_ppmFrameLength_3->hide();
-        ui->ppmFrameLengthDSB_3->hide();
-        ui->label_numChannelsStart_3->hide();
-        ui->numChannelsStart_3->hide();
-        break;    
-      default:
-        ui->label_PPM_3->show();
-        ui->ppmDelaySB_3->show();
-        ui->label_PPMCH_3->show();
-        ui->label_pulsePol_3->show();
-        ui->pulsePolCB_3->show();
-        ui->numChannelsSB_3->show();
-        ui->label_ppmFrameLength_3->show();
-        ui->ppmFrameLengthDSB_3->show();
-        ui->label_numChannelsStart_3->show();
-        ui->numChannelsStart_3->show();
-        ui->numChannelsStart_3->setValue(g_model.moduleData[2].channelsStart+1);
-        ui->numChannelsSB_3->setMinimum(g_model.moduleData[2].channelsStart+4);
-        ui->numChannelsSB_3->setValue(g_model.moduleData[2].channelsStart+g_model.moduleData[2].channelsCount);
-        ui->pulsePolCB_3->setCurrentIndex(g_model.moduleData[2].ppmPulsePol);
-        ui->ppmDelaySB_3->setValue(g_model.moduleData[2].ppmDelay);
-        ui->ppmFrameLengthDSB_3->setMinimum(g_model.moduleData[2].channelsCount*(g_model.extendedLimits ? 2.250 :2)+3.5);
-        if (GetEepromInterface()->getCapability(PPMExtCtrl)) {
-          ui->ppmFrameLengthDSB_3->show();
-          ui->label_ppmFrameLength_3->show();
-          ui->ppmFrameLengthDSB_3->setValue(g_model.moduleData[2].ppmFrameLength/2.0+22.5);
-        }
-        break;
-    }
-    trainerEditLock=false;
-  }
-}
-
-
-void ModelEdit::on_numChannelsSB_editingFinished()
-{
-    // TODO only accept valid values
-    g_model.moduleData[0].channelsCount = 1+ui->numChannelsSB->value()-ui->numChannelsStart->value();
-    ui->ppmFrameLengthDSB->setMinimum(g_model.moduleData[0].channelsCount*(g_model.extendedLimits ? 2.250 :2)+3.5);
-    updateSettings();
-}
-
-void ModelEdit::on_numChannelsSB_2_editingFinished()
-{
-    // TODO only accept valid values
-    g_model.moduleData[1].channelsCount = 1+ui->numChannelsSB_2->value()-ui->numChannelsStart_2->value();
-    ui->ppmFrameLengthDSB_2->setMinimum(g_model.moduleData[1].channelsCount*(g_model.extendedLimits ? 2.250 :2.0)+3.5);
-    updateSettings();
-}
-
-void ModelEdit::on_numChannelsSB_3_editingFinished()
-{
-    // TODO only accept valid values
-    g_model.moduleData[2].channelsCount = 1+ui->numChannelsSB_3->value()-ui->numChannelsStart_3->value();
-    ui->ppmFrameLengthDSB_3->setMinimum(g_model.moduleData[2].channelsCount*(g_model.extendedLimits ? 2.250 :2)+3.5);
-    updateSettings();
-}
-
-void ModelEdit::on_numChannelsStart_editingFinished()
-{
-    // TODO only accept valid values
-    g_model.moduleData[0].channelsStart = ui->numChannelsStart->value()-1;
-    ui->numChannelsSB->setMinimum(g_model.moduleData[0].channelsStart+4);
-    ui->numChannelsSB->setValue(g_model.moduleData[0].channelsStart+g_model.moduleData[0].channelsCount);
-    updateSettings();
-}
-
-void ModelEdit::on_numChannelsStart_2_editingFinished()
-{
-    // TODO only accept valid values
-    g_model.moduleData[1].channelsStart = ui->numChannelsStart_2->value()-1;
-    ui->numChannelsSB_2->setMinimum(g_model.moduleData[1].channelsStart+4);
-    ui->numChannelsSB_2->setValue(g_model.moduleData[1].channelsStart+g_model.moduleData[1].channelsCount);
-    updateSettings();
-}
-
-void ModelEdit::on_numChannelsStart_3_editingFinished()
-{
-    // TODO only accept valid values
-    g_model.moduleData[2].channelsStart = ui->numChannelsStart_3->value()-1;
-    ui->numChannelsSB_3->setMinimum(g_model.moduleData[2].channelsStart+4);
-    ui->numChannelsSB_3->setValue(g_model.moduleData[2].channelsStart+g_model.moduleData[2].channelsCount);
-    updateSettings();
-}
-
-void ModelEdit::on_ppmDelaySB_editingFinished()
-{
-    if(protocolEditLock) return;
-    // TODO only accept valid values
-    g_model.moduleData[0].ppmDelay = ui->ppmDelaySB->value();
-    updateSettings();
-}
-
-void ModelEdit::on_ppmDelaySB_2_editingFinished()
-{
-    if(protocol2EditLock) return;
-    // TODO only accept valid values
-    g_model.moduleData[1].ppmDelay = ui->ppmDelaySB_2->value();
-    updateSettings();
-}
-
-void ModelEdit::on_ppmDelaySB_3_editingFinished()
-{
-    if(trainerEditLock) return;
-    // TODO only accept valid values
-    g_model.moduleData[2].ppmDelay = ui->ppmDelaySB_3->value();
-    updateSettings();
-}
-
-void ModelEdit::on_DSM_Type_currentIndexChanged(int index)
-{
-    if(protocolEditLock) return;
-    // g_model.moduleData[0].channelsCount = (index*2)+8;
-    updateSettings();
-}
-
-void ModelEdit::on_DSM_Type_2_currentIndexChanged(int index)
-{
-    if(protocol2EditLock) return;
-    // g_model.moduleData[1].channelsCount = (index*2)+8;
-    updateSettings();
-}
-
-void ModelEdit::on_pxxRxNum_editingFinished()
-{
-    if(protocolEditLock)
-      return;
-
-    if (!GetEepromInterface()->getCapability(DSM2Indexes)) {
-      // g_model.moduleData[0].channelsCount = (ui->pxxRxNum->value()-1)*2+8;
-    } else {
-      g_model.modelId = ui->pxxRxNum->value();
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_pxxRxNum_2_editingFinished()
-{
-    if(protocol2EditLock)
-      return;
-
-    /* if (!GetEepromInterface()->getCapability(DSM2Indexes)) {
-      g_model.moduleData[1].channelsCount = (ui->pxxRxNum_2->value()-1)*2+8;
-    } */
-    updateSettings();
-}
-
-void ModelEdit::on_ppmFrameLengthDSB_editingFinished()
-{
-    g_model.moduleData[0].ppmFrameLength = (ui->ppmFrameLengthDSB->value()-22.5)/0.5;
-    updateSettings();
-}
-
-void ModelEdit::on_ppmFrameLengthDSB_2_editingFinished()
-{
-    g_model.moduleData[1].ppmFrameLength = (ui->ppmFrameLengthDSB_2->value()-22.5)/0.5;
-    updateSettings();
-}
-
-void ModelEdit::on_ppmFrameLengthDSB_3_editingFinished()
-{
-    g_model.moduleData[2].ppmFrameLength = (ui->ppmFrameLengthDSB_3->value()-22.5)/0.5;
-    updateSettings();
-}
-
-void ModelEdit::on_fsm1CB_currentIndexChanged(int index)
-{
-    QSpinBox * fssb[] = { ui->fsm1SB_1, ui->fsm1SB_2,ui->fsm1SB_3,ui->fsm1SB_4,ui->fsm1SB_5,ui->fsm1SB_6,ui->fsm1SB_7,ui->fsm1SB_8,
-                                 ui->fsm1SB_9, ui->fsm1SB_10,ui->fsm1SB_11,ui->fsm1SB_12,ui->fsm1SB_13,ui->fsm1SB_14,ui->fsm1SB_15,ui->fsm1SB_16, NULL };
-    QSlider * fssld[] = { ui->fsm1SL_1, ui->fsm1SL_2,ui->fsm1SL_3,ui->fsm1SL_4,ui->fsm1SL_5,ui->fsm1SL_6,ui->fsm1SL_7,ui->fsm1SL_8,
-                                 ui->fsm1SL_9, ui->fsm1SL_10,ui->fsm1SL_11,ui->fsm1SL_12,ui->fsm1SL_13,ui->fsm1SL_14,ui->fsm1SL_15,ui->fsm1SL_16, NULL };
-    g_model.moduleData[0].failsafeMode=index;
-    for (int i=0; fssb[i]; i++) {
-     if (index==1) {
-        fssb[i]->setEnabled(true);
-        fssld[i]->setEnabled(true);
-      } else {
-        fssb[i]->setDisabled(true);
-        fssld[i]->setDisabled(true);     
-      }
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_fsm2CB_currentIndexChanged(int index)
-{
-    QSpinBox * fssb[] = { ui->fsm2SB_1, ui->fsm2SB_2,ui->fsm2SB_3,ui->fsm2SB_4,ui->fsm2SB_5,ui->fsm2SB_6,ui->fsm2SB_7,ui->fsm2SB_8,
-                                 ui->fsm2SB_9, ui->fsm2SB_10,ui->fsm2SB_11,ui->fsm2SB_12,ui->fsm2SB_13,ui->fsm2SB_14,ui->fsm2SB_15,ui->fsm2SB_16, NULL };
-    QSlider * fssld[] = { ui->fsm2SL_1, ui->fsm2SL_2,ui->fsm2SL_3,ui->fsm2SL_4,ui->fsm2SL_5,ui->fsm2SL_6,ui->fsm2SL_7,ui->fsm2SL_8,
-                                 ui->fsm2SL_9, ui->fsm2SL_10,ui->fsm2SL_11,ui->fsm2SL_12,ui->fsm2SL_13,ui->fsm2SL_14,ui->fsm2SL_15,ui->fsm2SL_16, NULL };  
-    g_model.moduleData[1].failsafeMode=index;
-    for (int i=0; fssb[i]; i++) {
-     if (index==1) {
-        fssb[i]->setEnabled(true);
-        fssld[i]->setEnabled(true);
-      } else {
-        fssb[i]->setDisabled(true);
-        fssld[i]->setDisabled(true);     
-      }
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_instantTrim_CB_currentIndexChanged(int index)
-{
-    if(switchEditLock) return;
-    bool found=false;
-    for (int i=0; i< C9X_MAX_CUSTOM_FUNCTIONS; i++) {
-      if (g_model.funcSw[i].func==FuncInstantTrim) {
-        g_model.funcSw[i].swtch = RawSwitch(ui->instantTrim_CB->itemData(ui->instantTrim_CB->currentIndex()).toInt());
-        found=true;
-      }
-    }
-    if (found==false) {
-      for (int i=0; i< C9X_MAX_CUSTOM_FUNCTIONS; i++) {
-        if (g_model.funcSw[i].swtch==RawSwitch()) {
-          g_model.funcSw[i].swtch = RawSwitch(ui->instantTrim_CB->itemData(ui->instantTrim_CB->currentIndex()).toInt());
-          g_model.funcSw[i].func = FuncInstantTrim;
-          break;
-        }
-      }
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_a1UnitCB_currentIndexChanged(int index) {
-    float a1ratio;
-    g_model.frsky.channels[0].type=index;
-    switch (index) {
-      case 0:
-      case 1:
-      case 2:
-        ui->a1RatioSB->setDecimals(1);
-        ui->a1RatioSB->setMaximum(25.5*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
-        a1ratio=(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier)/10.0;
-        break;
-      default:
-        ui->a1RatioSB->setDecimals(0);
-        ui->a1RatioSB->setMaximum(255*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
-        a1ratio=(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier);
-        break;
-    }
-    ui->a1RatioSB->setValue(a1ratio);
-    updateA1Fields();
-    updateSettings();
-}
-
-void ModelEdit::on_a1RatioSB_valueChanged()
-{
-    if (telemetryLock) return;
-    if (g_model.frsky.channels[0].type==0 || g_model.frsky.channels[0].type==1 || g_model.frsky.channels[0].type==2) {
-      g_model.frsky.channels[0].multiplier = findmult(ui->a1RatioSB->value(), 25.5);
-      float singlestep =(1<<g_model.frsky.channels[0].multiplier)/10.0;
-      telemetryLock=true;
-      ui->a1RatioSB->setSingleStep(singlestep);
-      ui->a1RatioSB->setValue(round(ui->a1RatioSB->value()/singlestep)*singlestep);
-      telemetryLock=false;
-    } else {
-      g_model.frsky.channels[0].multiplier = findmult(ui->a1RatioSB->value(), 255);
-      float singlestep =(1<<g_model.frsky.channels[0].multiplier);
-      telemetryLock=true;
-      ui->a1RatioSB->setSingleStep(singlestep);
-      ui->a1RatioSB->setValue(round(ui->a1RatioSB->value()/singlestep)*singlestep);
-      telemetryLock=false;
-    }  
-}
-
-void ModelEdit::on_a1RatioSB_editingFinished()
-{
-    float a1ratio, a1calib, a11value,a12value;
-    if (telemetryLock) return;
-    if (g_model.frsky.channels[0].type==0 || g_model.frsky.channels[0].type==1 || g_model.frsky.channels[0].type==2) {
-      g_model.frsky.channels[0].multiplier = findmult(ui->a1RatioSB->value(), 25.5);
-      ui->a1CalibSB->setSingleStep((1<<g_model.frsky.channels[0].multiplier)/10.0);
-      ui->a11ValueSB->setSingleStep((1<<g_model.frsky.channels[0].multiplier)/10.0);
-      ui->a12ValueSB->setSingleStep((1<<g_model.frsky.channels[0].multiplier)/10.0);
-      g_model.frsky.channels[0].ratio = ((int)(round(ui->a1RatioSB->value()*10))/(1 <<g_model.frsky.channels[0].multiplier));
-    }  else {
-      g_model.frsky.channels[0].multiplier = findmult(ui->a1RatioSB->value(), 255);
-      ui->a1CalibSB->setSingleStep(1<<g_model.frsky.channels[0].multiplier);
-      ui->a11ValueSB->setSingleStep(1<<g_model.frsky.channels[0].multiplier);
-      ui->a12ValueSB->setSingleStep(1<<g_model.frsky.channels[0].multiplier);
-      g_model.frsky.channels[0].ratio = (ui->a1RatioSB->value()/(1 << g_model.frsky.channels[0].multiplier));
-    }
-    ui->a1CalibSB->setMaximum((ui->a1RatioSB->value()*127)/255);
-    ui->a1CalibSB->setMinimum((ui->a1RatioSB->value()*-128)/255);
-    ui->a11ValueSB->setMaximum(ui->a1RatioSB->value());
-    ui->a12ValueSB->setMaximum(ui->a1RatioSB->value());
-    repaint();
-    a1ratio=g_model.frsky.channels[0].ratio * (1 << g_model.frsky.channels[0].multiplier);
-    a1calib=ui->a1CalibSB->value();
-    a11value=ui->a11ValueSB->value();
-    a12value=ui->a12ValueSB->value();
-    if (g_model.frsky.channels[0].type==0) {
-      a1calib*=10;
-      a11value*=10;
-      a12value*=10; 
-    }
-    if (a1calib>0) {
-      if (a1calib>((a1ratio*127)/255)) {
-        g_model.frsky.channels[0].offset=127;
-      } else {
-        g_model.frsky.channels[0].offset=round(a1calib*255/a1ratio);
-      }
-    }
-    if (a1calib<0) {
-      if (a1calib<((a1ratio*-128)/255)) {
-        g_model.frsky.channels[0].offset=-128;
-      } else {
-        g_model.frsky.channels[0].offset=round(a1calib*255/a1ratio);
-      }
-    }
-    g_model.frsky.channels[0].alarms[0].value=round((a11value*255-g_model.frsky.channels[0].offset*(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier))/(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier));
-    g_model.frsky.channels[0].alarms[1].value=round((a12value*255-g_model.frsky.channels[0].offset*(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier))/(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier)); 
-    updateA1Fields();
-    telBarUpdate();
-    updateSettings();
-}
-
-void ModelEdit::on_a1CalibSB_editingFinished()
-{
-    float a1ratio,a1calib,a11value,a12value;
-    if (g_model.frsky.channels[0].type==0 || g_model.frsky.channels[0].type==1 || g_model.frsky.channels[0].type==2) {
-      a1ratio=(g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier)/10.0;
-    } else {
-      a1ratio=g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier;
-    }
-    if (a1ratio!=0) {
-      g_model.frsky.channels[0].offset = round((255*ui->a1CalibSB->value()/a1ratio));
-      a1calib=a1ratio*g_model.frsky.channels[0].offset/255.0;
-      a11value=ui->a11ValueSB->value();
-      a12value=ui->a12ValueSB->value();
-      if (a11value<a1calib) {
-        a11value=a1calib;
-      } else if (a11value>(a1ratio+a1calib)) {
-        a11value=a1ratio+a1calib;
-      }
-      if (a12value<a1calib) {
-        a12value=a1calib;
-      } else if (a12value>(a1ratio+a1calib)) {
-        a12value=a1ratio+a1calib;
-      }
-      g_model.frsky.channels[0].alarms[0].value=round(((a11value-a1calib)*255)/a1ratio);
-      g_model.frsky.channels[0].alarms[1].value=round(((a12value-a1calib)*255)/a1ratio);
-    } else {
-      g_model.frsky.channels[0].offset=0;
-      g_model.frsky.channels[0].alarms[0].value=0;
-      g_model.frsky.channels[0].alarms[1].value=0;
-    }
-    updateA1Fields();
-    telBarUpdate();
-    updateSettings();
-}
-
-void ModelEdit::on_a11LevelCB_currentIndexChanged(int index)
-{
-    g_model.frsky.channels[0].alarms[0].level = index;
-    updateSettings();
-}
-
-void ModelEdit::on_frskyUnitsCB_currentIndexChanged(int index)
-{
-    g_model.frsky.imperial=index;
-    updateSettings();
-}
-
-void ModelEdit::on_frskyBladesCB_currentIndexChanged(int index)
-{
-    g_model.frsky.blades=index;
-    updateSettings();
-}
-
-void ModelEdit::on_frskyCurrentCB_currentIndexChanged(int index)
-{
-    g_model.frsky.currentSource=index;
-    updateSettings();
-}
-
-void ModelEdit::on_frskyVoltCB_currentIndexChanged(int index)
-{
-    g_model.frsky.voltsSource=index;
-    updateSettings();
-}
-
-void ModelEdit::on_frskyProtoCB_currentIndexChanged(int index)
-{
-    if (telemetryLock) return;
-    int bindex[12];
-    telemetryLock=true;
-    for (int i=0; i<12; i++) {
-      bindex[i]=barsCB[i]->currentIndex();
-      g_model.frsky.usrProto=index;
-      populateCustomScreenFieldCB(barsCB[i], bindex[i], false, g_model.frsky.usrProto);
-    }
-    if (!GetEepromInterface()->getCapability(TelemetryCSFields)) {
-      ui->groupBox_5->hide();
-    } else {
-      for (int screen=0; screen<2;screen++) {
-        for (int rows=0; rows<4; rows++) {
-          for (int cols=0; cols<3; cols++) {
-            int index=screen*12+cols*4+rows;
-            populateCustomScreenFieldCB(csf[index], g_model.frsky.screens[screen].body.lines[rows].source[cols], (rows<4), g_model.frsky.usrProto);
-          }
-        }
-      }
-    }
-    telemetryLock=false;
-    if (index==0) {
-      for (int i=0; i<12; i++) {
-        if (bindex[i]>2) {
-          barsCB[i]->setCurrentIndex(0);
-        } else {
-          barsCB[i]->setCurrentIndex(bindex[i]);
-        }
-      }
-    } else if (index==2) {
-      for (int i=0; i<12; i++) {
-        if (bindex[i]>3) {
-          barsCB[i]->setCurrentIndex(0);
-        } else {
-          barsCB[i]->setCurrentIndex(bindex[i]);
-        }
-      }
-    } else {
-      for (int i=0; i<12; i++) {
-        barsCB[i]->setCurrentIndex(bindex[i]);
-      }
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_a11GreaterCB_currentIndexChanged(int index)
-{
-    g_model.frsky.channels[0].alarms[0].greater = index;
-    updateSettings();
-}
-
-void ModelEdit::on_a11ValueSB_editingFinished()
-{
-    float a1ratio, a1calib, a11value;
-    a1ratio=g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier;
-    a1calib=g_model.frsky.channels[0].offset;
-    a11value=ui->a11ValueSB->value();
-    if (g_model.frsky.channels[0].type==0) {
-      a1ratio/=10;
-    }
-    if (a11value<((a1calib*a1ratio)/255)) {
-      g_model.frsky.channels[0].alarms[0].value=0;
-    } else if (a11value>(a1ratio+(a1calib*a1ratio)/255)) {
-      g_model.frsky.channels[0].alarms[0].value=255;
-    } else {
-      g_model.frsky.channels[0].alarms[0].value = round((a11value-((a1calib*a1ratio)/255))/a1ratio*255);
-    }
-    updateA1Fields();
-    updateSettings();
-}
-
-void ModelEdit::on_a12LevelCB_currentIndexChanged(int index)
-{
-    g_model.frsky.channels[0].alarms[1].level = index;
-    updateSettings();
-}
-
-void ModelEdit::on_a12GreaterCB_currentIndexChanged(int index)
-{
-    g_model.frsky.channels[0].alarms[1].greater = index;
-    updateSettings();
-}
-
-void ModelEdit::on_a12ValueSB_editingFinished()
-{
-    float a1ratio, a1calib, a12value;
-    a1ratio=g_model.frsky.channels[0].ratio<<g_model.frsky.channels[0].multiplier;
-    a1calib=g_model.frsky.channels[0].offset;
-    a12value=ui->a12ValueSB->value();
-    if (g_model.frsky.channels[0].type==0) {
-      a1ratio/=10;
-    }
-    if (a12value<((a1calib*a1ratio)/255)) {
-      g_model.frsky.channels[0].alarms[1].value=0;
-    } else if (a12value>(a1ratio+(a1calib*a1ratio)/255)) {
-      g_model.frsky.channels[0].alarms[1].value=255;
-    } else {
-      g_model.frsky.channels[0].alarms[1].value = round((a12value-((a1calib*a1ratio)/255))/a1ratio*255);
-    }
-    updateA1Fields();
-    updateSettings();
-}
-
-void ModelEdit::on_a2UnitCB_currentIndexChanged(int index) {
-    float a2ratio;
-    g_model.frsky.channels[1].type=index;
-    switch (index) {
-      case 0:
-      case 1:
-      case 2:
-        ui->a2RatioSB->setDecimals(1);
-        ui->a2RatioSB->setMaximum(25.5*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
-        a2ratio=(g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier)/10.0;
-        break;
-      default:
-        ui->a2RatioSB->setDecimals(0);
-        ui->a2RatioSB->setMaximum(255*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
-        a2ratio=g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier;
-        break;
-    }
-    ui->a2RatioSB->setValue(a2ratio);
-    updateA2Fields();
-    updateSettings();
-}
-
-void ModelEdit::on_a2RatioSB_valueChanged()
-{
-    if (telemetryLock) return;
-    if (g_model.frsky.channels[1].type==0 || g_model.frsky.channels[1].type==1 || g_model.frsky.channels[1].type==2) {
-      g_model.frsky.channels[1].multiplier = findmult(ui->a2RatioSB->value(), 25.5);
-      float singlestep =(1<<g_model.frsky.channels[1].multiplier)/10.0;
-      telemetryLock=true;
-      ui->a2RatioSB->setSingleStep(singlestep);
-      ui->a2RatioSB->setValue(round(ui->a2RatioSB->value()/singlestep)*singlestep);
-      telemetryLock=false;
-    } else {
-      g_model.frsky.channels[1].multiplier = findmult(ui->a2RatioSB->value(), 255);
-      float singlestep =(1<<g_model.frsky.channels[1].multiplier);
-      telemetryLock=true;
-      ui->a2RatioSB->setSingleStep(singlestep);
-      ui->a2RatioSB->setValue(round(ui->a2RatioSB->value()/singlestep)*singlestep);
-      telemetryLock=false;
-    }  
-}
-
-void ModelEdit::on_a2RatioSB_editingFinished()
-{
-    float a2ratio, a2calib, a21value,a22value;
-    if (telemetryLock) return;
-    if (g_model.frsky.channels[1].type==0 || g_model.frsky.channels[1].type==1 || g_model.frsky.channels[1].type==2) {
-      g_model.frsky.channels[1].multiplier = findmult(ui->a2RatioSB->value(), 25.5);
-      ui->a2CalibSB->setSingleStep((1<<g_model.frsky.channels[1].multiplier)/10.0);
-      ui->a21ValueSB->setSingleStep((1<<g_model.frsky.channels[1].multiplier)/10.0);
-      ui->a22ValueSB->setSingleStep((1<<g_model.frsky.channels[1].multiplier)/10.0);
-      g_model.frsky.channels[1].ratio = ((round(ui->a2RatioSB->value()*10))/(1 << g_model.frsky.channels[1].multiplier));
-    } else {
-      g_model.frsky.channels[1].multiplier = findmult(ui->a2RatioSB->value(), 255);
-      ui->a2CalibSB->setSingleStep(1<<g_model.frsky.channels[1].multiplier);
-      ui->a21ValueSB->setSingleStep(1<<g_model.frsky.channels[1].multiplier);
-      ui->a22ValueSB->setSingleStep(1<<g_model.frsky.channels[1].multiplier);
-      g_model.frsky.channels[1].ratio = (ui->a2RatioSB->value()/(1 << g_model.frsky.channels[1].multiplier));
-    }
-    ui->a2CalibSB->setMaximum((ui->a2RatioSB->value()*127)/255);
-    ui->a2CalibSB->setMinimum((ui->a2RatioSB->value()*-128)/255);
-    ui->a21ValueSB->setMaximum(ui->a2RatioSB->value());
-    ui->a22ValueSB->setMaximum(ui->a2RatioSB->value());
-    repaint();
-    a2ratio=g_model.frsky.channels[1].ratio * (1 << g_model.frsky.channels[1].multiplier);
-    a2calib=ui->a2CalibSB->value();
-    a21value=ui->a21ValueSB->value();
-    a22value=ui->a22ValueSB->value();
-    if (g_model.frsky.channels[1].type==0 || g_model.frsky.channels[1].type==1 || g_model.frsky.channels[1].type==2) {
-      a2calib*=10;
-      a21value*=10;
-      a22value*=10; 
-    }
-    if (a2calib>0) {
-      if (a2calib>((a2ratio*127)/255)) {
-        g_model.frsky.channels[1].offset=127;
-      } else {
-        g_model.frsky.channels[1].offset=round(a2calib*255/a2ratio);
-      }
-    }
-    if (a2calib<0) {
-      if (a2calib<((a2ratio*-128)/255)) {
-        g_model.frsky.channels[1].offset=-128;
-      } else {
-        g_model.frsky.channels[1].offset=round(a2calib*255/a2ratio);
-      }
-    }
-    g_model.frsky.channels[1].alarms[0].value=round((a21value*255-g_model.frsky.channels[1].offset*(g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier))/(g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier));
-    g_model.frsky.channels[1].alarms[1].value=round((a22value*255-g_model.frsky.channels[1].offset*(g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier))/(g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier)); 
-    updateA2Fields();
-    telBarUpdate();
-    updateSettings();
-  }
-
-  void ModelEdit::on_a2CalibSB_editingFinished()
-  {
-    float a2ratio,a2calib,a21value,a22value;
-    if (g_model.frsky.channels[1].type==0 || g_model.frsky.channels[1].type==1 || g_model.frsky.channels[1].type==2) {
-      a2ratio=(g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier)/10.0;
-    } else {
-      a2ratio=g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier;
-    }
-    if (a2ratio!=0) {
-      g_model.frsky.channels[1].offset = round((255*ui->a2CalibSB->value()/a2ratio));
-      a2calib=a2ratio*g_model.frsky.channels[1].offset/255.0;
-      a21value=ui->a21ValueSB->value();
-      a22value=ui->a22ValueSB->value();
-      if (a21value<a2calib) {
-        a21value=a2calib;
-      } else if (a21value>(a2ratio+a2calib)) {
-        a21value=a2ratio+a2calib;
-      }
-      if (a22value<a2calib) {
-        a22value=a2calib;
-      } else if (a22value>(a2ratio+a2calib)) {
-        a22value=a2ratio+a2calib;
-      }
-      g_model.frsky.channels[1].alarms[0].value=round(((a21value-a2calib)*255)/a2ratio);
-      g_model.frsky.channels[1].alarms[1].value=round(((a22value-a2calib)*255)/a2ratio);
-    } else {
-      g_model.frsky.channels[1].offset=0;
-      g_model.frsky.channels[1].alarms[0].value=0;
-      g_model.frsky.channels[1].alarms[1].value=0;
-    }
-    updateA2Fields();
-    telBarUpdate();
-    updateSettings();
-}
-
-void ModelEdit::on_a21LevelCB_currentIndexChanged(int index)
-{
-    g_model.frsky.channels[1].alarms[0].level = index;
-    updateSettings();
-}
-
-void ModelEdit::on_a21GreaterCB_currentIndexChanged(int index)
-{
-    g_model.frsky.channels[1].alarms[0].greater = index;
-    updateSettings();
-}
-
-void ModelEdit::on_a21ValueSB_editingFinished()
-{
-    float a2ratio, a2calib, a21value;
-    a2ratio=g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier;
-    a2calib=g_model.frsky.channels[1].offset;
-    a21value=ui->a21ValueSB->value();
-    if (g_model.frsky.channels[1].type==0) {
-      a2ratio/=10;
-    }
-    if (a21value<((a2calib*a2ratio)/255)) {
-      g_model.frsky.channels[1].alarms[0].value=0;
-    } else if (a21value>(a2ratio+(a2calib*a2ratio)/255)) {
-      g_model.frsky.channels[1].alarms[0].value=255;
-    } else {
-      g_model.frsky.channels[1].alarms[0].value = round((a21value-((a2calib*a2ratio)/255))/a2ratio*255);
-    }
-    updateA2Fields();
-    updateSettings();
-}
-
-void ModelEdit::on_a22LevelCB_currentIndexChanged(int index)
-{
-    g_model.frsky.channels[1].alarms[1].level = index;
-    updateSettings();
-}
-
-void ModelEdit::on_a22GreaterCB_currentIndexChanged(int index)
-{
-    g_model.frsky.channels[1].alarms[1].greater = index;
-    updateSettings();
-}
-
-void ModelEdit::on_a22ValueSB_editingFinished()
-{
-    float a2ratio, a2calib, a22value;
-    a2ratio=g_model.frsky.channels[1].ratio<<g_model.frsky.channels[1].multiplier;
-    a2calib=g_model.frsky.channels[1].offset;
-    a22value=ui->a22ValueSB->value();
-    if (g_model.frsky.channels[1].type==0) {
-      a2ratio/=10;
-    }
-    if (a22value<((a2calib*a2ratio)/255)) {
-      g_model.frsky.channels[1].alarms[1].value=0;
-    } else if (a22value>(a2ratio+(a2calib*a2ratio)/255)) {
-      g_model.frsky.channels[1].alarms[1].value=255;
-    } else {
-      g_model.frsky.channels[1].alarms[1].value = round((a22value-((a2calib*a2ratio)/255))/a2ratio*255);
-    }
-    updateA2Fields();
-    updateSettings();
-}
-
-void ModelEdit::on_rssiAlarm1CB_currentIndexChanged(int index) {
-    if (telemetryLock) return;
-    g_model.frsky.rssiAlarms[0].level=index;
-    updateSettings();
-}
-
-void ModelEdit::on_rssiAlarm2CB_currentIndexChanged(int index) {
-    if (telemetryLock) return;
-    g_model.frsky.rssiAlarms[1].level=index;
-    updateSettings();
-}
-
-void ModelEdit::on_rssiAlarm1SB_editingFinished() {
-    if (telemetryLock) return;
-    g_model.frsky.rssiAlarms[0].value=(ui->rssiAlarm1SB->value());
-    updateSettings();  
-}
-
-void ModelEdit::on_rssiAlarm2SB_editingFinished() {
-    if (telemetryLock) return;
-    g_model.frsky.rssiAlarms[1].value=(ui->rssiAlarm2SB->value());
-    updateSettings();    
-}
-
-void ModelEdit::on_AltitudeGPS_ChkB_toggled(bool checked)
-{
-    if (telemetryLock) return;
-    g_model.frsky.FrSkyGpsAlt = checked;
-    updateSettings();
-    //AltitudeGPS_CB
-}
-
-void ModelEdit::on_showNames_Ckb_toggled(bool checked)
-{
-    tabMixes();
-}
-void ModelEdit::on_varioSourceCB_currentIndexChanged(int index)
-{
-    if (telemetryLock) return;
-    g_model.frsky.varioSource = index;
-    updateSettings();
-}
-
-void ModelEdit::on_varioLimitMin_DSB_editingFinished()
-{
-    if (telemetryLock) return;
-    g_model.frsky.varioMin= round(ui->varioLimitMin_DSB->value()+10);
-    updateSettings();    
-}
-
-void ModelEdit::on_varioLimitMax_DSB_editingFinished()
-{
-    if (telemetryLock) return;
-    g_model.frsky.varioMax= round(ui->varioLimitMax_DSB->value()-10);
-    updateSettings();    
-}
-
-void ModelEdit::on_varioLimitCenterMin_DSB_editingFinished()
-{
-    if (telemetryLock) return;
-    if (ui->varioLimitCenterMin_DSB->value()>ui->varioLimitCenterMax_DSB->value()) {
-      ui->varioLimitCenterMax_DSB->setValue(ui->varioLimitCenterMin_DSB->value());
-    }
-    g_model.frsky.varioCenterMin= round((ui->varioLimitCenterMin_DSB->value()+0.5)*10);
-    updateSettings();    
-}
-
-void ModelEdit::on_varioLimitMinOff_ChkB_toggled(bool checked)
-{
-    if (telemetryLock) return;
-    g_model.frsky.varioCenterMin = -16;
-    if (!checked) {
-      telemetryLock=true;
-      ui->varioLimitCenterMin_DSB->setValue(-2.0);
-      ui->varioLimitCenterMin_DSB->setEnabled(true);
-      telemetryLock=false;
-    } else {
-      ui->varioLimitCenterMin_DSB->setValue(-2.0);
-      ui->varioLimitCenterMin_DSB->setDisabled(true);
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_varioLimitCenterMax_DSB_editingFinished()
-{
-    if (telemetryLock) return;
-    if (ui->varioLimitCenterMin_DSB->value()>ui->varioLimitCenterMax_DSB->value()) {
-      ui->varioLimitCenterMax_DSB->setValue(ui->varioLimitCenterMin_DSB->value());
-    }
-    g_model.frsky.varioCenterMax= round((ui->varioLimitCenterMax_DSB->value()-0.5)*10);
-    updateSettings();    
-}
-
-void ModelEdit::telBarUpdate() 
-{
-    int index;
-    telemetryLock=true;
-    for (int i=0; i<12; i++) {
-      int screen=i/4;
-      index=barsCB[i]->currentIndex();
-      if (index==TELEMETRY_SOURCE_A1 || index==TELEMETRY_SOURCE_A1 || index==TELEMETRY_SOURCE_A1_MIN || index==TELEMETRY_SOURCE_A2_MIN) {
-        minSB[i]->setMinimum(getBarValue(index, 0, &g_model.frsky));
-        minSB[i]->setMaximum(getBarValue(index, 255, &g_model.frsky));
-        minSB[i]->setSingleStep(getBarStep(index));
-        maxSB[i]->setMinimum(getBarValue(index, 0, &g_model.frsky));
-        maxSB[i]->setMaximum(getBarValue(index, 255, &g_model.frsky));
-        maxSB[i]->setSingleStep(getBarStep(index));
-        minSB[i]->setValue(getBarValue(index, g_model.frsky.screens[screen].body.bars[i%4].barMin, &g_model.frsky));
-        maxSB[i]->setValue(getBarValue(index, 255-g_model.frsky.screens[screen].body.bars[i%4].barMax, &g_model.frsky));
-      }
-    }
-    telemetryLock=false;
-}
-
-void ModelEdit::ScreenTypeCBcurrentIndexChanged(int index)
-{
-    if (telemetryLock) return;
-
-    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
-    int screen = comboBox->objectName().right(1).toInt() -1;
-    telemetryLock=true;
-    g_model.frsky.screens[screen].type=index;
-
-    for (int i=0; i<3; i++) {
-      bool isNum = (g_model.frsky.screens[i].type==0);
-      barsGB[i]->setVisible(!isNum);
-      numsGB[i]->setVisible(isNum);
-    }
-
-    telemetryLock=false;
-    updateSettings();
-}
-
-void ModelEdit::telBarCBcurrentIndexChanged(int index)
-{
-    if (telemetryLock) return;
-    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
-    int screenId = comboBox->objectName().mid(8,1).toInt() - 1;
-    int barId = comboBox->objectName().mid(10,1).toInt() - 1;
-    int bar=barId+screenId*4;
-    g_model.frsky.screens[screenId].body.bars[barId].source=index;
-    telemetryLock=true;
-    if (index==0) {
-      g_model.frsky.screens[screenId].body.bars[barId].barMin=0;
-      g_model.frsky.screens[screenId].body.bars[barId].barMax=0;
-      minSB[bar]->setDisabled(true);
-      maxSB[bar]->setDisabled(true);
-    } else {
-      minSB[bar]->setEnabled(true);
-      maxSB[bar]->setEnabled(true);    
-    }
-    switch (index-1) {
-      case TELEMETRY_SOURCE_TX_BATT:
-      case TELEMETRY_SOURCE_A1:
-      case TELEMETRY_SOURCE_A1_MIN:
-      case TELEMETRY_SOURCE_A2:
-      case TELEMETRY_SOURCE_A2_MIN:
-      case TELEMETRY_SOURCE_CELLS_SUM:
-      case TELEMETRY_SOURCE_VFAS:
-      case TELEMETRY_SOURCE_CURRENT_MAX:
-      case TELEMETRY_SOURCE_CURRENT:
-        minSB[bar]->setDecimals(1);
-        maxSB[bar]->setDecimals(1);
-        break;
-      case TELEMETRY_SOURCE_CELL:
-        minSB[bar]->setDecimals(2);
-        maxSB[bar]->setDecimals(2);
-        break;
-      default:
-        minSB[bar]->setDecimals(0);
-        maxSB[bar]->setDecimals(0);
-    }  
-    minSB[bar]->setMinimum(getBarValue(index, 0, &g_model.frsky));
-    minSB[bar]->setMaximum(getBarValue(index, 255, &g_model.frsky));
-    minSB[bar]->setSingleStep(getBarStep(index));
-    maxSB[bar]->setMinimum(getBarValue(index, 0, &g_model.frsky));
-    maxSB[bar]->setMaximum(getBarValue(index, 255, &g_model.frsky));
-    maxSB[bar]->setSingleStep(getBarStep(index));
-    minSB[bar]->setValue(getBarValue(index, g_model.frsky.screens[screenId].body.bars[barId].barMin, &g_model.frsky));
-    maxSB[bar]->setValue(getBarValue(index, 255-g_model.frsky.screens[screenId].body.bars[barId].barMax, &g_model.frsky));
-    telemetryLock=false;
-    updateSettings();
-}
-
-void ModelEdit::telMinSBeditingFinished()
-{
-    if (telemetryLock) return;
-    QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
-    int screenId = spinBox->objectName().mid(8,1).toInt() - 1;
-    int barId = spinBox->objectName().right(1).toInt() - 1;
-    int minId = barId+screenId*4;
-    telemetryLock=true;
-    if (g_model.frsky.screens[screenId].body.bars[barId].source==TELEMETRY_SOURCE_A1 || g_model.frsky.screens[screenId].body.bars[barId].source==TELEMETRY_SOURCE_A1_MIN) {
-     g_model.frsky.screens[screenId].body.bars[barId].barMin=round((minSB[minId]->value()-ui->a1CalibSB->value())/getBarStep(g_model.frsky.screens[screenId].body.bars[barId].source));
-    } else if (g_model.frsky.screens[screenId].body.bars[minId].source==TELEMETRY_SOURCE_A2 || g_model.frsky.screens[screenId].body.bars[minId].source==TELEMETRY_SOURCE_A2_MIN) {
-     g_model.frsky.screens[screenId].body.bars[barId].barMin=round((minSB[minId]->value()-ui->a2CalibSB->value())/getBarStep(g_model.frsky.screens[screenId].body.bars[barId].source));
-    } else {
-     g_model.frsky.screens[screenId].body.bars[barId].barMin=round((minSB[minId]->value()-getBarValue(g_model.frsky.screens[screenId].body.bars[barId].source, 0, &g_model.frsky))/getBarStep(g_model.frsky.screens[screenId].body.bars[barId].source));
-    }
-    spinBox->setValue(getBarValue(g_model.frsky.screens[screenId].body.bars[barId].source, g_model.frsky.screens[screenId].body.bars[barId].barMin, &g_model.frsky));
-    if (maxSB[minId]->value()<minSB[minId]->value()) {
-      g_model.frsky.screens[screenId].body.bars[minId].barMax=(255-g_model.frsky.screens[screenId].body.bars[barId].barMin+1);
-      maxSB[minId]->setValue(getBarValue(g_model.frsky.screens[screenId].body.bars[barId].source, 255-g_model.frsky.screens[screenId].body.bars[barId].barMax, &g_model.frsky));
-    }
-    maxSB[minId]->setMinimum(getBarValue(g_model.frsky.screens[screenId].body.bars[barId].source, (g_model.frsky.screens[screenId].body.bars[barId].barMin+1), &g_model.frsky));
-    telemetryLock=false;
-    updateSettings();
-}
-
-void ModelEdit::telMaxSBeditingFinished()
-{
-    if (telemetryLock) return;
-    QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
-    int screenId = spinBox->objectName().mid(8,1).toInt() - 1;
-    int barId = spinBox->objectName().right(1).toInt() - 1;
-    telemetryLock=true;
-    if (g_model.frsky.screens[screenId].body.bars[barId].source==5) {
-      g_model.frsky.screens[screenId].body.bars[barId].barMax = (255-round((spinBox->value()-ui->a1CalibSB->value())/getBarStep(g_model.frsky.screens[screenId].body.bars[barId].source)));
-    } else if (g_model.frsky.screens[screenId].body.bars[barId].source==6) {
-      g_model.frsky.screens[screenId].body.bars[barId].barMax = (255-round((spinBox->value()-ui->a2CalibSB->value())/getBarStep(g_model.frsky.screens[screenId].body.bars[barId].source)));
-    } else {
-      g_model.frsky.screens[screenId].body.bars[barId].barMax = (255-round((spinBox->value()-getBarValue(g_model.frsky.screens[screenId].body.bars[barId].source, 0, &g_model.frsky))/getBarStep(g_model.frsky.screens[screenId].body.bars[barId].source) ));
-    }
-    spinBox->setValue(getBarValue(g_model.frsky.screens[screenId].body.bars[barId].source, (255-g_model.frsky.screens[screenId].body.bars[barId].barMax), &g_model.frsky));
-    telemetryLock=false;
-    updateSettings();
-}
-
-void ModelEdit::on_thrTrimChkB_toggled(bool checked)
-{
-    g_model.thrTrim = checked;
-    updateSettings();
-}
-
-void ModelEdit::on_thrExpoChkB_toggled(bool checked)
-{
-    g_model.thrExpo = checked;
-    updateSettings();
-}
-
-void ModelEdit::on_AltitudeToolbar_ChkB_toggled(bool checked)
-{
-    g_model.frsky.altitudeDisplayed = checked;
-    updateSettings();
-}
-
-void ModelEdit::on_bcRUDChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_RUD;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_RUD;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcELEChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_ELE;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_ELE;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcTHRChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_THR;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_THR;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcAILChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_AIL;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_AIL;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcP1ChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_P1;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_P1;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcP2ChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_P2;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_P2;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcP3ChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_P3;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_P3;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcP4ChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_P4;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_P4;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcREaChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_REA;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_REA;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_bcREbChkB_toggled(bool checked)
-{
-    if(checked) {
-      g_model.beepANACenter |= BC_BIT_REB;
-    } else {
-      g_model.beepANACenter &= ~BC_BIT_REB;
-    }
-    updateSettings();
-}
-
-void ModelEdit::phaseGVValue_editingFinished()
-{
-    if (phasesLock) return;
-    QSpinBox *spinBox = qobject_cast<QSpinBox*>(sender());
-    int phase = spinBox->objectName().mid(5,1).toInt();
-    int gvar = spinBox->objectName().mid(8,1).toInt()-1;
-    g_model.phaseData[phase].gvars[gvar] = spinBox->value();
-    updateSettings();
-}
-
-void ModelEdit::GVName_editingFinished()
-{
-    if (phasesLock) return;
-    QLineEdit *lineedit = qobject_cast<QLineEdit*>(sender());
-    int gvar = lineedit->objectName().mid(8,1).toInt()-1;
-    memset(&g_model.gvars_names[gvar],0,sizeof(g_model.gvars_names[gvar]));
-    const char * le=lineedit->text().toAscii();
-    strncpy(g_model.gvars_names[gvar], le, sizeof(g_model.gvars_names[gvar])-1);
-    updateSettings();
-}
-
-void ModelEdit::GVSource_currentIndexChanged()
-{
-    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
-    int gvar = comboBox->objectName().mid(8,1).toInt()-1;
-    int index=comboBox->currentIndex();
-    g_model.gvsource[gvar]=index;
-    updateSettings();
-}
-
-void ModelEdit::phaseGVUse_currentIndexChanged()
-{
-    if (phasesLock) return;
-    phasesLock=true;
-    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
-    int phase = comboBox->objectName().mid(5,1).toInt();
-    int gvar = comboBox->objectName().mid(8,1).toInt()-1;
-    int index=comboBox->currentIndex();
-    if (index == 0) {
-      int value=g_model.phaseData[phase].gvars[gvar];
-      if (value>1024) {
-        value=0;
-      }
-      gvarsSB[phase][gvar]->setValue(value);
-      gvarsSB[phase][gvar]->setEnabled(true);
-      g_model.phaseData[phase].gvars[gvar]=value;
-    } else {
-      g_model.phaseData[phase].gvars[gvar]=1024+index;
-      int value=gvarsSB[index+(index>phase ?0 :-1)][gvar]->value();
-      gvarsSB[phase][gvar]->setValue(value);
-      gvarsSB[phase][gvar]->setDisabled(true);
-    }
-    phasesLock=false;
-    updateSettings();
-}
-
-void ModelEdit::phaseREValue_editingFinished()
-{
-    if (phasesLock) return;
-    QSpinBox *spinBox = qobject_cast<QSpinBox*>(sender());
-    int phase = spinBox->objectName().mid(5,1).toInt();
-    int gvar = spinBox->objectName().mid(8,1).toInt()-1;
-    g_model.phaseData[phase].rotaryEncoders[gvar] = spinBox->value();
-    updateSettings();
-}
-
-void ModelEdit::phaseREUse_currentIndexChanged()
-{
-    if (phasesLock) return;
-    phasesLock=true;
-    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
-    int phase = comboBox->objectName().mid(5,1).toInt();
-    int re = comboBox->objectName().mid(8,1).toInt()-1;
-    int index=comboBox->currentIndex();
-    if (index == 0) {
-      int value=g_model.phaseData[phase].rotaryEncoders[re];
-      if (value>1024) {
-        value=0;
-      }
-      reSB[phase][re]->setValue(value);
-      reSB[phase][re]->setEnabled(true);
-      g_model.phaseData[phase].rotaryEncoders[re]=value;
-    } else {
-      g_model.phaseData[phase].rotaryEncoders[re]=1024+index;
-      int value=reSB[index+(index>phase ?0 :-1)][re]->value();
-      reSB[phase][re]->setValue(value);
-      reSB[phase][re]->setDisabled(true)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ;
-    }
-    phasesLock=false;
-    updateSettings();
-}
-
-void ModelEdit::phaseTrimUse_currentIndexChanged()
-{
-    if (phasesLock) return;
-    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
-    int phase = comboBox->objectName().mid(5,1).toInt();
-    int trim = comboBox->objectName().mid(10,1).toInt();
-
-    int chn = CONVERT_MODE(trim)-1;
-    int index=comboBox->currentIndex();
-
-    if (index == 0) {
-      g_model.phaseData[phase].trim[chn] = g_model.phaseData[g_model.getTrimFlightPhase(chn, phase)].trim[chn];
-      g_model.phaseData[phase].trimRef[chn] = -1;
-    } else {
-      g_model.phaseData[phase].trim[chn] = 0;
-      g_model.phaseData[phase].trimRef[chn] = index - 1 + (index > (int)phase ? 1 : 0);
-    }
-
-    phasesLock = true;
-    displayOnePhaseOneTrim(phase, chn, NULL, phasesTrimValues[phase][trim-1], phasesTrimSliders[phase][trim-1]);
-    phasesLock = false;
-    updateSettings();
-}
-
-void ModelEdit::phaseTrim_valueChanged()
-{
-    if (phasesLock) return;
-    QSpinBox *spinBox = qobject_cast<QSpinBox*>(sender());
-    int phase = spinBox->objectName().mid(5,1).toInt();
-    int trim = spinBox->objectName().mid(10,1).toInt();
-
-    int chn = CONVERT_MODE(trim)-1;
-    g_model.phaseData[phase].trim[chn] = spinBox->value();
-    phasesLock=true;
-    phasesTrimSliders[phase][trim-1]->setValue(spinBox->value());
-    phasesLock=false;
-    updateSettings();
-}
-
-void ModelEdit::phaseTrimSlider_valueChanged()
-{
-    if (phasesLock) return;
-    QSlider *slider = qobject_cast<QSlider*>(sender());
-    int phase = slider->objectName().mid(5,1).toInt();
-    int trim = slider->objectName().mid(10,1).toInt();
-
-    int chn = CONVERT_MODE(trim)-1;
-    g_model.phaseData[phase].trim[chn] = slider->value();
-    phasesLock=true;
-    phasesTrimValues[phase][trim-1]->setValue(slider->value());
-    phasesLock=false;
-    updateSettings();
-}
-
-QSpinBox *ModelEdit::getNodeSB(int i)   // get the SpinBox that corresponds to the selected node
-{
-    return spny[i];
-}
-
-QSpinBox *ModelEdit::getNodeSBX(int i)   // get the SpinBox that corresponds to the selected node
-{
-     return spnx[i];
-}
-
-void ModelEdit::drawCurve()
-{
-    
-    if (drawing)
-        return;
-    drawing=true;
-    curvesLock=true;
-    int k,i;
-    QColor * plot_color[16];
-
-    plot_color[0]=new QColor(0,0,127);
-    plot_color[1]=new QColor(0,127,0);
-    plot_color[2]=new QColor(127,0,0);
-    plot_color[3]=new QColor(0,127,127);
-    plot_color[4]=new QColor(127,0,127);
-    plot_color[5]=new QColor(127,127,0);
-    plot_color[6]=new QColor(127,127,127);
-    plot_color[7]=new QColor(0,0,255);
-    plot_color[8]=new QColor(0,127,255);
-    plot_color[9]=new QColor(127,0,255);
-    plot_color[10]=new QColor(0,255,0);
-    plot_color[11]=new QColor(0,255,127);
-    plot_color[12]=new QColor(127,255,0);
-    plot_color[13]=new QColor(255,0,0);
-    plot_color[14]=new QColor(255,0,127);
-    plot_color[15]=new QColor(255,127,0);
-
-    if(currentCurve<0 || currentCurve>15) return;
-
-    Node *nodel = 0;
-    Node *nodex = 0;
-
-    QGraphicsScene *scene = ui->curvePreview->scene();
-    QPen pen;
-    QColor color;
-    scene->clear();
-
-    qreal width  = scene->sceneRect().width();
-    qreal height = scene->sceneRect().height();
-
-    qreal centerX = scene->sceneRect().left() + width/2; //center X
-    qreal centerY = scene->sceneRect().top() + height/2; //center Y
-
-    QGraphicsSimpleTextItem *ti;
-    ti = scene->addSimpleText(tr("Editing curve %1").arg(currentCurve+1));
-    ti->setPos(3,3);
-
-    scene->addLine(centerX,GFX_MARGIN,centerX,height+GFX_MARGIN);
-    scene->addLine(GFX_MARGIN,centerY,width+GFX_MARGIN,centerY);
-    pen.setWidth(2);
-    pen.setStyle(Qt::SolidLine);
-    int numcurves=GetEepromInterface()->getCapability(NumCurves);
-    if (numcurves==0) {
-      numcurves=16;
-    }
-    
-    for(k=0; k<numcurves; k++) {
-      pen.setColor(*plot_color[k]);
-      if ((currentCurve!=k) && (plot_curve[k])) {
-        int numpoints=g_model.curves[k].count;
-        for(i=0; i<(numpoints-1); i++) {
-          if (!g_model.curves[k].custom) {
-            scene->addLine(GFX_MARGIN + i*width/(numpoints-1),centerY - (qreal)g_model.curves[k].points[i].y*height/200,GFX_MARGIN + (i+1)*width/(numpoints-1),centerY - (qreal)g_model.curves[k].points[i+1].y*height/200,pen);
-          } else {
-            scene->addLine(centerX + (qreal)g_model.curves[k].points[i].x*width/200,centerY - (qreal)g_model.curves[k].points[i].y*height/200,centerX + (qreal)g_model.curves[k].points[i+1].x*width/200,centerY - (qreal)g_model.curves[k].points[i+1].y*height/200,pen);
-          }
-        }
-      }
-    }
-    int numpoints=g_model.curves[currentCurve].count;
-
-    for(int i=0; i<numpoints; i++) {
-      nodel = nodex;
-      nodex = new Node(getNodeSB(i),getNodeSBX(i));
-      nodex->setColor(*plot_color[currentCurve]);
-      if (!g_model.curves[currentCurve].custom) {
-        nodex->setFixedX(true);
-        nodex->setPos(GFX_MARGIN + i*width/(numpoints-1),centerY - (qreal)g_model.curves[currentCurve].points[i].y*height/200);
-      } else {
-        if (i>0 && i<(numpoints-1)) {
-          nodex->setFixedX(false);
-          nodex->setMinX(g_model.curves[currentCurve].points[i-1].x+1);
-          nodex->setMaxX(g_model.curves[currentCurve].points[i+1].x-1);
-          spnx[i]->setMaximum(g_model.curves[currentCurve].points[i+1].x-1);
-          spnx[i]->setMinimum(g_model.curves[currentCurve].points[i-1].x+1);
-        } else {
-          nodex->setFixedX(true);
-        }
-        nodex->setPos(centerX + (qreal)g_model.curves[currentCurve].points[i].x*width/200,centerY - (qreal)g_model.curves[currentCurve].points[i].y*height/200);
-      }
-      scene->addItem(nodex);
-      if(i>0) scene->addItem(new Edge(nodel, nodex));
-    }
-    curvesLock=false;
-    drawing=false;
-}
-
-
-bool ModelEdit::gm_insertMix(int idx)
-{
-    if (idx<0 || idx>=GetEepromInterface()->getCapability(Mixes) || g_model.mixData[GetEepromInterface()->getCapability(Mixes)-1].destCh > 0) {
-      QMessageBox::information(this, "companion9x", tr("Not enough available mixers!"));
-      return false;
-    }
-
-    int i = g_model.mixData[idx].destCh;
-    memmove(&g_model.mixData[idx+1],&g_model.mixData[idx],
-        (GetEepromInterface()->getCapability(Mixes)-(idx+1))*sizeof(MixData) );
-    memset(&g_model.mixData[idx],0,sizeof(MixData));
-    g_model.mixData[idx].srcRaw = RawSource(SOURCE_TYPE_NONE);
-    g_model.mixData[idx].destCh = i;
-    g_model.mixData[idx].weight = 100;
-    return true;
-}
-
-void ModelEdit::gm_deleteMix(int index)
-{
-    memmove(&g_model.mixData[index],&g_model.mixData[index+1],
-            (GetEepromInterface()->getCapability(Mixes)-(index+1))*sizeof(MixData));
-    memset(&g_model.mixData[GetEepromInterface()->getCapability(Mixes)-1],0,sizeof(MixData));
-}
-
-void ModelEdit::gm_openMix(int index)
-{
-    if(index<0 || index>=GetEepromInterface()->getCapability(Mixes)) return;
-
-    MixData mixd(g_model.mixData[index]);
-    updateSettings();
-    tabMixes();
-
-    MixerDialog *g = new MixerDialog(this, &mixd, g_eeGeneral.stickMode);
-    if(g->exec()) {
-      g_model.mixData[index] = mixd;
-      updateSettings();
-      tabMixes();
-    } else {
-      if (mixInserted) {
-        gm_deleteMix(index);
-      }
-      mixInserted=false;
-      updateSettings();
-      tabMixes();
-    }
-}
-
-int ModelEdit::getMixerIndex(unsigned int dch)
-{
-    int i = 0;
-    while ((g_model.mixData[i].destCh<=dch) && (g_model.mixData[i].destCh) && (i<GetEepromInterface()->getCapability(Mixes))) i++;
-    if(i==GetEepromInterface()->getCapability(Mixes)) return -1;
-    return i;
-}
-
-bool ModelEdit::gm_insertExpo(int idx)
-{
-    if (idx<0 || idx>=C9X_MAX_EXPOS || g_model.expoData[C9X_MAX_EXPOS-1].mode > 0) {
-      QMessageBox::information(this, "companion9x", tr("Not enough available expos!"));
-      return false;
-    }
-
-    int chn = g_model.expoData[idx].chn;
-    memmove(&g_model.expoData[idx+1],&g_model.expoData[idx],
-            (C9X_MAX_EXPOS-(idx+1))*sizeof(ExpoData) );
-    memset(&g_model.expoData[idx],0,sizeof(ExpoData));
-    g_model.expoData[idx].chn = chn;
-    g_model.expoData[idx].weight = 100;
-    g_model.expoData[idx].mode = 3 /* TODO enum */;
-    return true;
-}
-
-void ModelEdit::gm_deleteExpo(int index)
-{
-    memmove(&g_model.expoData[index],&g_model.expoData[index+1],
-              (C9X_MAX_EXPOS-(index+1))*sizeof(ExpoData));
-    memset(&g_model.expoData[C9X_MAX_EXPOS-1],0,sizeof(ExpoData));
-}
-
-void ModelEdit::gm_openExpo(int index)
-{
-    if(index<0 || index>=C9X_MAX_EXPOS) return;
-
-    ExpoData mixd(g_model.expoData[index]);
-    updateSettings();
-    tabExpos();
-
-    ExpoDialog *g = new ExpoDialog(this, &mixd, g_eeGeneral.stickMode);
-    if(g->exec())  {
-      g_model.expoData[index] = mixd;
-      updateSettings();
-      tabExpos();
-    } else {
-      if (expoInserted) {
-        gm_deleteExpo(index);
-      }
-      expoInserted=false;
-      updateSettings();
-      tabExpos();
-    }
-}
-
-int ModelEdit::getExpoIndex(unsigned int dch)
-{
-    unsigned int i = 0;
-    while (g_model.expoData[i].chn<=dch && g_model.expoData[i].mode && i<C9X_MAX_EXPOS) i++;
-    if(i==C9X_MAX_EXPOS) return -1;
-    return i;
-}
-
-void ModelEdit::mixerlistWidget_doubleClicked(QModelIndex index)
-{
-    int idx= MixerlistWidget->item(index.row())->data(Qt::UserRole).toByteArray().at(0);
-    if (idx<0) {
-        int i = -idx;
-        idx = getMixerIndex(i); //get mixer index to insert
-        if (!gm_insertMix(idx))
-          return;
-        g_model.mixData[idx].destCh = i;
-        mixInserted=true;
-    } else {
-      mixInserted=false;
-    }
-    gm_openMix(idx);
-}
-
-
-void ModelEdit::expolistWidget_doubleClicked(QModelIndex index)
-{
-    expoOpen(ExposlistWidget->item(index.row()));
-}
-
-void ModelEdit::exposDeleteList(QList<int> list)
-{
-    qSort(list.begin(), list.end());
-
-    int iDec = 0;
-    foreach(int idx, list) {
-      gm_deleteExpo(idx-iDec);
-      iDec++;
-    }
-}
-
-void ModelEdit::mixersDeleteList(QList<int> list)
-{
-    qSort(list.begin(), list.end());
-
-    int iDec = 0;
-    foreach(int idx, list) {
-      gm_deleteMix(idx-iDec);
-      iDec++;
-    }
-}
-
-QList<int> ModelEdit::createMixListFromSelected()
-{
-    QList<int> list;
-    foreach(QListWidgetItem *item, MixerlistWidget->selectedItems()) {
-      int idx= item->data(Qt::UserRole).toByteArray().at(0);
-      if(idx>=0 && idx<GetEepromInterface()->getCapability(Mixes)) list << idx;
-    }
-    return list;
-}
-
-QList<int> ModelEdit::createExpoListFromSelected()
-{
-    QList<int> list;
-    foreach(QListWidgetItem *item, ExposlistWidget->selectedItems()) {
-      int idx= item->data(Qt::UserRole).toByteArray().at(0);
-      if(idx>=0 && idx<C9X_MAX_EXPOS) list << idx;
-    }
-    return list;
-}
-
-// TODO duplicated code
-void ModelEdit::setSelectedByMixList(QList<int> list)
-{
-    for(int i=0; i<MixerlistWidget->count(); i++) {
-      int t = MixerlistWidget->item(i)->data(Qt::UserRole).toByteArray().at(0);
-      if(list.contains(t))
-          MixerlistWidget->item(i)->setSelected(true);
-    }
-}
-
-void ModelEdit::setSelectedByExpoList(QList<int> list)
-{
-    for(int i=0; i<ExposlistWidget->count(); i++) {
-      int t = ExposlistWidget->item(i)->data(Qt::UserRole).toByteArray().at(0);
-      if(list.contains(t))
-        ExposlistWidget->item(i)->setSelected(true);
-    }
-}
-
-void ModelEdit::mixersDelete(bool ask)
-{
-    QMessageBox::StandardButton ret = QMessageBox::No;
-
-    if(ask)
-      ret = QMessageBox::warning(this, "companion9x",
-               tr("Delete Selected Mixes?"),
-               QMessageBox::Yes | QMessageBox::No);
-
-
-    if ((ret == QMessageBox::Yes) || (!ask)) {
-      mixersDeleteList(createMixListFromSelected());
-      updateSettings();
-      tabMixes();
-    }
-}
-
-void ModelEdit::mixersCut()
-{
-    mixersCopy();
-    mixersDelete(false);
-}
-
-void ModelEdit::mixersCopy()
-{
-
-    QList<int> list = createMixListFromSelected();
-
-    QByteArray mxData;
-    foreach(int idx, list) {
-      mxData.append((char*)&g_model.mixData[idx],sizeof(MixData));
-    }
-
-    QMimeData *mimeData = new QMimeData;
-    mimeData->setData("application/x-companion9x-mix", mxData);
-    QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
-}
-
-void ModelEdit::exposDelete(bool ask)
-{
-    QMessageBox::StandardButton ret = QMessageBox::No;
-
-    if(ask)
-      ret = QMessageBox::warning(this, "companion9x",
-               tr("Delete Selected Expos?"),
-               QMessageBox::Yes | QMessageBox::No);
-
-
-    if ((ret == QMessageBox::Yes) || (!ask)) {
-        exposDeleteList(createExpoListFromSelected());
-        updateSettings();
-        tabExpos();
-    }
-}
-
-void ModelEdit::exposCut()
-{
-    exposCopy();
-    exposDelete(false);
-}
-
-void ModelEdit::exposCopy()
-{
-    QList<int> list = createExpoListFromSelected();
-
-    QByteArray mxData;
-    foreach(int idx, list) {
-      mxData.append((char*)&g_model.expoData[idx],sizeof(ExpoData));
-    }
-
-    QMimeData *mimeData = new QMimeData;
-    mimeData->setData("application/x-companion9x-expo", mxData);
-    QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
-}
-
-void ModelEdit::mimeExpoDropped(int index, const QMimeData *data, Qt::DropAction /*action*/)
-{
-    int idx = ExposlistWidget->item(index > 0 ? index-1 : 0)->data(Qt::UserRole).toByteArray().at(0);
-    pasteExpoMimeData(data, idx);
-}
-
-void ModelEdit::mimeMixerDropped(int index, const QMimeData *data, Qt::DropAction /*action*/)
-{
-    int idx= MixerlistWidget->item(index > 0 ? index-1 : 0)->data(Qt::UserRole).toByteArray().at(0);
-    pasteMixerMimeData(data, idx);
-}
-
-void ModelEdit::pasteMixerMimeData(const QMimeData * mimeData, int destIdx)
-{
-  if(mimeData->hasFormat("application/x-companion9x-mix")) {
-    int idx; // mixer index
-    int dch;
-
-    if(destIdx<0) {
-      dch = -destIdx;
-      idx = getMixerIndex(dch) - 1; //get mixer index to insert
-    } else {
-      idx = destIdx;
-      dch = g_model.mixData[idx].destCh;
-    }
-
-    QByteArray mxData = mimeData->data("application/x-companion9x-mix");
-
-    int i = 0;
-    while(i<mxData.size()) {
-      idx++;
-      if(idx==GetEepromInterface()->getCapability(Mixes)) break;
-
-      if (!gm_insertMix(idx))
-        break;
-      MixData *md = &g_model.mixData[idx];
-      memcpy(md,mxData.mid(i,sizeof(MixData)).constData(),sizeof(MixData));
-      md->destCh = dch;
-      i += sizeof(MixData);
-    }
-
-    updateSettings();
-    tabMixes();
-  }
-}
-#include <iostream>
-#include <QtGui/qwidget.h>
-void ModelEdit::pasteExpoMimeData(const QMimeData * mimeData, int destIdx)
-{
-  if (mimeData->hasFormat("application/x-companion9x-expo")) {
-    int idx; // mixer index
-    int dch;
-
-    if (destIdx < 0) {
-      dch = -destIdx - 1;
-      idx = getExpoIndex(dch) - 1; //get expo index to insert
-    } else {
-      idx = destIdx;
-      dch = g_model.expoData[idx].chn;
-    }
-
-    QByteArray mxData = mimeData->data("application/x-companion9x-expo");
-
-    int i = 0;
-    while (i < mxData.size()) {
-      idx++;
-      if (!gm_insertExpo(idx))
-        break;
-      ExpoData *md = &g_model.expoData[idx];
-      memcpy(md, mxData.mid(i, sizeof(ExpoData)).constData(), sizeof(ExpoData));
-      md->chn = dch;
-      i += sizeof(ExpoData);
-    }
-
-    updateSettings();
-    tabExpos();
-  }
-}
-
-void ModelEdit::mixersPaste()
-{
-    const QClipboard *clipboard = QApplication::clipboard();
-    const QMimeData *mimeData = clipboard->mimeData();
-    QListWidgetItem *item = MixerlistWidget->currentItem();
-    if (item)
-      pasteMixerMimeData(mimeData, item->data(Qt::UserRole).toByteArray().at(0));
-}
-
-void ModelEdit::mixersDuplicate()
-{
-    mixersCopy();
-    mixersPaste();
-}
-
-void ModelEdit::exposPaste()
-{
-    const QClipboard *clipboard = QApplication::clipboard();
-    const QMimeData *mimeData = clipboard->mimeData();
-    QListWidgetItem *item = ExposlistWidget->currentItem();
-    if (item)
-      pasteExpoMimeData(mimeData, item->data(Qt::UserRole).toByteArray().at(0));
-}
-
-void ModelEdit::exposDuplicate()
-{
-    exposCopy();
-    exposPaste();
-}
-
-void ModelEdit::mixerOpen()
-{
-    int idx = MixerlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
-    if(idx<0) {
-      int i = -idx;
-      idx = getMixerIndex(i); //get mixer index to insert
-      if (!gm_insertMix(idx))
-        return;
-      g_model.mixData[idx].destCh = i;
-      mixInserted=true;
-    } else {
-      mixInserted=false;
-    }
-    
-    gm_openMix(idx);
-}
-
-void ModelEdit::mixerAdd()
-{
-    if (!MixerlistWidget->currentItem())
-      return;
-    int index = MixerlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
-
-    if(index<0) {  // if empty then return relavent index
-      int i = -index;
-      index = getMixerIndex(i); //get mixer index to insert
-      if (!gm_insertMix(index))
-        return;
-      g_model.mixData[index].destCh = i;
-      mixInserted=true;
-    } else {
-      index++;
-      if (!gm_insertMix(index))
-        return;
-      g_model.mixData[index].destCh = g_model.mixData[index-1].destCh;
-      mixInserted=true;
-    }
-    gm_openMix(index);
-}
-
-void ModelEdit::expoOpen(QListWidgetItem *item)
-{
-    if (!item)
-      item = ExposlistWidget->currentItem();
-
-    int idx = item->data(Qt::UserRole).toByteArray().at(0);
-    if (idx<0) {
-      int ch = -idx-1;
-      idx = getExpoIndex(ch); // get expo index to insert
-      if (!gm_insertExpo(idx))
-        return;
-      g_model.expoData[idx].chn = ch;
-      expoInserted=true;
-    } else {
-        expoInserted=false;
-    }
-    gm_openExpo(idx);
-}
-
-void ModelEdit::expoAdd()
-{
-    int index = ExposlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
-
-    if(index<0) {  // if empty then return relevant index
-      expoOpen();
-    }  else {
-      index++;
-      if (!gm_insertExpo(index))
-        return;
-      g_model.expoData[index].chn = g_model.expoData[index-1].chn;
-    }
-    gm_openExpo(index);
-}
-
-void ModelEdit::mixerlistWidget_customContextMenuRequested(QPoint pos)
-{
-    QPoint globalPos = MixerlistWidget->mapToGlobal(pos);
-
-    const QClipboard *clipboard = QApplication::clipboard();
-    const QMimeData *mimeData = clipboard->mimeData();
-    bool hasData = mimeData->hasFormat("application/x-companion9x-mix");
-
-    QMenu contextMenu;
-    contextMenu.addAction(QIcon(":/images/add.png"), tr("&Add"),this,SLOT(mixerAdd()),tr("Ctrl+A"));
-    contextMenu.addAction(QIcon(":/images/edit.png"), tr("&Edit"),this,SLOT(mixerOpen()),tr("Enter"));
-    contextMenu.addSeparator();
-    contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(mixersDelete()),tr("Delete"));
-    contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(mixersCopy()),tr("Ctrl+C"));
-    contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(mixersCut()),tr("Ctrl+X"));
-    contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(mixersPaste()),tr("Ctrl+V"))->setEnabled(hasData);
-    contextMenu.addAction(QIcon(":/images/duplicate.png"), tr("Du&plicate"),this,SLOT(mixersDuplicate()),tr("Ctrl+U"));
-    contextMenu.addSeparator();
-    contextMenu.addAction(QIcon(":/images/moveup.png"), tr("Move Up"),this,SLOT(moveMixUp()),tr("Ctrl+Up"));
-    contextMenu.addAction(QIcon(":/images/movedown.png"), tr("Move Down"),this,SLOT(moveMixDown()),tr("Ctrl+Down"));
-
-    contextMenu.exec(globalPos);
-}
-
-void ModelEdit::expolistWidget_customContextMenuRequested(QPoint pos)
-{
-    QPoint globalPos = ExposlistWidget->mapToGlobal(pos);
-
-    const QClipboard *clipboard = QApplication::clipboard();
-    const QMimeData *mimeData = clipboard->mimeData();
-    bool hasData = mimeData->hasFormat("application/x-companion9x-expo");
-
-    QMenu contextMenu;
-    contextMenu.addAction(QIcon(":/images/add.png"), tr("&Add"),this,SLOT(expoAdd()),tr("Ctrl+A"));
-    contextMenu.addAction(QIcon(":/images/edit.png"), tr("&Edit"),this,SLOT(expoOpen()),tr("Enter"));
-    contextMenu.addSeparator();
-    contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(exposDelete()),tr("Delete"));
-    contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(exposCopy()),tr("Ctrl+C"));
-    contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(exposCut()),tr("Ctrl+X"));
-    contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(exposPaste()),tr("Ctrl+V"))->setEnabled(hasData);
-    contextMenu.addAction(QIcon(":/images/duplicate.png"), tr("Du&plicate"),this,SLOT(exposDuplicate()),tr("Ctrl+U"));
-    contextMenu.addSeparator();
-    contextMenu.addAction(QIcon(":/images/moveup.png"), tr("Move Up"),this,SLOT(moveExpoUp()),tr("Ctrl+Up"));
-    contextMenu.addAction(QIcon(":/images/movedown.png"), tr("Move Down"),this,SLOT(moveExpoDown()),tr("Ctrl+Down"));
-
-    contextMenu.exec(globalPos);
-}
-
-void ModelEdit::cswPaste()
-{
-    const QClipboard *clipboard = QApplication::clipboard();
-    const QMimeData *mimeData = clipboard->mimeData();  
-    if (mimeData->hasFormat("application/x-companion9x-csw")) {
-      QByteArray cswData = mimeData->data("application/x-companion9x-csw");
-
-      CustomSwData *csw = &g_model.customSw[selectedSwitch];
-      memcpy(csw, cswData.mid(0, sizeof(CustomSwData)).constData(), sizeof(CustomSwData));
-      updateSettings();
-      updateSelectedSwitch();
-    }
-}
-
-void ModelEdit::cswDelete()
-{
-    g_model.customSw[selectedSwitch].clear();
-    updateSettings();
-    updateSelectedSwitch();
-}
-
-void ModelEdit::cswCopy()
-{
-    QByteArray cswData;
-    cswData.append((char*)&g_model.customSw[selectedSwitch],sizeof(CustomSwData));
-    QMimeData *mimeData = new QMimeData;
-    mimeData->setData("application/x-companion9x-csw", cswData);
-    QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
-}
-
-void ModelEdit::updateSelectedSwitch()
-{
-    switchEditLock = true;
-    populateCSWCB(csw[selectedSwitch], g_model.customSw[selectedSwitch].func);
-    setSwitchWidgetVisibility(selectedSwitch);
-    switchEditLock = false;
-}
-
-void ModelEdit::cswCut()
-{
-  cswCopy();
-  cswDelete();
-}
-
-void ModelEdit::csw_customContextMenuRequested(QPoint pos)
-{
-    QLabel *label = (QLabel *)sender();
-    if (!label)
-      return;
-    QString name=label->objectName();
-    if (!name.startsWith("cswlabel"))
-      return;
-    selectedSwitch=name.mid(9,2).toInt()-1;
-    
-    QPoint globalPos = label->mapToGlobal(pos);
-
-    const QClipboard *clipboard = QApplication::clipboard();
-    const QMimeData *mimeData = clipboard->mimeData();
-    bool hasData = mimeData->hasFormat("application/x-companion9x-csw");
-
-    QMenu contextMenu;
-    contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(cswDelete()),tr("Delete"));
-    contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(cswCopy()),tr("Ctrl+C"));
-    contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(cswCut()),tr("Ctrl+X"));
-    contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(cswPaste()),tr("Ctrl+V"))->setEnabled(hasData);
-
-    contextMenu.exec(globalPos);
-}
-
-void ModelEdit::fsw_customContextMenuRequested(QPoint pos)
-{
-    QLabel *label = (QLabel *)sender();
-    if (!label)
-      return;
-    int fsw=label->property("FunctionId").toInt();
-    if (!(fsw>0 && fsw<=32))
-      return;
-    selectedFunction=fsw-1;
-    
-    QPoint globalPos = label->mapToGlobal(pos);
-
-    const QClipboard *clipboard = QApplication::clipboard();
-    const QMimeData *mimeData = clipboard->mimeData();
-    bool hasData = mimeData->hasFormat("application/x-companion9x-fsw");
-
-    QMenu contextMenu;
-    contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(fswDelete()),tr("Delete"));
-    contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(fswCopy()),tr("Ctrl+C"));
-    contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(fswCut()),tr("Ctrl+X"));
-    contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(fswPaste()),tr("Ctrl+V"))->setEnabled(hasData);
-
-    contextMenu.exec(globalPos);
-}
-
-void ModelEdit::fswPaste()
-{
-  const QClipboard *clipboard = QApplication::clipboard();
-  const QMimeData *mimeData = clipboard->mimeData();  
-  if (mimeData->hasFormat("application/x-companion9x-fsw")) {
-    QByteArray fswData = mimeData->data("application/x-companion9x-fsw");
-    
-    FuncSwData *fsw = &g_model.funcSw[selectedFunction];
-    memcpy(fsw, fswData.mid(0, sizeof(FuncSwData)).constData(), sizeof(FuncSwData));
-    updateSettings();
-    tabCustomFunctions();
-  }
-}
-
-void ModelEdit::fswDelete()
-{
-  g_model.funcSw[selectedFunction].clear();
-  updateSettings();
-  tabCustomFunctions();
-}
-
-void ModelEdit::fswCopy()
-{
-    QByteArray fswData;
-    fswData.append((char*)&g_model.funcSw[selectedFunction],sizeof(FuncSwData));
-    QMimeData *mimeData = new QMimeData;
-    mimeData->setData("application/x-companion9x-fsw", fswData);
-    QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
-}
-
-void ModelEdit::fswCut()
-{
-    fswCopy();
-    fswDelete();
-}
-
-void ModelEdit::mixerlistWidget_KeyPress(QKeyEvent *event)
-{
-    if(event->matches(QKeySequence::SelectAll)) mixerAdd();  //Ctrl A
-    if(event->matches(QKeySequence::Delete))    mixersDelete();
-    if(event->matches(QKeySequence::Copy))      mixersCopy();
-    if(event->matches(QKeySequence::Cut))       mixersCut();
-    if(event->matches(QKeySequence::Paste))     mixersPaste();
-    if(event->matches(QKeySequence::Underline)) mixersDuplicate();
-
-    if(event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter) mixerOpen();
-    if(event->matches(QKeySequence::MoveToNextLine))
-        MixerlistWidget->setCurrentRow(MixerlistWidget->currentRow()+1);
-    if(event->matches(QKeySequence::MoveToPreviousLine))
-        MixerlistWidget->setCurrentRow(MixerlistWidget->currentRow()-1);
-}
-
-void ModelEdit::expolistWidget_KeyPress(QKeyEvent *event)
-{
-    if(event->matches(QKeySequence::SelectAll)) expoAdd();  //Ctrl A
-    if(event->matches(QKeySequence::Delete))    exposDelete();
-    if(event->matches(QKeySequence::Copy))      exposCopy();
-    if(event->matches(QKeySequence::Cut))       exposCut();
-    if(event->matches(QKeySequence::Paste))     exposPaste();
-    if(event->matches(QKeySequence::Underline)) exposDuplicate();
-
-    if(event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter) expoOpen();
-    if(event->matches(QKeySequence::MoveToNextLine))
-        ExposlistWidget->setCurrentRow(ExposlistWidget->currentRow()+1);
-    if(event->matches(QKeySequence::MoveToPreviousLine))
-        ExposlistWidget->setCurrentRow(ExposlistWidget->currentRow()-1);
-}
-
-int ModelEdit::gm_moveMix(int idx, bool dir) //true=inc=down false=dec=up
-{
-    if(idx>GetEepromInterface()->getCapability(Mixes) || (idx==0 && !dir) || (idx==GetEepromInterface()->getCapability(Mixes) && dir)) return idx;
-
-    int tdx = dir ? idx+1 : idx-1;
-    MixData &src=g_model.mixData[idx];
-    MixData &tgt=g_model.mixData[tdx];
-
-    unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
-    if((src.destCh==0) || (src.destCh>outputs) || (tgt.destCh>outputs)) return idx;
-
-    if(tgt.destCh!=src.destCh) {
-        if ((dir)  && (src.destCh<outputs)) src.destCh++;
-        if ((!dir) && (src.destCh>0)) src.destCh--;
-        return idx;
-    }
-
-    //flip between idx and tgt
-    MixData temp;
-    memcpy(&temp,&src,sizeof(MixData));
-    memcpy(&src,&tgt,sizeof(MixData));
-    memcpy(&tgt,&temp,sizeof(MixData));
-    return tdx;
-}
-
-void ModelEdit::moveMixUp()
-{
-    QList<int> list = createMixListFromSelected();
-    QList<int> highlightList;
-    foreach(int idx, list) {
-      highlightList << gm_moveMix(idx, false);
-    }
-    updateSettings();
-    tabMixes();
-    setSelectedByMixList(highlightList);
-}
-
-void ModelEdit::moveMixDown()
-{
-    QList<int> list = createMixListFromSelected();
-    QList<int> highlightList;
-    foreach(int idx, list) {
-      highlightList << gm_moveMix(idx, true);
-    }
-    updateSettings();
-    tabMixes();
-    setSelectedByMixList(highlightList);
-}
-
-int ModelEdit::gm_moveExpo(int idx, bool dir) //true=inc=down false=dec=up
-{
-    if(idx>C9X_MAX_EXPOS || (idx==C9X_MAX_EXPOS && dir)) return idx;
-    
-    int tdx = dir ? idx+1 : idx-1;
-    ExpoData temp;
-    temp.clear();    
-    ExpoData &src=g_model.expoData[idx];
-    ExpoData &tgt=g_model.expoData[tdx];
-    if (!dir && tdx<0 && src.chn>0) {
-      src.chn--;
-      return idx;
-    } else if (!dir && tdx<0) {
-      return idx;
-    }
-    
-    if(memcmp(&src,&temp,sizeof(ExpoData))==0) return idx;
-    bool tgtempty=(memcmp(&tgt,&temp,sizeof(ExpoData))==0 ? 1:0);
-    if(tgt.chn!=src.chn || tgtempty) {
-        if ((dir)  && (src.chn<(NUM_STICKS-1))) src.chn++;
-        if ((!dir) && (src.chn>0)) src.chn--;
-        return idx;
-    }
-
-    //flip between idx and tgt
-    memcpy(&temp,&src,sizeof(ExpoData));
-    memcpy(&src,&tgt,sizeof(ExpoData));
-    memcpy(&tgt,&temp,sizeof(ExpoData));
-    return tdx;
-}
-
-void ModelEdit::moveExpoUp()
-{
-    QList<int> list = createExpoListFromSelected();
-    QList<int> highlightList;
-    foreach(int idx, list) {
-      highlightList << gm_moveExpo(idx, false);
-    }
-    updateSettings();
-    tabExpos();
-    setSelectedByExpoList(highlightList);
-}
-
-void ModelEdit::moveExpoDown()
-{
-    QList<int> list = createExpoListFromSelected();
-    QList<int> highlightList;
-    foreach(int idx, list) {
-      highlightList << gm_moveExpo(idx, true);
-    }
-    updateSettings();
-    tabExpos();
-    setSelectedByExpoList(highlightList);
-}
-
-void ModelEdit::launchSimulation()
-{
-    if (GetEepromInterface()->getSimulator()) {
-      RadioData *simuData = new RadioData;
-      *simuData = radioData;
-      simuData->models[id_model] = g_model;
-      if (GetEepromInterface()->getCapability(SimulatorType)) {
-        xsimulatorDialog sd(this);
-        sd.loadParams(*simuData, id_model);
-        sd.exec();
-      } else {
-        simulatorDialog sd(this);
-        sd.loadParams(*simuData, id_model);
-        sd.exec();
-      }
-    } else {
-      QMessageBox::warning(NULL,
-          QObject::tr("Warning"),
-          QObject::tr("Simulator for this firmware is not yet available"));
-    }
-}
-
-void ModelEdit::on_pushButton_clicked()
-{
-    launchSimulation();
-}
-
-void ModelEdit::resetCurve()
-{
-    QPushButton *button = (QPushButton *)sender();
-    int btn=button->objectName().mid(button->objectName().lastIndexOf("_")+1).toInt()-1;
-    if (btn!=currentCurve) {
-      int res = QMessageBox::question(this, "companion9x",tr("Are you sure you want to delete curve %1 ?").arg(btn+1),QMessageBox::Yes | QMessageBox::No);
-      if (res == QMessageBox::No) {
-        return;
-      }
-    }
-    memset(g_model.curves[btn].name,0,sizeof(g_model.curves[btn].name));
-    ui->cname_LE->clear();
-    g_model.curves[btn].count=5;
-    g_model.curves[btn].custom=false;
-    curvesLock=true;
-    for (int i=0; i<17; i++) {
-      g_model.curves[btn].points[i].x=0;
-      g_model.curves[btn].points[i].y=0;
-      spnx[i]->setMinimum(-100);
-      spnx[i]->setMaximum(100);
-      spnx[i]->setValue(0);
-      spny[i]->setValue(0);
-    }
-    curvesLock=false;
-    updateCurvesTab();
-    if (btn==currentCurve) {
-      ui->curvetype_CB->setCurrentIndex(2);
-    }
-    updateSettings();
-    drawCurve();
-}
-
-void ModelEdit::editCurve()
-{
-    QPushButton *button = (QPushButton *)sender();
-    int btn=button->objectName().mid(button->objectName().lastIndexOf("_")+1).toInt()-1;
-    setCurrentCurve(btn);
-    drawCurve();
-}
-
-void ModelEdit::plotCurve(bool checked)
-{
-    QCheckBox *chk = (QCheckBox *)sender();
-    int btn=chk->objectName().mid(chk->objectName().lastIndexOf("_")+1).toInt()-1;
-    plot_curve[btn] = checked;
-    drawCurve();
-}
-
-void ModelEdit::on_T2ThrTrgChkB_toggled(bool checked)
-{
-    g_model.t2throttle = checked;
-    updateSettings();
-}
-
-void ModelEdit::on_extendedLimitsChkB_toggled(bool checked)
-{
-    g_model.extendedLimits = checked;
-    setLimitMinMax();
-    updateSettings();
-}
-
-void ModelEdit::on_thrwarnChkB_toggled(bool checked)
-{
-    if (switchEditLock)
-      return;
-    g_model.disableThrottleWarning = checked;
-    updateSettings();
-}
-
-void ModelEdit::on_thrrevChkB_toggled(bool checked)
-{
-    g_model.throttleReversed = checked;
-    updateSettings();
-}
-
-void ModelEdit::on_extendedTrimsChkB_toggled(bool checked)
-{
-    g_model.extendedTrims = checked;
-    tabPhases();
-    updateSettings();
-}
-
-void ModelEdit::setLimitMinMax()
-{
-    on_numChannelsSB_editingFinished();
-    on_numChannelsSB_2_editingFinished();
-    on_numChannelsSB_3_editingFinished();
-    int v = g_model.extendedLimits ? 125 : 100;
-    foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("minSB_[0-9]+"))) {
-      sb->setMaximum(25);
-      sb->setMinimum(-v);
-    }
-    foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("maxSB_[0-9]+"))) {
-      sb->setMaximum(v);
-      sb->setMinimum(-25);
-    }
-}
-
-
-void ModelEdit::safetySwitchesEdited()
-{
-    for(int i=0; i<NUM_SAFETY_CHNOUT; i++) {
-        g_model.safetySw[i].swtch = RawSwitch(safetySwitchSwtch[i]->itemData(safetySwitchSwtch[i]->currentIndex()).toInt());
-        g_model.safetySw[i].val   = safetySwitchValue[i]->value();
-    }
-    updateSettings();
-}
-
-
-
-void ModelEdit::on_templateList_doubleClicked(QModelIndex index)
-{
-    QString text = ui->templateList->item(index.row())->text();
-    if (index.row()==13) {
-      uint64_t result=0xffffffff;
-      modelConfigDialog *mcw = new modelConfigDialog(radioData, &result, this);
-      mcw->exec();
-      if (result!=0xffffffff) {
-        applyNumericTemplate(result);
-        updateSettings();
-        tabMixes();
-      }
-    } else {
-      int res = QMessageBox::question(this,tr("Apply Template?"),tr("Apply template \"%1\"?").arg(text),QMessageBox::Yes | QMessageBox::No);
-      if(res!=QMessageBox::Yes) return;
-      applyTemplate(index.row());
-      updateSettings();
-      tabMixes();
-   }
-}
-
-
-MixData* ModelEdit::setDest(uint8_t dch)
-{
-    uint8_t i = 0;
-    while ((g_model.mixData[i].destCh<=dch) && (g_model.mixData[i].destCh) && (i<GetEepromInterface()->getCapability(Mixes))) i++;
-    if(i==GetEepromInterface()->getCapability(Mixes)) return &g_model.mixData[0];
-
-    memmove(&g_model.mixData[i+1],&g_model.mixData[i],
-            (GetEepromInterface()->getCapability(Mixes)-(i+1))*sizeof(MixData) );
-    memset(&g_model.mixData[i],0,sizeof(MixData));
-    g_model.mixData[i].destCh = dch;
-    return &g_model.mixData[i];
-}
-
-void ModelEdit::clearExpos(bool ask)
-{
-    if(ask) {
-      int res = QMessageBox::question(this,tr("Clear Expos?"),tr("Really clear all the expos?"),QMessageBox::Yes | QMessageBox::No);
-      if(res!=QMessageBox::Yes) return;
-    }
-    memset(g_model.expoData,0,sizeof(g_model.expoData)); //clear all expos
-    updateSettings();
-    tabExpos();
-}
-
-void ModelEdit::clearMixes(bool ask)
-{
-    if(ask) {
-      int res = QMessageBox::question(this,tr("Clear Mixes?"),tr("Really clear all the mixes?"),QMessageBox::Yes | QMessageBox::No);
-      if(res!=QMessageBox::Yes) return;
-    }
-    memset(g_model.mixData,0,sizeof(g_model.mixData)); //clear all mixes
-    updateSettings();
-    tabMixes();
-}
-
-void ModelEdit::clearCurves(bool ask)
-{
-    if(ask) {
-      int res = QMessageBox::question(this,tr("Clear Curves?"),tr("Really clear all the curves?"),QMessageBox::Yes | QMessageBox::No);
-      if(res!=QMessageBox::Yes) return;
-    }
-    curvesLock=true;
-    if (!GetEepromInterface()->getCapability(CustomCurves)){
-      ui->curvetype_CB->setDisabled(true);
-      int count=0;
-      for (int j=0; j< GetEepromInterface()->getCapability(NumCurves3); j++) {
-          g_model.curves[count].count=3;
-          g_model.curves[count].custom=false;
-          memset(g_model.curves[j].name,0,sizeof(g_model.curves[j].name)); 
-          for (int i=0; i<17; i++) {
-            g_model.curves[count].points[i].x=0;
-            g_model.curves[count].points[i].y=0;
-          }
-          count++;
-      }
-      for (int j=0; j< GetEepromInterface()->getCapability(NumCurves5); j++) {
-          g_model.curves[count].count=5;
-          g_model.curves[count].custom=false;
-          memset(g_model.curves[j].name,0,sizeof(g_model.curves[j].name)); 
-          for (int i=0; i<17; i++) {
-            g_model.curves[count].points[i].x=0;
-            g_model.curves[count].points[i].y=0;
-          }
-          count++;
-      }
-      for (int j=0; j< GetEepromInterface()->getCapability(NumCurves9); j++) {
-          g_model.curves[count].count=9;
-          g_model.curves[count].custom=false;
-          memset(g_model.curves[j].name,0,sizeof(g_model.curves[j].name)); 
-          for (int i=0; i<17; i++) {
-            g_model.curves[count].points[i].x=0;
-            g_model.curves[count].points[i].y=0;
-          }
-          count++;
-      }
-      for (int j=count; j<16; j++) {
-          g_model.curves[j].count=5;
-          g_model.curves[j].custom=false;
-          memset(g_model.curves[j].name,0,sizeof(g_model.curves[j].name)); 
-          for (int i=0; i<17; i++) {
-            g_model.curves[j].points[i].x=0;
-            g_model.curves[j].points[i].y=0;
-          }
-      }
-    } else {
-      for (int j=0; j<16; j++) {
-          g_model.curves[j].count=5;
-          g_model.curves[j].custom=false;
-          memset(g_model.curves[j].name,0,sizeof(g_model.curves[j].name));
-          for (int i=0; i<17; i++) {
-            g_model.curves[j].points[i].x=0;
-            g_model.curves[j].points[i].y=0;
-          }
-      }
-    }
-    for (int i=0; i<17; i++) {
-      spnx[i]->setMinimum(-100);
-      spnx[i]->setMaximum(100);
-      spnx[i]->setValue(0);
-      spny[i]->setValue(0);
-    }
-    currentCurve=0;
-    curvesLock=false;
-    if (GetEepromInterface()->getCapability(NumCurves3)>0) {
-      ui->curvetype_CB->setCurrentIndex(0);
-    } else {
-      ui->curvetype_CB->setCurrentIndex(2);  
-    }
-    ui->cname_LE->clear();
-    updateSettings();
-    drawCurve();
-}
-
-void ModelEdit::setCurve(uint8_t c, int8_t ar[])
-{
-    int len=sizeof(ar)/sizeof(int8_t);
-    if (GetEepromInterface()->getCapability(CustomCurves)) {
-      if (GetEepromInterface()->getCapability(NumCurves)>c) {
-        if (len<9) {
-          g_model.curves[c].count=5;
-          g_model.curves[c].custom=false;
-          for (int i=0; i< 5; i++) {
-            g_model.curves[c].points[i].y=ar[i];
-          }
-        } else {
-          g_model.curves[c].count=5;
-          g_model.curves[c].custom=false;
-          for (int i=0; i< 5; i++) {
-            g_model.curves[c].points[i].y=ar[i];
-          }
-        }
-      }
-    } else {
-      if (len<9) {
-        g_model.curves[c].count=5;
-        g_model.curves[c].custom=false;
-        for (int i=0; i< 5; i++) {
-          g_model.curves[c].points[i].y=ar[i];
-        }
-      } else {
-        g_model.curves[c+8].count=5;
-        g_model.curves[c+8].custom=false;
-        for (int i=0; i< 5; i++) {
-          g_model.curves[c+8].points[i].y=ar[i];
-        }
-      }
-    }
-}
-
-void ModelEdit::setSwitch(unsigned int idx, unsigned int func, int v1, int v2)
-{
-    g_model.customSw[idx-1].func = func;
-    g_model.customSw[idx-1].val1   = v1;
-    g_model.customSw[idx-1].val2   = v2;
-}
-
-void ModelEdit::applyNumericTemplate(uint64_t tpl)
-{
-    clearCurves(false);
-    clearExpos(false);
-    clearMixes(false);
-    int8_t heli_ar1[] = {-100, -20, 30, 70, 90};
-    int8_t heli_ar2[] = {80, 70, 60, 70, 100};
-    int8_t heli_ar3[] = {100, 90, 80, 90, 100};
-    int8_t heli_ar4[] = {-30,  -15, 0, 50, 100};
-    int8_t heli_ar5[] = {-100, -50, 0, 50, 100};
-    bool rx[10];
-    for (int i=0; i<10 ; i++) {
-      rx[i]=false;
-    }
-    int thrsw=GetEepromInterface()->getCapability(GetThrSwitch);
-    MixData *md = &g_model.mixData[0];
-    uint8_t spo2ch=(tpl & 0x0F);
-    tpl>>=4;
-    uint8_t spo1ch=(tpl & 0x0F);
-    tpl>>=4;
-    uint8_t fla2ch=(tpl & 0x0F);
-    tpl>>=4;
-    uint8_t fla1ch=(tpl & 0x0F);
-    tpl>>=4;
-    uint8_t rud2ch=(tpl & 0x0F);
-    tpl>>=4;
-    uint8_t ele2ch=(tpl & 0x0F);
-    tpl>>=4;
-    uint8_t ail2ch=(tpl & 0x0F);
-    tpl>>=4;
-    uint8_t chstyle=(tpl & 0x03);
-    tpl>>=2;
-    uint8_t gyro=(tpl & 0x03);
-    tpl>>=2;
-    uint8_t tailtype=(tpl & 0x03);
-    tpl>>=2;
-    uint8_t swashtype=(tpl & 0x07);
-    tpl>>=3;
-    uint8_t ruddertype=(tpl & 0x03);
-    tpl>>=2;
-    uint8_t spoilertype=(tpl & 0x3);
-    tpl>>=2;
-    uint8_t flaptype=(tpl & 0x03);
-    tpl>>=2;
-    uint8_t ailerontype=(tpl & 0x03);
-    tpl>>=2;
-    uint8_t enginetype=(tpl & 0x03);
-    tpl>>=2;
-    uint8_t modeltype=(tpl & 0x03);
-
-  #define ICC(x) icc[(x)-1]
-    uint8_t icc[4] = {0};
-    for(uint8_t i=1; i<=4; i++) //generate inverse array
-      for(uint8_t j=1; j<=4; j++) if(CC(i)==j) icc[j-1]=i;
-
-    int ailerons;
-    int flaps;
-    int throttle;
-    int spoilers;
-    int elevators;
-    int rudders;
-    int sign;
-    uint8_t rxch;
-    switch (modeltype) {
-      case 0:
-        ailerons=ailerontype;
-        flaps=flaptype;
-        throttle=1;
-        switch (tailtype) {
-          case 0:
-          case 1:
-            rudders=1;
-            elevators=1;
-            break;
-          case 2:
-            rudders=1;
-            elevators=2;
-            break;
-        }
-        rxch=ICC(STK_RUD);
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
-        if (tailtype==1) {
-          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-        }
-        rx[rxch-1]=true;
-        rxch=ICC(STK_ELE);
-        if (tailtype==1) {
-          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
-        }
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-        rx[rxch-1]=true;
-        rxch=ICC(STK_THR);
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("THR").toAscii().data(),6);
-        rx[rxch-1]=true;
-        if (ail2ch > 0) {
-          rx[ail2ch-1]=true;
-        }
-        if (ele2ch > 0) {
-          rx[ele2ch-1]=true;
-        }
-        if (fla1ch > 0) {
-          rx[fla1ch-1]=true;
-        }
-        if (fla2ch > 0) {
-          rx[fla2ch-1]=true;
-        }
-        if (ailerons>0) {
-          rxch=ICC(STK_AIL);
-          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
-          rx[rxch-1]=true;
-        }
-        if (ailerons>1) {
-          if (ail2ch==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL2").toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          } else {
-            md=setDest(ail2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL2").toAscii().data(),6);
-          }
-        }
-        if (elevators>1) {
-          if (ele2ch==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();;strncpy(md->name, tr("ELE2").toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          }else{
-            md=setDest(ele2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();;strncpy(md->name, tr("ELE2").toAscii().data(),6);
-          }
-        }
-        if (flaps>0) {
-              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6); md->speedUp=4; md->speedDown=4;
-              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6); md->speedUp=4; md->speedDown=4;
-        }
-        sign=-1;
-        for (uint8_t i=0; i< flaps; i++) {
-          sign*=-1;
-          int index;
-          if (i==0) {
-            index=fla1ch;
-          } else {
-            index=fla2ch;
-          }
-          if (index==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          } else {
-            md=setDest(index);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
-          }
-        }      
-        break;
-      case 1:
-        setCurve(CURVE5(1),heli_ar1);
-        setCurve(CURVE5(2),heli_ar2);
-        setCurve(CURVE5(3),heli_ar3);
-        setCurve(CURVE5(4),heli_ar4);
-        setCurve(CURVE5(5),heli_ar5);
-        setCurve(CURVE5(6),heli_ar5);
-        switch (swashtype) {
-          case 0:
-            g_model.swashRingData.type = HELI_SWASH_TYPE_90;
-            break;
-          case 1:
-            g_model.swashRingData.type = HELI_SWASH_TYPE_120;
-            break;
-          case 2:
-            g_model.swashRingData.type = HELI_SWASH_TYPE_120X;
-            break;
-          case 3:
-            g_model.swashRingData.type = HELI_SWASH_TYPE_140;
-            break;
-          case 4:
-            g_model.swashRingData.type = HELI_SWASH_TYPE_NONE;
-            break;
-        }
-        g_model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
-
-        if (chstyle==0) {
-          if (swashtype!=4) {
-            md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-            md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
-            md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("PITCH").toAscii().data(),6);
-          } else {
-            md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-            md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
-            md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("PITCH").toAscii().data(),6);
-          }
-          md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
-          md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
-          md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
-          md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
-          md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
-          switch (gyro) {
-            case 1:
-              md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);strncpy(md->name, tr("GYRO").toAscii().data(),6);
-              md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);strncpy(md->name, tr("GYRO").toAscii().data(),6);
-              break;
-            case 2:
-              md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;strncpy(md->name, tr("GYRO").toAscii().data(),6);
-              md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;strncpy(md->name, tr("GYRO").toAscii().data(),6);
-              break;
-          }
-        } else {
-          if (swashtype!=4) {
-            md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
-            md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-            md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("PITCH").toAscii().data(),6);
-          } else {
-            md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
-            md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-            md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("PITCH").toAscii().data(),6);          
-          }
-          md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
-          md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
-          md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
-          md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
-          md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
-          switch (gyro) {
-            case 1:
-              md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);strncpy(md->name, tr("GYRO").toAscii().data(),6);
-              md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);strncpy(md->name, tr("GYRO").toAscii().data(),6);
-              break;
-            case 2:
-              md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;strncpy(md->name, tr("GYRO").toAscii().data(),6);
-              md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;strncpy(md->name, tr("GYRO").toAscii().data(),6);
-              break;
-          }     
-        }
-        // collective
-        md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
-        md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
-        md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
-        break;
-      case 2:
-        ailerons=ailerontype;
-        flaps=flaptype;
-        spoilers=spoilertype;
-        throttle=enginetype;
-        switch (tailtype) {
-          case 0:
-          case 1:
-            rudders=1;
-            elevators=1;
-            break;
-          case 2:
-            rudders=1;
-            elevators=2;
-            break;
-        }
-        if (throttle==1) {
-         rxch=ICC(STK_THR);
-         md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("THR").toAscii().data(),6);
-         rx[rxch-1]=true;
-        }
-        rxch=ICC(STK_RUD);
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
-        if (tailtype==1) {
-          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
-        }
-        rx[rxch-1]=true;
-        rxch=ICC(STK_ELE);
-        if (tailtype==1) {
-          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-        }
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-        rx[rxch-1]=true;
-        if (ail2ch > 0) {
-          rx[ail2ch-1]=true;
-        }
-        if (ele2ch > 0) {
-          rx[ele2ch-1]=true;
-        }
-        if (fla1ch > 0) {
-          rx[fla1ch-1]=true;
-        }
-        if (fla2ch > 0) {
-          rx[fla2ch-1]=true;
-        }
-        if (spo1ch > 0) {
-          rx[spo1ch-1]=true;
-        }
-        if (spo2ch > 0) {
-          rx[spo2ch-1]=true;
-        }
-
-        if (ailerons>0) {
-          rxch=ICC(STK_AIL);
-          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
-          rx[rxch-1]=true;
-        }
-        if (ailerons>1) {
-          if (ail2ch==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL2").toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          } else {
-            md=setDest(ail2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL2").toAscii().data(),6);
-          }
-        }
-        if (elevators>1) {
-          if (ele2ch==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE2").toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          } else {
-            md=setDest(ele2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE2").toAscii().data(),6);          
-          }
-        }
-        if (flaps>0) {
-              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6);md->speedUp=4; md->speedDown=4; 
-              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6);md->speedUp=4; md->speedDown=4; 
-        }
-        sign=-1;
-        for (uint8_t i=0; i< flaps; i++) {
-          sign*=-1;
-          int index;
-          if (i==0) {
-            index=fla1ch;
-          } else {
-            index=fla2ch;
-          }
-          if (index==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          } else {
-            md=setDest(index);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
-          }
-        }      
-        if (spoilers>0) {
-              md=setDest(12);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);strncpy(md->name, tr("SPOIL").toAscii().data(),6); md->speedUp=4;;md->speedDown=4;
-              md=setDest(12);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);strncpy(md->name, tr("SPOIL").toAscii().data(),6);md->speedUp=4;md->speedDown=4;
-        }
-        sign=-1;
-        for (uint8_t i=0; i< spoilers; i++) {
-          sign*=-1;
-          int index;
-          if (i==0) {
-            index=spo1ch;
-          } else {
-            index=spo2ch;
-          }
-          if (index==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 11); md->weight=100*sign;  md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("SPOIL%1").arg(i+1).toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          } else {
-            md=setDest(index);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 11);  md->weight=100*sign;  md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("SPOIL%1").arg(i+1).toAscii().data(),6);
-          }
-        }
-        break;
-      case 3:
-        flaps=flaptype;
-        throttle=enginetype;
-        rudders=ruddertype;
-        if (throttle==1) {
-         rxch=ICC(STK_THR);
-         md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("THR").toAscii().data(),6);
-         rx[rxch-1]=true;
-        }
-        rxch=ICC(STK_ELE);
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
-        rx[rxch-1]=true;
-        rxch=ICC(STK_AIL);
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
-        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
-        rx[rxch-1]=true;
-        if (rudders>0) {
-          rxch=ICC(STK_RUD);
-          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
-          rx[rxch-1]=true;
-        }
-        if (rud2ch > 0) {
-          rx[rud2ch-1]=true;
-        }
-        if (fla1ch > 0) {
-          rx[fla1ch-1]=true;
-        }
-        if (fla2ch > 0) {
-          rx[fla2ch-1]=true;
-        }
-        if (rudders>1) {
-          if (rud2ch==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD2").toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          } else {
-            md=setDest(rud2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD2").toAscii().data(),6);
-          }
-        }
-        if (flaps>0) {
-              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6); md->sOffset=0; md->speedUp=4;
-              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6); md->sOffset=0; md->speedUp=4;
-        }
-        sign=-1;
-        for (uint8_t i=0; i< flaps; i++) {
-          sign*=-1;
-          int index;
-          if (i==0) {
-            index=fla1ch;
-          } else {
-            index=fla2ch;
-          }
-          if (index==0) {
-            for (int j=0; j<10 ; j++) {
-              if (!rx[j]) {
-                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->speedUp=4; md->speedDown=4; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
-                rx[j]=true;
-                break;
-              }
-            }
-          } else {
-            md=setDest(index);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->speedUp=4; md->speedDown=4; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
-          }
-        }      
-        break;
-    }
-    updateHeliTab();
-    updateCurvesTab();
-    if (modeltype==1 && swashtype!=4) {
-      ui->tabWidget->setCurrentIndex(1);
-    } else {
-      ui->tabWidget->setCurrentIndex(4);
-    }
-    resizeEvent();
-}
-
-void ModelEdit::applyTemplate(uint8_t idx)
-{
-    int8_t heli_ar1[] = {-100, -20, 30, 70, 90};
-    int8_t heli_ar2[] = {80, 70, 60, 70, 100};
-    int8_t heli_ar3[] = {100, 90, 80, 90, 100};
-    int8_t heli_ar4[] = {-30,  -15, 0, 50, 100};
-    int8_t heli_ar5[] = {-100, -50, 0, 50, 100};
-
-    int thrsw=GetEepromInterface()->getCapability(GetThrSwitch);
-    MixData *md = &g_model.mixData[0];
-
-    //CC(STK)   -> vSTK
-    //ICC(vSTK) -> STK
-  #define ICC(x) icc[(x)-1]
-    uint8_t icc[4] = {0};
-    for(uint8_t i=1; i<=4; i++) //generate inverse array
-      for(uint8_t j=1; j<=4; j++) if(CC(i)==j) icc[j-1]=i;
-
-
-    uint8_t j = 0;
-
-    //Simple 4-Ch
-    if(idx==j++) {
-      if (md->destCh)
-        clearMixes();
-      md=setDest(ICC(STK_RUD));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_AIL));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();
-    }
-
-    //T-Cut
-    if(idx==j++) {
-        md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100;  md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw);  md->mltpx=MLTPX_REP;
-    }
-
-    //sticky t-cut
-    if(idx==j++) {
-      md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100;  md->swtch=RawSwitch(SWITCH_TYPE_VIRTUAL, 12);  md->mltpx=MLTPX_REP;
-      md=setDest(14); md->srcRaw=RawSource(SOURCE_TYPE_CH, 13); md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(14); md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100;  md->swtch=RawSwitch(SWITCH_TYPE_VIRTUAL, 11);  md->mltpx=MLTPX_REP;
-      md=setDest(14); md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight= 100;  md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw);  md->mltpx=MLTPX_REP;
-      setSwitch(0xB, CS_FN_VNEG, RawSource(SOURCE_TYPE_STICK, 2).toValue(), -99);
-      setSwitch(0xC, CS_FN_VPOS, RawSource(SOURCE_TYPE_CH, 13).toValue(), 0);
-      updateSwitchesTab();
-    }
-
-    //V-Tail
-    if(idx==j++) {
-      clearMixes();
-      md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_AIL));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_RUD));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_RUD));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight= 100; md->swtch=RawSwitch();
-    }
-
-    //Elevon\\Delta
-    if(idx==j++) {
-      clearMixes();
-      md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_RUD));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_AIL));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();
-      md=setDest(ICC(STK_AIL));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();
-    }
-
-    //Heli Setup  
-    if(idx==j++)  {
-      clearMixes();  //This time we want a clean slate
-      clearCurves();
-
-      // Set up Mixes
-      // 3 cyclic channels
-      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();
-
-      // rudder
-      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();
-
-      // throttle
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
-
-      // gyro gain
-      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);
-      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);
-
-      // collective
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
-
-      g_model.swashRingData.type = HELI_SWASH_TYPE_120;
-      g_model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
-
-      // set up Curves
-      setCurve(CURVE5(1),heli_ar1);
-      setCurve(CURVE5(2),heli_ar2);
-      setCurve(CURVE5(3),heli_ar3);
-      setCurve(CURVE5(4),heli_ar4);
-      setCurve(CURVE5(5),heli_ar5);
-      setCurve(CURVE5(6),heli_ar5);
-
-      // make sure curves are redrawn
-      updateHeliTab();
-      updateCurvesTab();
-      resizeEvent();
-    }
-
-    //Heli Setup  gyro gain control
-    if(idx==j++)  {
-      clearMixes();  //This time we want a clean slate
-      clearCurves();
-
-      // Set up Mixes
-      // 3 cyclic channels
-      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();
-
-      // rudder
-      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();
-
-      // throttle
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
-
-      // gyro gain
-      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;
-      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;
-
-      // collective
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
-
-      g_model.swashRingData.type = HELI_SWASH_TYPE_120;
-      g_model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
-
-      // set up Curves
-      setCurve(CURVE5(1),heli_ar1);
-      setCurve(CURVE5(2),heli_ar2);
-      setCurve(CURVE5(3),heli_ar3);
-      setCurve(CURVE5(4),heli_ar4);
-      setCurve(CURVE5(5),heli_ar5);
-      setCurve(CURVE5(6),heli_ar5);
-
-      // make sure curves are redrawn
-      updateHeliTab();
-      updateCurvesTab();
-      resizeEvent();
-    }
-
-    // gyro gain control 
-    if(idx==j++)  {
-      int res = QMessageBox::question(this,tr("Clear Mixes?"),tr("Really clear existing mixes on CH6?"),QMessageBox::Yes | QMessageBox::No);
-      if(res!=QMessageBox::Yes) return;
-      // first clear mix on ch6
-      bool found=true;
-      while (found) {
-        found=false;
-        for (int i=0; i< GetEepromInterface()->getCapability(Mixes); i++) {
-          if (g_model.mixData[i].destCh==6) {
-            gm_deleteMix(i);
-            found=true;
-            break;
-          }
-        }
-      }
-      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;
-      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;    
-    }
-
-    //Heli Setup  futaba style
-    if(idx==j++)  {
-      clearMixes();  //This time we want a clean slate
-      clearCurves();
-
-      // Set up Mixes
-      // 3 cyclic channels
-      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();
-
-      // rudder
-      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();
-
-      // throttle
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
-
-      // gyro gain
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);
-
-      // collective
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
-
-      g_model.swashRingData.type = HELI_SWASH_TYPE_120;
-      g_model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
-
-      // set up Curves
-      setCurve(CURVE5(1),heli_ar1);
-      setCurve(CURVE5(2),heli_ar2);
-      setCurve(CURVE5(3),heli_ar3);
-      setCurve(CURVE5(4),heli_ar4);
-      setCurve(CURVE5(5),heli_ar5);
-      setCurve(CURVE5(6),heli_ar5);
-
-      // make sure curves are redrawn
-      updateHeliTab();
-      updateCurvesTab();
-      resizeEvent();
-    }
-
-    // Heli setup futaba style with gyro gain control
-    if(idx==j++)  {
-      clearMixes();  //This time we want a clean slate
-      clearCurves();
-
-      // Set up Mixes
-      // 3 cyclic channels
-      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();
-      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();
-
-      // rudder
-      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();
-
-      // throttle
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
-
-      // gyro gain
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;
-
-      // collective
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
-      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
-
-      g_model.swashRingData.type = HELI_SWASH_TYPE_120;
-      g_model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
-
-      // set up Curves
-      setCurve(CURVE5(1),heli_ar1);
-      setCurve(CURVE5(2),heli_ar2);
-      setCurve(CURVE5(3),heli_ar3);
-      setCurve(CURVE5(4),heli_ar4);
-      setCurve(CURVE5(5),heli_ar5);
-      setCurve(CURVE5(6),heli_ar5);
-
-      // make sure curves are redrawn
-      updateHeliTab();
-      updateCurvesTab();
-      resizeEvent();
-    }
-
-    // gyro gain control  futaba style
-    if(idx==j++)  {
-      int res = QMessageBox::question(this,tr("Clear Mixes?"),tr("Really clear existing mixes on CH5?"),QMessageBox::Yes | QMessageBox::No);
-      if(res!=QMessageBox::Yes) return;
-      // first clear mix on ch6
-      bool found=true;
-      while (found) {
-        found=false;
-        for (int i=0; i< GetEepromInterface()->getCapability(Mixes); i++) {
-          if (g_model.mixData[i].destCh==5) {
-            gm_deleteMix(i);
-            found=true;
-            break;
-          }
-        }
-      }
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;
-      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;    
-    }
-
-    //Servo Test
-    if(idx==j++) {
-      md=setDest(15); md->srcRaw=RawSource(SOURCE_TYPE_CH, 15);   md->weight= 100; md->speedUp = 8; md->speedDown = 8; md->swtch=RawSwitch();
-      md=setDest(16); md->srcRaw=RawSource(SOURCE_TYPE_CUSTOM_SWITCH, 0); md->weight= 110; md->swtch=RawSwitch();
-      md=setDest(16); md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-110; md->swtch=RawSwitch(SWITCH_TYPE_VIRTUAL, 2); md->mltpx=MLTPX_REP;
-      md=setDest(16); md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight= 110; md->swtch=RawSwitch(SWITCH_TYPE_VIRTUAL, 3); md->mltpx=MLTPX_REP;
-      setSwitch(1, CS_FN_LESS, RawSource(SOURCE_TYPE_CH, 14).toValue(), RawSource(SOURCE_TYPE_CH, 15).toValue());
-      setSwitch(2, CS_FN_VPOS, RawSource(SOURCE_TYPE_CH, 14).toValue(), 105);
-      setSwitch(3, CS_FN_VNEG, RawSource(SOURCE_TYPE_CH, 14).toValue(), -105);
-
-      // redraw switches tab
-      updateSwitchesTab();
-    }
-
-    //MultiCopter
-    if(idx==j++) {
-      if (md->destCh)
-        clearMixes();
-      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=50; md->swtch=RawSwitch(); //CH1 AIL
-      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-50; md->swtch=RawSwitch(); //CH2 ELE
-      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(); //CH3 THR
-      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch(); //CH4 RUD
-    }
-}
-
-void ModelEdit::ControlCurveSignal(bool flag)
-{
-    foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("curvePt[0-9]+"))) {
-      sb->blockSignals(flag);
-    }
-}
-
-void ModelEdit::shrink() {
-#if defined __APPLE__
-    QSettings settings("companion9x", "companion9x");
-    QPoint pos = settings.value("mepos", QPoint(0, 0)).toPoint();
-    QSize size = settings.value("mesize", QSize(800, 625)).toSize();
-    move(pos);
-    resize(size);    
-# else
-    const int height = QApplication::desktop()->height();
-    QSettings settings("companion9x", "companion9x");
-    QPoint pos = settings.value("mepos", QPoint(100, 100)).toPoint();
-    QSize size = settings.value("mesize", QSize(800, 625)).toSize();
-    if (size.height() < height) {
-        move(pos);
-        resize(size);    
-    } else {
-      resize(0,0);
-    }
-#endif  
-  ui->curvePreview->repaint();
-}
-
-void ModelEdit::on_cname_LE_editingFinished() {
-    if (GetEepromInterface()->getCapability(HasCvNames)) {
-      int i=0;
-      for (i=0; i<ui->cname_LE->text().toAscii().length(); i++) {
-        g_model.curves[currentCurve].name[i]=ui->cname_LE->text().toAscii().at(i);
-      }
-      g_model.curves[currentCurve].name[i]=0;
-    }
-    updateSettings();
-}
-
-void ModelEdit::on_curvetype_CB_currentIndexChanged(int index) {
-    if (curvesLock)
-      return;
-    int numcurves=GetEepromInterface()->getCapability(NumCurves);
-    if (numcurves==0) {
-      numcurves=16;
-    }
-    int numpoint[]={3,3,5,5,9,9,17,17};
-    bool custom[]={false,true,false,true,false,true,false,true};
-    int currpoints=g_model.curves[currentCurve].count;
-    bool currcustom=g_model.curves[currentCurve].custom;
-    curvesLock=true;
-    int totalpoints=0;
-    for (int i=0; i< numcurves; i++) {
-      if (i!=currentCurve) {
-        totalpoints+=g_model.curves[i].count;
-        if (g_model.curves[i].custom) {
-          totalpoints+=g_model.curves[i].count-2;
-        }
-      }
-    }
-    totalpoints+=numpoint[index];
-    if (currcustom) {
-      totalpoints+=numpoint[index]-2;
-    }
-    int fwpoints=GetEepromInterface()->getCapability(NumCurvePoints);
-    if (fwpoints!=0) {
-      if (fwpoints<totalpoints) {
-        QMessageBox::warning(this, "companion9x", tr("Not enough free points in eeprom to store the curve."));
-        int oldindex=0;
-        if (currpoints==3) {
-          oldindex=0;
-        } else if (currpoints==5) {
-          oldindex=2;
-        } else if (currpoints==9) {
-          oldindex=4;
-        }  else if (currpoints==17) {
-          oldindex=6;
-        }
-        if (currcustom) {
-          index++;
-        }
-        ui->curvetype_CB->setCurrentIndex(oldindex);
-        curvesLock=false;
-        return;
-      }
-    }
-    // let's be sure that for standard curves X values are set correctly.
-    if (!currcustom) {
-      for (int i=0; i< currpoints; i++) {
-        spnx[i]->setMinimum(-100);
-        spnx[i]->setMaximum(100);        
-        spnx[i]->setValue(-100+((200*i)/(currpoints-1)));
-      }    
-    }
-    if (numpoint[index]==currpoints) {
-      for (int i=0; i< currpoints; i++) {
-        spnx[i]->setMinimum(-100);
-        spnx[i]->setMaximum(100);        
-        spnx[i]->setValue(-100+((200*i)/(currpoints-1)));
-      }
-      for (int i=currpoints; i< 17; i++) {
-        spnx[i]->setMinimum(-100);
-        spnx[i]->setMaximum(100);
-        spnx[i]->setValue(0);
-        spny[i]->setValue(0);
-      }
-    } else if (numpoint[index]>currpoints) {
-      for (int i=0; i< 17; i++) {
-        g_model.curves[currentCurve].points[i].x=spnx[i]->value();
-        g_model.curves[currentCurve].points[i].y=spny[i]->value();
-        spnx[i]->setMinimum(-100);
-        spnx[i]->setMaximum(100);
-      }
-      int currintervals=currpoints-1;
-      int diffpoints=numpoint[index]-currpoints;
-      int skip=diffpoints/currintervals;
-      for (int i=0; i< currpoints; i++) {
-        if (custom[index]) {
-          spnx[i+(skip*i)]->setValue(g_model.curves[currentCurve].points[i].x);
-        } else {
-          spnx[i+(skip*i)]->setValue(-100+(200*i)/currintervals);
-        }
-        spny[i+(skip*i)]->setValue(g_model.curves[currentCurve].points[i].y);
-        if (i>0) {
-            int diffx=spnx[i+(skip*i)]->value()-spnx[(i-1)+(skip*(i-1))]->value();
-            int diffy=spny[i+(skip*i)]->value()-spny[(i-1)+(skip*(i-1))]->value();
-            for (int j=1; j<= skip; j++) {
-                spny[(i-1)+skip*(i-1)+j]->setValue(spny[(i-1)+(skip*(i-1))]->value()+((diffy*j)/(skip+1)));
-                spnx[(i-1)+skip*(i-1)+j]->setValue(spnx[(i-1)+(skip*(i-1))]->value()+((diffx*j)/(skip+1)));
-            }
-        }
-      }    
-    } else {
-      int intervals=numpoint[index]-1;
-      int diffpoints=currpoints-numpoint[index];
-      int skip=diffpoints/intervals;
-      for (int i=0; i< numpoint[index]; i++) {
-        spnx[i]->setMinimum(-100);
-        spnx[i]->setMaximum(100);
-        if (custom[index]) {
-          spnx[i]->setValue(spnx[i+skip*i]->value());
-        } else {
-          spnx[i]->setValue(-100+(200*i)/intervals);
-        }
-        spny[i]->setValue(spny[i+skip*i]->value());
-      }
-      for (int i=numpoint[index]; i< 17; i++) {
-        spnx[i]->setValue(0);
-        spny[i]->setValue(0);
-      }
-    }
-    curvesLock=false;
-    for (int i=0; i< 17; i++) {
-      g_model.curves[currentCurve].points[i].x=spnx[i]->value();
-      g_model.curves[currentCurve].points[i].y=spny[i]->value();
-    }
-    g_model.curves[currentCurve].count=numpoint[index];
-    g_model.curves[currentCurve].custom=custom[index];
-    setCurrentCurve(currentCurve);
-    if (redrawCurve)
-      drawCurve();
-    updateSettings();
-}
-
-void ModelEdit::closeEvent(QCloseEvent *event)
-{
-    QSettings settings("companion9x", "companion9x");
-    settings.setValue("mepos", pos());
-    settings.setValue("mesize", size());
-    event->accept();
-}
-
-void ModelEdit::wizard()
-{
-    uint64_t result=0xffffffff;
-    modelConfigDialog *mcw = new modelConfigDialog(radioData, &result, this);
-    mcw->exec();
-    if (result!=0xffffffff) {
-      applyNumericTemplate(result);
-      updateSettings();
-      tabMixes();
-    } else if (this->isNew) {
-      memset(&g_model, 0, sizeof(ModelData));
-      accept();
-    }
-}
diff --git a/companion/src/modeledit.h b/companion/src/modeledit.h
deleted file mode 100644
index f6a2785c3..000000000
--- a/companion/src/modeledit.h
+++ /dev/null
@@ -1,393 +0,0 @@
-#ifndef MODELEDIT_H
-#define MODELEDIT_H
-
-#include <QDialog>
-#include <QtGui>
-#include <QPen>
-#include "eeprominterface.h"
-#include "mixerslist.h"
-#ifdef PHONON
-#include <phonon/audiooutput.h>
-#include <phonon/mediaobject.h>
-#include <phonon/mediasource.h>
-#endif
-namespace Ui {
-    class ModelEdit;
-}
-
-class ModelEdit : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit ModelEdit(RadioData &radioData, uint8_t id , bool openWizard =false, bool inNew =false, QWidget *parent = 0);
-    ~ModelEdit();
-
-    void applyBaseTemplate();
-    bool redrawCurve;
-    void drawCurve();
-    bool drawing;
-    bool mixInserted;
-    bool expoInserted;
-    bool openWizard;
-    bool isNew;
-private:
-    Ui::ModelEdit *ui;
-
-    QSpinBox* spny[17];
-    QSpinBox* spnx[17];
-    QSpinBox* gvarsSB[9][5];
-    QSpinBox* reSB[9][2];
-    QGroupBox* barsGB[3];
-    QGroupBox* numsGB[3];
-    QComboBox* barsCB[12];
-    QDoubleSpinBox* minSB[12];
-    QDoubleSpinBox* maxSB[12];
-    QComboBox* csf[36];
-    QComboBox* csw[C9X_NUM_CSW];
-    MixersList *ExposlistWidget;
-
-    MixersList *MixerlistWidget;
-
-    RadioData &radioData;
-    int       id_model;
-    ModelData g_model;
-    GeneralSettings g_eeGeneral;
-    bool protocolEditLock;
-    bool protocol2EditLock;
-    bool trainerEditLock;
-    bool switchEditLock;
-    bool heliEditLock;
-    bool limitEditLock;
-    bool phasesLock;
-    bool telemetryLock;
-    bool curvesLock;
-    bool phononLock;
-    bool fsLock;
-    bool modelImageLock;
-    bool plot_curve[16];
-    int selectedSwitch;
-    int selectedFunction;
-    QDoubleSpinBox  * cswitchValue[C9X_NUM_CSW];
-    QDoubleSpinBox  * cswitchOffset[C9X_NUM_CSW];
-    QComboBox * cswitchAnd[C9X_NUM_CSW];
-    QDoubleSpinBox  * cswitchDuration[C9X_NUM_CSW];
-    QDoubleSpinBox  * cswitchDelay[C9X_NUM_CSW];
-    QComboBox * cswitchSource1[C9X_NUM_CSW];
-    QComboBox * cswitchSource2[C9X_NUM_CSW];
-    QLabel * fswLabel[C9X_MAX_CUSTOM_FUNCTIONS];
-    QComboBox * fswtchSwtch[C9X_MAX_CUSTOM_FUNCTIONS];
-    QComboBox * fswtchFunc[C9X_MAX_CUSTOM_FUNCTIONS];
-    QCheckBox * fswtchParamGV[C9X_MAX_CUSTOM_FUNCTIONS];
-    QDoubleSpinBox * fswtchParam[C9X_MAX_CUSTOM_FUNCTIONS];
-    QPushButton * playBT[C9X_MAX_CUSTOM_FUNCTIONS];
-    QComboBox * fswtchParamT[C9X_MAX_CUSTOM_FUNCTIONS];
-    QComboBox * fswtchParamArmT[C9X_MAX_CUSTOM_FUNCTIONS];
-    QCheckBox * fswtchEnable[C9X_MAX_CUSTOM_FUNCTIONS];
-    QComboBox * fswtchRepeat[C9X_MAX_CUSTOM_FUNCTIONS];
-    QComboBox * fswtchGVmode[C9X_MAX_CUSTOM_FUNCTIONS];
-    
-    QSpinBox  * safetySwitchValue[C9X_NUM_CHNOUT];
-    QComboBox * safetySwitchSwtch[C9X_NUM_CHNOUT];
-    QSlider * phasesTrimSliders[9][4];
-    QSpinBox * phasesTrimValues[9][4];
-
-    void setupExposListWidget();
-    void setupMixerListWidget();
-    float getBarStep(int barId);
-    void telBarUpdate();
-    
-    void updateSettings();
-    void tabModelEditSetup();
-    void tabPhases();
-    void tabExpos();
-    void tabMixes();
-    void tabHeli();
-    void tabLimits();
-    void tabCurves();
-    void tabCustomSwitches();
-    void tabSafetySwitches();
-    void tabCustomFunctions();
-    void tabTelemetry();
-    void tabTemplates();
-    void updateCurvesTab();
-    void setSwitchWidgetVisibility(int i);
-    void setLimitMinMax();
-    void updateSelectedSwitch();
-    void updateSwitchesTab();
-    void updateHeliTab();
-    void updateA1Fields();
-    void updateA2Fields();
-
-    void launchSimulation();
-    void resizeEvent(QResizeEvent *event  = 0);
-
-
-    int currentCurve;
-    void setCurrentCurve(int curveId);
-
-    QSpinBox *getNodeSB(int i);
-    QSpinBox *getNodeSBX(int i);
-
-    int getExpoIndex(unsigned int dch);
-    bool gm_insertExpo(int idx);
-    void gm_deleteExpo(int index);
-    void gm_openExpo(int index);
-    int gm_moveExpo(int idx, bool dir);
-    void exposDeleteList(QList<int> list);
-    QList<int> createExpoListFromSelected();
-    void setSelectedByExpoList(QList<int> list);
-
-    int getMixerIndex(unsigned int dch);
-    bool gm_insertMix(int idx);
-    void gm_deleteMix(int index);
-    void gm_openMix(int index);
-    int gm_moveMix(int idx, bool dir);
-    void mixersDeleteList(QList<int> list);
-    QList<int> createMixListFromSelected();
-    void setSelectedByMixList(QList<int> list);
-
-    void applyTemplate(uint8_t idx);
-    void applyNumericTemplate(uint64_t tpl);
-    MixData* setDest(uint8_t dch);
-    void setCurve(uint8_t c, int8_t ar[]);
-    void setSwitch(unsigned int idx, unsigned int func, int v1, int v2);
-    void on_phaseSwitch_currentIndexChanged(unsigned int phase, int index);
-    void on_phaseFadeIn_valueChanged(unsigned int phase, int value);
-    void on_phaseFadeOut_valueChanged(unsigned int phase, int value);
-    void on_phaseTrim_valueChanged(unsigned int phase, unsigned int stick, int value);
-    void on_phaseTrimUse_currentIndexChanged(unsigned int phase, unsigned int stick, int index, QSpinBox *trim, QSlider *slider);
-    void displayOnePhaseOneTrim(unsigned int phase_idx, unsigned int trim_idx, QComboBox *trimUse, QSpinBox *trimVal, QSlider *trimSlider);
-    void displayOnePhase(unsigned int phase_idx, QLineEdit *name, QComboBox *sw, QDoubleSpinBox *fadeIn, QDoubleSpinBox *fadeOut, QComboBox *trim1Use, QSpinBox *trim1, QLabel *trim1Label, QSlider *trim1Slider, QComboBox *trim2Use, QSpinBox *trim2, QLabel *trim2Label, QSlider *trim2Slider, QComboBox *trim3Use, QSpinBox *trim3, QLabel *trim3Label, QSlider *trim3Slider, QComboBox *trim4Use, QSpinBox *trim4, QLabel *trim4Label, QSlider *trim4Slider, QLabel *gv1Label, QComboBox *gv1Use,QSpinBox *gv1Value, QLabel *gv2Label, QComboBox *gv2Use,QSpinBox *gv2Value, QLabel *gv3Label, QComboBox *gv3Use,QSpinBox *gv3Value, QLabel *gv4Label, QComboBox *gv4Use,QSpinBox *gv4Value, QLabel *gv5Label, QComboBox *gv5Use,QSpinBox *gv5Value, QLabel *re1Label, QComboBox *re1Use,QSpinBox *re1Value, QLabel *re2Label, QComboBox *re2Use,QSpinBox *re2Value,bool doConnect);
-    
-    void incSubtrim(uint8_t idx, int16_t inc);
-#ifdef PHONON
-    Phonon::MediaObject *clickObject;
-    Phonon::AudioOutput *clickOutput;
-#endif
-
-signals:
-    void modelValuesChanged();
-
-private slots:
-    void clearExpos(bool ask=true);
-    void clearMixes(bool ask=true);
-    void clearCurves(bool ask=true);
-    void on_modelVoice_SB_editingFinished();
-    void on_T2ThrTrgChkB_toggled(bool checked);
-    void on_ttraceCB_currentIndexChanged(int index);
-    void on_instantTrim_CB_currentIndexChanged(int index);
-    void on_extendedLimitsChkB_toggled(bool checked);
-    void on_extendedTrimsChkB_toggled(bool checked);
-    void on_thrwarnChkB_toggled(bool checked);
-    void on_thrrevChkB_toggled(bool checked);
-    void on_timer1Perm_toggled(bool checked);
-    void on_timer2Perm_toggled(bool checked);
-    void on_timer1Minute_toggled(bool checked);
-    void on_timer2Minute_toggled(bool checked);
-    void on_timer1CountDownBeep_toggled(bool checked);
-    void on_timer2CountDownBeep_toggled(bool checked);
-    void fssldEdited();
-    void fssbEdited();
-    void fssldValueChanged();
-    void fssbValueChanged();
-    void resetCurve();
-    void editCurve();
-    void playMusic();
-#ifdef PHONON
-    void mediaPlayer_state(Phonon::State newState, Phonon::State oldState);
-#endif
-    
-    void plotCurve(bool checked);
-//phases slots
-    void phaseName_editingFinished();
-    void phaseSwitch_currentIndexChanged();
-    void phaseFadeIn_editingFinished();
-    void phaseFadeOut_editingFinished();
-    void phaseTrimUse_currentIndexChanged();
-    void phaseTrim_valueChanged();
-    void phaseTrimSlider_valueChanged();
-    void GVName_editingFinished();
-    void GVSource_currentIndexChanged();
-    void phaseGVValue_editingFinished();
-    void phaseGVUse_currentIndexChanged();
-    void phaseREValue_editingFinished();
-    void phaseREUse_currentIndexChanged();
-    
-    void mimeMixerDropped(int index, const QMimeData *data, Qt::DropAction action);
-    void pasteMixerMimeData(const QMimeData * mimeData, int destIdx);
-
-    void mimeExpoDropped(int index, const QMimeData *data, Qt::DropAction action);
-    void pasteExpoMimeData(const QMimeData * mimeData, int destIdx);
-
-    void on_pushButton_clicked();
-
-    void exposDelete(bool ask=true);
-    void exposCut();
-    void exposCopy();
-    void exposPaste();
-    void exposDuplicate();
-    void expoOpen(QListWidgetItem *item = NULL);
-    void expoAdd();
-    
-    void cswDelete();
-    void cswCopy();
-    void cswPaste();
-    void cswCut();
-
-    void fswDelete();
-    void fswCopy();
-    void fswPaste();
-    void fswCut();
-    
-    void moveExpoUp();
-    void moveExpoDown();
-
-    void mixersDelete(bool ask=true);
-    void mixersCut();
-    void mixersCopy();
-    void mixersPaste();
-    void mixersDuplicate();
-    void mixerOpen();
-    void mixerAdd();
-    void moveMixUp();
-    void moveMixDown();
-
-    void expolistWidget_customContextMenuRequested(QPoint pos);
-    void expolistWidget_doubleClicked(QModelIndex index);
-    void expolistWidget_KeyPress(QKeyEvent *event);
-
-
-    void mixerlistWidget_customContextMenuRequested(QPoint pos);
-    void mixerlistWidget_doubleClicked(QModelIndex index);
-    void mixerlistWidget_KeyPress(QKeyEvent *event);
-
-    void csw_customContextMenuRequested(QPoint pos);
-    void fsw_customContextMenuRequested(QPoint pos);
-    
-    
-    void curvePointEdited();
-    void on_ca_ctype_CB_currentIndexChanged();
-    void on_ca_apply_PB_clicked();
-    
-    void on_cname_LE_editingFinished();
-    void limitOffsetEdited();
-    void limitSymEdited();
-    void limitEdited();
-    void limitNameEdited();
-    void limitInvEdited();
-    void ppmcenterEdited();
-    void customSwitchesEdited();
-    void safetySwitchesEdited();
-    void customFunctionEdited();
-    void refreshCustomFunction(int index, bool modified=false);
-    void startupSwitchEdited();
-    void exposEdited();
-    void mixesEdited();
-    void heliEdited();
-
-    void on_bcRUDChkB_toggled(bool checked);
-    void on_bcELEChkB_toggled(bool checked);
-    void on_bcTHRChkB_toggled(bool checked);
-    void on_bcAILChkB_toggled(bool checked);
-    void on_bcP1ChkB_toggled(bool checked);
-    void on_bcP2ChkB_toggled(bool checked);
-    void on_bcP3ChkB_toggled(bool checked);
-    void on_bcP4ChkB_toggled(bool checked);
-    void on_bcREaChkB_toggled(bool checked);
-    void on_bcREbChkB_toggled(bool checked);
-
-    void on_thrExpoChkB_toggled(bool checked);
-    void on_thrTrimChkB_toggled(bool checked);
-    void on_a1UnitCB_currentIndexChanged(int index);
-    void on_a2UnitCB_currentIndexChanged(int index);
-    void on_a1RatioSB_editingFinished();
-    void on_a1RatioSB_valueChanged();
-    void on_a1CalibSB_editingFinished();
-    void on_a11LevelCB_currentIndexChanged(int index);
-    void on_a11GreaterCB_currentIndexChanged(int index);
-    void on_a11ValueSB_editingFinished();
-    void on_a12LevelCB_currentIndexChanged(int index);
-    void on_a12GreaterCB_currentIndexChanged(int index);
-    void on_a12ValueSB_editingFinished();
-    void on_a2RatioSB_editingFinished();
-    void on_a2RatioSB_valueChanged();
-    void on_a2CalibSB_editingFinished();
-    void on_a21LevelCB_currentIndexChanged(int index);
-    void on_a21GreaterCB_currentIndexChanged(int index);
-    void on_a21ValueSB_editingFinished();
-    void on_a22LevelCB_currentIndexChanged(int index);
-    void on_a22GreaterCB_currentIndexChanged(int index);
-    void on_a22ValueSB_editingFinished();
-    void on_frskyProtoCB_currentIndexChanged(int index);
-    void on_frskyUnitsCB_currentIndexChanged(int index);
-    void on_frskyBladesCB_currentIndexChanged(int index);
-    void on_frskyCurrentCB_currentIndexChanged(int index);
-    void on_frskyVoltCB_currentIndexChanged(int index);
-    void on_AltitudeToolbar_ChkB_toggled(bool checked);
-    void on_rssiAlarm1CB_currentIndexChanged(int index);
-    void on_rssiAlarm2CB_currentIndexChanged(int index);
-    void on_rssiAlarm1SB_editingFinished();
-    void on_rssiAlarm2SB_editingFinished();
-    void on_AltitudeGPS_ChkB_toggled(bool checked);
-    void on_showNames_Ckb_toggled(bool checked);
-    void on_varioSourceCB_currentIndexChanged(int index);
-    void on_varioLimitMin_DSB_editingFinished();
-    void on_varioLimitMax_DSB_editingFinished();
-    void on_varioLimitCenterMin_DSB_editingFinished();
-    void on_varioLimitMinOff_ChkB_toggled(bool checked);
-    void on_varioLimitCenterMax_DSB_editingFinished();
-    void telBarCBcurrentIndexChanged(int index);
-    void ScreenTypeCBcurrentIndexChanged(int index);
-    void telMaxSBeditingFinished();
-    void telMinSBeditingFinished();
-    void customFieldEdited();
-    void on_ppmDelaySB_editingFinished();
-    void on_ppmDelaySB_2_editingFinished();
-    void on_ppmDelaySB_3_editingFinished();
-    void on_numChannelsSB_editingFinished();
-    void on_numChannelsSB_2_editingFinished();
-    void on_numChannelsSB_3_editingFinished();
-    void on_numChannelsStart_editingFinished();
-    void on_numChannelsStart_2_editingFinished();
-    void on_numChannelsStart_3_editingFinished();
-//    void void ModelEdit::on_numChannelsStart_3_editingFinished();
-    void on_protocolCB_currentIndexChanged(int index);
-    void on_protocolCB_2_currentIndexChanged(int index);
-    void on_protocolCB_3_currentIndexChanged(int index);
-    void on_pulsePolCB_currentIndexChanged(int index);
-    void on_pulsePolCB_2_currentIndexChanged(int index);
-    void on_pulsePolCB_3_currentIndexChanged(int index);
-    void on_ppmFrameLengthDSB_editingFinished();
-    void on_ppmFrameLengthDSB_2_editingFinished();
-    void on_ppmFrameLengthDSB_3_editingFinished();
-    void on_DSM_Type_currentIndexChanged(int index);
-    void on_DSM_Type_2_currentIndexChanged(int index);
-    void on_pxxRxNum_editingFinished();
-    void on_pxxRxNum_2_editingFinished();
-    void on_fsm1CB_currentIndexChanged(int index);
-    void on_fsm2CB_currentIndexChanged(int index);
-    
-    // TODO void on_trimSWCB_currentIndexChanged(int index);
-    void on_trimIncCB_currentIndexChanged(int index);
-    void on_timer1DirCB_currentIndexChanged(int index);
-    void on_timer1ModeCB_currentIndexChanged(int index);
-    void on_timer1ValTE_editingFinished();
-    void on_timer1ModeBCB_currentIndexChanged(int index);
-    void on_timer2DirCB_currentIndexChanged(int index);
-    void on_timer2ModeCB_currentIndexChanged(int index);
-    void on_timer2ValTE_editingFinished();
-    void on_timer2ModeBCB_currentIndexChanged(int index);
-    void on_modelNameLE_editingFinished();
-    void on_modelImage_CB_currentIndexChanged(int index);
-    void on_phases_currentChanged(int index);
-    void on_tabWidget_currentChanged(int index);
-    void on_templateList_doubleClicked(QModelIndex index);
-    void ControlCurveSignal(bool flag);
-    void shrink();
-    void wizard();
-    void closeEvent(QCloseEvent *event);
-    void on_curvetype_CB_currentIndexChanged(int index);
-};
-
-#endif // MODELEDIT_H
diff --git a/companion/src/modeledit.ui b/companion/src/modeledit.ui
deleted file mode 100644
index e4f3119f1..000000000
--- a/companion/src/modeledit.ui
+++ /dev/null
@@ -1,24504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ModelEdit</class>
- <widget class="QDialog" name="ModelEdit">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1130</width>
-    <height>698</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
-    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>true</bool>
-  </property>
-  <layout class="QGridLayout" name="gridLayout" columnstretch="0,0">
-   <item row="6" column="1">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Simulate</string>
-     </property>
-     <property name="icon">
-      <iconset resource="companion9x.qrc">
-       <normaloff>:/images/simulate.png</normaloff>:/images/simulate.png</iconset>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="tabPosition">
-      <enum>QTabWidget::North</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tabModelSetup">
-      <attribute name="title">
-       <string>Setup</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_11" rowstretch="0,0,0" columnstretch="0">
-       <item row="2" column="0">
-        <widget class="QTabWidget" name="ModelSetupTab">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="currentIndex">
-          <number>0</number>
-         </property>
-         <property name="usesScrollButtons">
-          <bool>true</bool>
-         </property>
-         <property name="documentMode">
-          <bool>false</bool>
-         </property>
-         <widget class="QWidget" name="ModelSetup">
-          <attribute name="title">
-           <string>ModelSetup</string>
-          </attribute>
-          <layout class="QGridLayout" name="gridLayout_34" columnstretch="0,0,0,0,0,0,0,0,0,0">
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_timer2">
-             <property name="text">
-              <string>Timer2</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="2">
-            <widget class="QLabel" name="thrwarnLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>Disable Throttle Warning</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="1">
-            <widget class="QComboBox" name="ttraceCB">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="9" column="0">
-            <widget class="QLabel" name="label_55">
-             <property name="text">
-              <string>Extended Limits</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="2">
-            <widget class="QLabel" name="label_7">
-             <property name="text">
-              <string>Throttle Trim</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="0">
-            <widget class="QLabel" name="label_ttrace">
-             <property name="text">
-              <string>Throttle Source</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="15" column="1" colspan="9">
-            <widget class="Line" name="swwarn1_line">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-            </widget>
-           </item>
-           <item row="16" column="0">
-            <widget class="QLabel" name="label_12">
-             <property name="text">
-              <string>Center beep</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="8" rowspan="6" colspan="2">
-            <spacer name="horizontalSpacer_9">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="4" column="0">
-            <widget class="QLabel" name="label_10">
-             <property name="text">
-              <string>Trim Increment</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="1">
-            <widget class="QComboBox" name="trimIncCB">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <item>
-              <property name="text">
-               <string>Exponential</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Extra Fine</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Fine</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Medium</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Coarse</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-           <item row="12" column="1" colspan="9">
-            <widget class="Line" name="swwarn0_line">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-            </widget>
-           </item>
-           <item row="13" column="0" rowspan="2">
-            <widget class="QLabel" name="swwarn_label">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>Switch startup  Warning</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="13" column="1" colspan="9">
-            <layout class="QGridLayout" name="StockSwitchStartup">
-             <property name="verticalSpacing">
-              <number>6</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <item row="0" column="9" rowspan="2">
-              <widget class="Line" name="swwarn_line4">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1" rowspan="2">
-              <widget class="Line" name="swwarn_line0">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="7" rowspan="2">
-              <widget class="Line" name="swwarn_line3">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="8">
-              <widget class="QLabel" name="swwarn4_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>3POS</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="swwarn0_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Check</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="2">
-              <widget class="QCheckBox" name="swwarn1_ChkB">
-               <property name="layoutDirection">
-                <enum>Qt::LeftToRight</enum>
-               </property>
-               <property name="text">
-                <string>THR</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QComboBox" name="swwarn0_CB">
-               <item>
-                <property name="text">
-                 <string>ON</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>OFF</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item row="1" column="4">
-              <widget class="QCheckBox" name="swwarn2_ChkB">
-               <property name="layoutDirection">
-                <enum>Qt::LeftToRight</enum>
-               </property>
-               <property name="text">
-                <string>RUD</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="6">
-              <widget class="QCheckBox" name="swwarn3_ChkB">
-               <property name="layoutDirection">
-                <enum>Qt::LeftToRight</enum>
-               </property>
-               <property name="text">
-                <string>ELE</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="10">
-              <widget class="QCheckBox" name="swwarn5_ChkB">
-               <property name="layoutDirection">
-                <enum>Qt::LeftToRight</enum>
-               </property>
-               <property name="text">
-                <string>AIL</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="12">
-              <widget class="QCheckBox" name="swwarn6_ChkB">
-               <property name="layoutDirection">
-                <enum>Qt::LeftToRight</enum>
-               </property>
-               <property name="text">
-                <string>GEA</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="8">
-              <widget class="QComboBox" name="swwarn4_CB">
-               <property name="frame">
-                <bool>true</bool>
-               </property>
-               <item>
-                <property name="text">
-                 <string>ID0</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>ID1</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>ID2</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item row="0" column="11" rowspan="2">
-              <widget class="Line" name="swwarn_line5">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="3" rowspan="2">
-              <widget class="Line" name="swwarn_line1">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="5" rowspan="2">
-              <widget class="Line" name="swwarn_line2">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="14" column="1" colspan="9">
-            <layout class="QGridLayout" name="TaranisSwitchStartup" rowstretch="0,0" columnstretch="0,0,0,0,0,0,0,0,0">
-             <property name="sizeConstraint">
-              <enum>QLayout::SetMinimumSize</enum>
-             </property>
-             <property name="verticalSpacing">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <item row="1" column="0">
-              <widget class="QComboBox" name="tswwarn0_CB">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <item>
-                <property name="text">
-                 <string>ON</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>OFF</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QLabel" name="tswwarn2_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>SB</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="4">
-              <widget class="QLabel" name="tswwarn4_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>SD</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QLabel" name="tswwarn1_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>SA</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="tswwarn0_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Check</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="2">
-              <widget class="QSlider" name="chkSB">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="minimum">
-                <number>0</number>
-               </property>
-               <property name="maximum">
-                <number>2</number>
-               </property>
-               <property name="pageStep">
-                <number>1</number>
-               </property>
-               <property name="value">
-                <number>0</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="invertedAppearance">
-                <bool>true</bool>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksBothSides</enum>
-               </property>
-               <property name="tickInterval">
-                <number>1</number>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="3">
-              <widget class="QSlider" name="chkSC">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="minimum">
-                <number>0</number>
-               </property>
-               <property name="maximum">
-                <number>2</number>
-               </property>
-               <property name="pageStep">
-                <number>1</number>
-               </property>
-               <property name="value">
-                <number>0</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="invertedAppearance">
-                <bool>true</bool>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksBothSides</enum>
-               </property>
-               <property name="tickInterval">
-                <number>1</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="3">
-              <widget class="QLabel" name="tswwarn3_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>SC</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="4">
-              <widget class="QSlider" name="chkSD">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="minimum">
-                <number>0</number>
-               </property>
-               <property name="maximum">
-                <number>2</number>
-               </property>
-               <property name="pageStep">
-                <number>1</number>
-               </property>
-               <property name="value">
-                <number>0</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="invertedAppearance">
-                <bool>true</bool>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksBothSides</enum>
-               </property>
-               <property name="tickInterval">
-                <number>1</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="7">
-              <widget class="QLabel" name="tswwarn7_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>SG</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="5">
-              <widget class="QLabel" name="tswwarn5_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>SE</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="5">
-              <widget class="QSlider" name="chkSE">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="minimum">
-                <number>0</number>
-               </property>
-               <property name="maximum">
-                <number>2</number>
-               </property>
-               <property name="pageStep">
-                <number>1</number>
-               </property>
-               <property name="value">
-                <number>0</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="invertedAppearance">
-                <bool>true</bool>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksBothSides</enum>
-               </property>
-               <property name="tickInterval">
-                <number>1</number>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="7">
-              <widget class="QSlider" name="chkSG">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="minimum">
-                <number>0</number>
-               </property>
-               <property name="maximum">
-                <number>2</number>
-               </property>
-               <property name="pageStep">
-                <number>1</number>
-               </property>
-               <property name="value">
-                <number>0</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="invertedAppearance">
-                <bool>true</bool>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksBothSides</enum>
-               </property>
-               <property name="tickInterval">
-                <number>1</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="6">
-              <widget class="QLabel" name="tswwarn6_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>SF</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QSlider" name="chkSA">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="minimum">
-                <number>0</number>
-               </property>
-               <property name="maximum">
-                <number>2</number>
-               </property>
-               <property name="pageStep">
-                <number>1</number>
-               </property>
-               <property name="value">
-                <number>0</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="invertedAppearance">
-                <bool>true</bool>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksBothSides</enum>
-               </property>
-               <property name="tickInterval">
-                <number>1</number>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="8">
-              <spacer name="horizontalSpacer_6">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item row="1" column="6">
-              <widget class="QSlider" name="chkSF">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>50</height>
-                </size>
-               </property>
-               <property name="minimum">
-                <number>0</number>
-               </property>
-               <property name="maximum">
-                <number>1</number>
-               </property>
-               <property name="singleStep">
-                <number>1</number>
-               </property>
-               <property name="pageStep">
-                <number>1</number>
-               </property>
-               <property name="value">
-                <number>0</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="invertedAppearance">
-                <bool>true</bool>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksBothSides</enum>
-               </property>
-               <property name="tickInterval">
-                <number>1</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="16" column="1" colspan="9">
-            <layout class="QGridLayout" name="gridLayout_2">
-             <item row="0" column="8">
-              <widget class="QCheckBox" name="bcREaChkB">
-               <property name="text">
-                <string>REa</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QCheckBox" name="bcRUDChkB">
-               <property name="text">
-                <string>RUD</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QCheckBox" name="bcELEChkB">
-               <property name="text">
-                <string>ELE</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QCheckBox" name="bcTHRChkB">
-               <property name="text">
-                <string>THR</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="3">
-              <widget class="QCheckBox" name="bcAILChkB">
-               <property name="text">
-                <string>AIL</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="4">
-              <widget class="QCheckBox" name="bcP1ChkB">
-               <property name="text">
-                <string>P1</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="5">
-              <widget class="QCheckBox" name="bcP2ChkB">
-               <property name="text">
-                <string>P2</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="6">
-              <widget class="QCheckBox" name="bcP3ChkB">
-               <property name="text">
-                <string>P3</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="9">
-              <widget class="QCheckBox" name="bcREbChkB">
-               <property name="text">
-                <string>REb</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="7">
-              <widget class="QCheckBox" name="bcP4ChkB">
-               <property name="text">
-                <string>RS</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="4" column="3">
-            <widget class="QCheckBox" name="thrTrimChkB">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="4">
-            <widget class="QLabel" name="T2ThrTrg">
-             <property name="text">
-              <string>Throttle2Trig</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="5">
-            <widget class="QCheckBox" name="T2ThrTrgChkB">
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>16777215</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="7">
-            <widget class="QCheckBox" name="thrExpoChkB">
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="9" column="4">
-            <widget class="QLabel" name="instantTrim_label">
-             <property name="text">
-              <string>Instant Trim</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="9" column="5">
-            <widget class="QComboBox" name="instantTrim_CB">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="9" column="1">
-            <widget class="QCheckBox" name="extendedLimitsChkB">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="9" column="2">
-            <widget class="QLabel" name="extendedTrims_label">
-             <property name="text">
-              <string>Extended Trims</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="9" column="3">
-            <widget class="QCheckBox" name="extendedTrimsChkB">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="3">
-            <widget class="QCheckBox" name="thrwarnChkB">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="4">
-            <widget class="QLabel" name="label_thrrev">
-             <property name="text">
-              <string>Reverse Throttle Operation</string>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="5">
-            <widget class="QCheckBox" name="thrrevChkB">
-             <property name="whatsThis">
-              <string>Reverse throttle operation.
-If this is checked the throttle will be reversed.  Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
-
-</string>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="21" column="0">
-            <spacer name="verticalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::MinimumExpanding</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>0</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="20" column="0" colspan="10">
-            <widget class="QGroupBox" name="rf3_GB">
-             <property name="title">
-              <string/>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_73" columnstretch="0,0,0,0,0,0,0,0,0,1">
-              <item row="1" column="1">
-               <widget class="QComboBox" name="protocolCB_3">
-                <item>
-                 <property name="text">
-                  <string>Master</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Slave</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="2" column="3">
-               <widget class="QSpinBox" name="ppmDelaySB_3">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="suffix">
-                 <string> usec</string>
-                </property>
-                <property name="minimum">
-                 <number>100</number>
-                </property>
-                <property name="maximum">
-                 <number>800</number>
-                </property>
-                <property name="singleStep">
-                 <number>50</number>
-                </property>
-                <property name="value">
-                 <number>300</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="9">
-               <spacer name="horizontalSpacer_25">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item row="2" column="2">
-               <widget class="QLabel" name="label_PPM_3">
-                <property name="text">
-                 <string>PPM delay</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="label_pulsePol_3">
-                <property name="text">
-                 <string>Pulse Shift (polarity)</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="protocol_label_6">
-                <property name="text">
-                 <string>Trainer Mode</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="8">
-               <widget class="QDoubleSpinBox" name="ppmFrameLengthDSB_3">
-                <property name="suffix">
-                 <string> mSec</string>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>12.500000000000000</double>
-                </property>
-                <property name="maximum">
-                 <double>32.500000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.500000000000000</double>
-                </property>
-                <property name="value">
-                 <double>22.500000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QComboBox" name="pulsePolCB_3">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>Negative</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Positive</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="1" column="7">
-               <widget class="QLabel" name="label_ppmFrameLength_3">
-                <property name="text">
-                 <string>PPM Frame Length</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QLabel" name="label_8">
-                <property name="styleSheet">
-                 <string notr="true">font-weight:bold;</string>
-                </property>
-                <property name="text">
-                 <string>Master/Trainer Port</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="6">
-               <widget class="QSpinBox" name="numChannelsSB_3">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="suffix">
-                 <string>ch</string>
-                </property>
-                <property name="minimum">
-                 <number>1</number>
-                </property>
-                <property name="maximum">
-                 <number>16</number>
-                </property>
-                <property name="singleStep">
-                 <number>2</number>
-                </property>
-                <property name="value">
-                 <number>8</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="3">
-               <widget class="QSpinBox" name="numChannelsStart_3">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="suffix">
-                 <string>ch</string>
-                </property>
-                <property name="minimum">
-                 <number>1</number>
-                </property>
-                <property name="maximum">
-                 <number>32</number>
-                </property>
-                <property name="singleStep">
-                 <number>1</number>
-                </property>
-                <property name="value">
-                 <number>8</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="5">
-               <widget class="QLabel" name="label_PPMCH_3">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string>Channels</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QLabel" name="label_numChannelsStart_3">
-                <property name="text">
-                 <string>Start</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="17" column="0" colspan="10">
-            <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0">
-             <item>
-              <widget class="QGroupBox" name="rf1_GB">
-               <property name="title">
-                <string/>
-               </property>
-               <layout class="QGridLayout" name="gridLayout_69" columnstretch="0,0,0,0,0,0,0,1">
-                <item row="2" column="4">
-                 <widget class="QLabel" name="label_PPM">
-                  <property name="text">
-                   <string>PPM delay</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="2">
-                 <widget class="QLabel" name="label_pulsePol">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Polarity</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="3">
-                 <widget class="QComboBox" name="pulsePolCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>Negative</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Positive</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="2" column="5">
-                 <widget class="QSpinBox" name="ppmDelaySB">
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                  <property name="suffix">
-                   <string> usec</string>
-                  </property>
-                  <property name="minimum">
-                   <number>100</number>
-                  </property>
-                  <property name="maximum">
-                   <number>800</number>
-                  </property>
-                  <property name="singleStep">
-                   <number>50</number>
-                  </property>
-                  <property name="value">
-                   <number>300</number>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QLabel" name="label_ppmFrameLength">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>PPM Frame Length</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="1">
-                 <widget class="QDoubleSpinBox" name="ppmFrameLengthDSB">
-                  <property name="suffix">
-                   <string> mSec</string>
-                  </property>
-                  <property name="decimals">
-                   <number>1</number>
-                  </property>
-                  <property name="minimum">
-                   <double>12.500000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>32.500000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.500000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>22.500000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="4" column="1">
-                 <widget class="QSpinBox" name="pxxRxNum">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="suffix">
-                   <string/>
-                  </property>
-                  <property name="minimum">
-                   <number>1</number>
-                  </property>
-                  <property name="maximum">
-                   <number>125</number>
-                  </property>
-                  <property name="singleStep">
-                   <number>1</number>
-                  </property>
-                  <property name="value">
-                   <number>1</number>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="6" rowspan="4">
-                 <spacer name="horizontalSpacer_3">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>5</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QLabel" name="label_DSM">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>DSM Type</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="1">
-                 <widget class="QComboBox" name="DSM_Type">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>LP4/LP5</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>DSM2only</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>DSM2/DSMX</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="4" column="0">
-                 <widget class="QLabel" name="label_PXX">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>RX Number</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QComboBox" name="protocolCB">
-                  <item>
-                   <property name="text">
-                    <string notr="true">PPM</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string notr="true">Silver A</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string notr="true">Silver B</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string notr="true">Silver C</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string notr="true">Trac 09</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="0" column="0" colspan="8">
-                 <widget class="QLabel" name="label_4">
-                  <property name="styleSheet">
-                   <string notr="true">font-weight: bold;</string>
-                  </property>
-                  <property name="text">
-                   <string>RF Module 1</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="protocol_label">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Protocol</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="5" column="0">
-                 <spacer name="verticalSpacer_20">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                  <property name="sizeType">
-                   <enum>QSizePolicy::MinimumExpanding</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item row="1" column="2" colspan="4">
-                 <layout class="QHBoxLayout" name="horizontalLayout_11">
-                  <item>
-                   <widget class="QLabel" name="label_numChannelsStart">
-                    <property name="text">
-                     <string>Start</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSpinBox" name="numChannelsStart">
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                    <property name="suffix">
-                     <string>ch</string>
-                    </property>
-                    <property name="minimum">
-                     <number>1</number>
-                    </property>
-                    <property name="maximum">
-                     <number>32</number>
-                    </property>
-                    <property name="singleStep">
-                     <number>1</number>
-                    </property>
-                    <property name="value">
-                     <number>1</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="label_PPMCH">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Channels</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSpinBox" name="numChannelsSB">
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                    <property name="suffix">
-                     <string>ch</string>
-                    </property>
-                    <property name="minimum">
-                     <number>1</number>
-                    </property>
-                    <property name="maximum">
-                     <number>16</number>
-                    </property>
-                    <property name="singleStep">
-                     <number>2</number>
-                    </property>
-                    <property name="value">
-                     <number>8</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="rf2_GB">
-               <property name="title">
-                <string/>
-               </property>
-               <layout class="QGridLayout" name="gridLayout_70" columnstretch="0,0,0,0,0,0,0,1">
-                <item row="2" column="4">
-                 <widget class="QLabel" name="label_PPM_2">
-                  <property name="text">
-                   <string>PPM delay</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="5">
-                 <widget class="QSpinBox" name="ppmDelaySB_2">
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                  <property name="suffix">
-                   <string> usec</string>
-                  </property>
-                  <property name="minimum">
-                   <number>100</number>
-                  </property>
-                  <property name="maximum">
-                   <number>800</number>
-                  </property>
-                  <property name="singleStep">
-                   <number>50</number>
-                  </property>
-                  <property name="value">
-                   <number>300</number>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="3">
-                 <widget class="QComboBox" name="pulsePolCB_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>Negative</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Positive</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="2" column="2">
-                 <widget class="QLabel" name="label_pulsePol_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Polarity</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="4" column="0">
-                 <widget class="QLabel" name="label_PXX_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>RX Number</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="4" column="1">
-                 <widget class="QSpinBox" name="pxxRxNum_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="suffix">
-                   <string/>
-                  </property>
-                  <property name="minimum">
-                   <number>1</number>
-                  </property>
-                  <property name="maximum">
-                   <number>125</number>
-                  </property>
-                  <property name="singleStep">
-                   <number>1</number>
-                  </property>
-                  <property name="value">
-                   <number>1</number>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QLabel" name="label_DSM_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>DSM Type</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="1">
-                 <widget class="QComboBox" name="DSM_Type_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>LP4/LP5</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>DSM2only</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>DSM2/DSMX</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="0" column="0" colspan="8">
-                 <widget class="QLabel" name="label_5">
-                  <property name="styleSheet">
-                   <string notr="true">font-weight:bold;</string>
-                  </property>
-                  <property name="text">
-                   <string>RF Module 2</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="5" column="1">
-                 <spacer name="verticalSpacer_19">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                  <property name="sizeType">
-                   <enum>QSizePolicy::MinimumExpanding</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QLabel" name="label_ppmFrameLength_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>PPM Frame Length</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="1">
-                 <widget class="QDoubleSpinBox" name="ppmFrameLengthDSB_2">
-                  <property name="suffix">
-                   <string> mSec</string>
-                  </property>
-                  <property name="decimals">
-                   <number>1</number>
-                  </property>
-                  <property name="minimum">
-                   <double>12.500000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>32.500000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.500000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>22.500000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="6" rowspan="4">
-                 <spacer name="horizontalSpacer_8">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>5</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QComboBox" name="protocolCB_2">
-                  <item>
-                   <property name="text">
-                    <string notr="true">PPM</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string notr="true">Silver A</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string notr="true">Silver B</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string notr="true">Silver C</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string notr="true">Trac 09</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="protocol_label_4">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Protocol</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="2" colspan="4">
-                 <layout class="QHBoxLayout" name="horizontalLayout_10">
-                  <item>
-                   <widget class="QLabel" name="label_numChannelsStart_2">
-                    <property name="text">
-                     <string>Start</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSpinBox" name="numChannelsStart_2">
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                    <property name="suffix">
-                     <string>ch</string>
-                    </property>
-                    <property name="minimum">
-                     <number>1</number>
-                    </property>
-                    <property name="maximum">
-                     <number>32</number>
-                    </property>
-                    <property name="singleStep">
-                     <number>1</number>
-                    </property>
-                    <property name="value">
-                     <number>1</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="label_PPMCH_2">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Channels</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QSpinBox" name="numChannelsSB_2">
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                    <property name="suffix">
-                     <string>ch</string>
-                    </property>
-                    <property name="minimum">
-                     <number>1</number>
-                    </property>
-                    <property name="maximum">
-                     <number>16</number>
-                    </property>
-                    <property name="singleStep">
-                     <number>2</number>
-                    </property>
-                    <property name="value">
-                     <number>8</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="4" column="6">
-            <widget class="QLabel" name="label_thrExpo">
-             <property name="text">
-              <string>Throttle Expo</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="0">
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>Model Name</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_2">
-             <property name="text">
-              <string>Timer1</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1" colspan="9">
-            <layout class="QHBoxLayout" name="timer2_layout" stretch="1,1,1,0,1,0,0,0,0,1">
-             <property name="rightMargin">
-              <number>2</number>
-             </property>
-             <item>
-              <widget class="QTimeEdit" name="timer2ValTE">
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="currentSection">
-                <enum>QDateTimeEdit::MinuteSection</enum>
-               </property>
-               <property name="displayFormat">
-                <string>mm:ss</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="timer2DirCB">
-               <item>
-                <property name="text">
-                 <string>Count Down</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Count Up</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="timer2ModeCB"/>
-             </item>
-             <item>
-              <widget class="QLabel" name="timer2ModeB_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>TriggerB</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="timer2ModeBCB"/>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="timer2Perm">
-               <property name="text">
-                <string>Persistent</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="timer2PermValue">
-               <property name="text">
-                <string> (00:00:00)</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="timer2Minute">
-               <property name="text">
-                <string>MinuteBeep</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="timer2CountDownBeep">
-               <property name="text">
-                <string>CountDownBeep</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_11">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item row="1" column="1" colspan="9">
-            <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,1,0,1,0,0,0,0,1">
-             <property name="rightMargin">
-              <number>2</number>
-             </property>
-             <item>
-              <widget class="QTimeEdit" name="timer1ValTE">
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="currentSection">
-                <enum>QDateTimeEdit::MinuteSection</enum>
-               </property>
-               <property name="displayFormat">
-                <string>mm:ss</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="timer1DirCB">
-               <item>
-                <property name="text">
-                 <string>Count Down</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Count Up</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="timer1ModeCB"/>
-             </item>
-             <item>
-              <widget class="QLabel" name="timer1ModeB_label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>TriggerB</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="timer1ModeBCB"/>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="timer1Perm">
-               <property name="text">
-                <string>Persistent</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="timer1PermValue">
-               <property name="text">
-                <string> (00:00:00)</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="timer1Minute">
-               <property name="text">
-                <string>MinuteBeep</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="timer1CountDownBeep">
-               <property name="text">
-                <string>CountDownBeep</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_10">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item row="0" column="1" colspan="9">
-            <layout class="QGridLayout" name="gridLayout_37" columnstretch="0,0,0,0,0,0,0,0">
-             <item row="0" column="0">
-              <widget class="QLineEdit" name="modelNameLE">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="maxLength">
-                <number>10</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="6">
-              <widget class="QLabel" name="modelVoice_label">
-               <property name="text">
-                <string>Model Voice</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="7">
-              <widget class="QSpinBox" name="modelVoice_SB">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="suffix">
-                <string/>
-               </property>
-               <property name="minimum">
-                <number>260</number>
-               </property>
-               <property name="maximum">
-                <number>511</number>
-               </property>
-               <property name="singleStep">
-                <number>1</number>
-               </property>
-               <property name="value">
-                <number>260</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QLabel" name="modelImage_label">
-               <property name="text">
-                <string>Model Image</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <spacer name="horizontalSpacer_24">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item row="0" column="5">
-              <spacer name="horizontalSpacer_26">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item row="0" column="4">
-              <widget class="QLabel" name="modelImage_image">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>64</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>64</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="frameShape">
-                <enum>QFrame::Panel</enum>
-               </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="scaledContents">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="3">
-              <widget class="QComboBox" name="modelImage_CB"/>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-         <widget class="QWidget" name="Failsafe">
-          <attribute name="title">
-           <string>Failsafe</string>
-          </attribute>
-          <layout class="QGridLayout" name="gridLayout_66">
-           <item row="1" column="0">
-            <widget class="QGroupBox" name="FSGB_2">
-             <property name="title">
-              <string>External module</string>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_68">
-              <item row="3" column="10">
-               <widget class="QSpinBox" name="fsm2SB_11">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="10">
-               <widget class="QSpinBox" name="fsm2SB_9">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="1">
-               <widget class="QSlider" name="fsm2SL_4">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="8">
-               <widget class="QLabel" name="fsm2LB_12">
-                <property name="text">
-                 <string>CH12</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QSlider" name="fsm2SL_1">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="2">
-               <widget class="QSpinBox" name="fsm2SB_3">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="9">
-               <widget class="QSlider" name="fsm2SL_11">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QSlider" name="fsm2SL_2">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="fsm2LB_1">
-                <property name="text">
-                 <string>CH01</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QLabel" name="fsm2LB_4">
-                <property name="text">
-                 <string>CH04</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="10">
-               <widget class="QSpinBox" name="fsm2SB_10">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="9">
-               <widget class="QSlider" name="fsm2SL_12">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="8">
-               <widget class="QLabel" name="fsm2LB_10">
-                <property name="text">
-                 <string>CH10</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="2">
-               <widget class="QSpinBox" name="fsm2SB_4">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="fsm2LB_2">
-                <property name="text">
-                 <string>CH02</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="10">
-               <widget class="QSpinBox" name="fsm2SB_12">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QSpinBox" name="fsm2SB_1">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="9">
-               <widget class="QSlider" name="fsm2SL_10">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="8">
-               <widget class="QLabel" name="fsm2LB_11">
-                <property name="text">
-                 <string>CH11</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QSlider" name="fsm2SL_3">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QLabel" name="fsm2LB_3">
-                <property name="text">
-                 <string>CH03</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="8">
-               <widget class="QLabel" name="fsm2LB_9">
-                <property name="text">
-                 <string>CH09</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="9">
-               <widget class="QSlider" name="fsm2SL_9">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="2">
-               <widget class="QSpinBox" name="fsm2SB_2">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="4">
-               <widget class="QLabel" name="fsm2LB_5">
-                <property name="text">
-                 <string>CH05</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="5">
-               <widget class="QSlider" name="fsm2SL_5">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="6">
-               <widget class="QSpinBox" name="fsm2SB_5">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="4">
-               <widget class="QLabel" name="fsm2LB_6">
-                <property name="text">
-                 <string>CH06</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="5">
-               <widget class="QSlider" name="fsm2SL_6">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="6">
-               <widget class="QSpinBox" name="fsm2SB_6">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="4">
-               <widget class="QLabel" name="fsm2LB_7">
-                <property name="text">
-                 <string>CH07</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="5">
-               <widget class="QSlider" name="fsm2SL_7">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="6">
-               <widget class="QSpinBox" name="fsm2SB_7">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="6">
-               <widget class="QSpinBox" name="fsm2SB_8">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="5">
-               <widget class="QSlider" name="fsm2SL_8">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="4">
-               <widget class="QLabel" name="fsm2LB_8">
-                <property name="text">
-                 <string>CH08</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="3" rowspan="4">
-               <widget class="Line" name="line_13">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="12">
-               <widget class="QLabel" name="fsm2LB_13">
-                <property name="text">
-                 <string>CH13</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="13">
-               <widget class="QSlider" name="fsm2SL_13">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="14">
-               <widget class="QSpinBox" name="fsm2SB_13">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="12">
-               <widget class="QLabel" name="fsm2LB_14">
-                <property name="text">
-                 <string>CH14</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="13">
-               <widget class="QSlider" name="fsm2SL_14">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="14">
-               <widget class="QSpinBox" name="fsm2SB_14">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="12">
-               <widget class="QLabel" name="fsm2LB_15">
-                <property name="text">
-                 <string>CH15</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="13">
-               <widget class="QSlider" name="fsm2SL_15">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="14">
-               <widget class="QSpinBox" name="fsm2SB_15">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="12">
-               <widget class="QLabel" name="fsm2LB_16">
-                <property name="text">
-                 <string>CH16</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="13">
-               <widget class="QSlider" name="fsm2SL_16">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="14">
-               <widget class="QSpinBox" name="fsm2SB_16">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="readOnly">
-                 <bool>false</bool>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="7" rowspan="4">
-               <widget class="Line" name="line_14">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="11" rowspan="4">
-               <widget class="Line" name="line_15">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0" colspan="3">
-               <layout class="QHBoxLayout" name="horizontalLayout_12">
-                <item>
-                 <widget class="QLabel" name="label_9">
-                  <property name="text">
-                   <string>Failsafe Mode</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QComboBox" name="fsm2CB">
-                  <item>
-                   <property name="text">
-                    <string>Hold</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Custom</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>No Pulses</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <spacer name="verticalSpacer_18">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>1</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="0" column="0">
-            <widget class="QGroupBox" name="FSGB_1">
-             <property name="title">
-              <string>Internal Module</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_67">
-              <item row="3" column="10">
-               <widget class="QSpinBox" name="fsm1SB_11">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="6">
-               <widget class="QSpinBox" name="fsm1SB_8">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="12">
-               <widget class="QLabel" name="fsm1LB_14">
-                <property name="text">
-                 <string>CH14</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="8">
-               <widget class="QLabel" name="fsm1LB_9">
-                <property name="text">
-                 <string>CH09</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="fsm1LB_2">
-                <property name="text">
-                 <string>CH02</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QSlider" name="fsm1SL_2">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="fsm1LB_1">
-                <property name="text">
-                 <string>CH01</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="9">
-               <widget class="QSlider" name="fsm1SL_9">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QLabel" name="fsm1LB_4">
-                <property name="text">
-                 <string>CH04</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="1">
-               <widget class="QSlider" name="fsm1SL_4">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="8">
-               <widget class="QLabel" name="fsm1LB_12">
-                <property name="text">
-                 <string>CH12</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="9">
-               <widget class="QSlider" name="fsm1SL_12">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="8">
-               <widget class="QLabel" name="fsm1LB_10">
-                <property name="text">
-                 <string>CH10</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="9">
-               <widget class="QSlider" name="fsm1SL_10">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QSlider" name="fsm1SL_1">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QLabel" name="fsm1LB_3">
-                <property name="text">
-                 <string>CH03</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QSlider" name="fsm1SL_3">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="8">
-               <widget class="QLabel" name="fsm1LB_11">
-                <property name="text">
-                 <string>CH11</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="9">
-               <widget class="QSlider" name="fsm1SL_11">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="10">
-               <widget class="QSpinBox" name="fsm1SB_12">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="10">
-               <widget class="QSpinBox" name="fsm1SB_10">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="10">
-               <widget class="QSpinBox" name="fsm1SB_9">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="2">
-               <widget class="QSpinBox" name="fsm1SB_4">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="2">
-               <widget class="QSpinBox" name="fsm1SB_3">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="2">
-               <widget class="QSpinBox" name="fsm1SB_2">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QSpinBox" name="fsm1SB_1">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="4">
-               <widget class="QLabel" name="fsm1LB_5">
-                <property name="text">
-                 <string>CH05</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="5">
-               <widget class="QSlider" name="fsm1SL_5">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="6">
-               <widget class="QSpinBox" name="fsm1SB_5">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="4">
-               <widget class="QLabel" name="fsm1LB_6">
-                <property name="text">
-                 <string>CH06</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="5">
-               <widget class="QSlider" name="fsm1SL_6">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="6">
-               <widget class="QSpinBox" name="fsm1SB_6">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="5">
-               <widget class="QSlider" name="fsm1SL_7">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="4">
-               <widget class="QLabel" name="fsm1LB_7">
-                <property name="text">
-                 <string>CH07</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="4">
-               <widget class="QLabel" name="fsm1LB_8">
-                <property name="text">
-                 <string>CH08</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="5">
-               <widget class="QSlider" name="fsm1SL_8">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="6">
-               <widget class="QSpinBox" name="fsm1SB_7">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="12">
-               <widget class="QLabel" name="fsm1LB_13">
-                <property name="text">
-                 <string>CH13</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="13">
-               <widget class="QSlider" name="fsm1SL_13">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="14">
-               <widget class="QSpinBox" name="fsm1SB_13">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="13">
-               <widget class="QSlider" name="fsm1SL_14">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="14">
-               <widget class="QSpinBox" name="fsm1SB_14">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="12">
-               <widget class="QLabel" name="fsm1LB_15">
-                <property name="text">
-                 <string>CH15</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="13">
-               <widget class="QSlider" name="fsm1SL_15">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="14">
-               <widget class="QSpinBox" name="fsm1SB_15">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="12">
-               <widget class="QLabel" name="fsm1LB_16">
-                <property name="text">
-                 <string>CH16</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="13">
-               <widget class="QSlider" name="fsm1SL_16">
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="14">
-               <widget class="QSpinBox" name="fsm1SB_16">
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="11" rowspan="4">
-               <widget class="Line" name="line_10">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="7" rowspan="4">
-               <widget class="Line" name="line_11">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="3" rowspan="4">
-               <widget class="Line" name="line_12">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0" colspan="3">
-               <layout class="QHBoxLayout" name="horizontalLayout_8">
-                <item>
-                 <widget class="QLabel" name="label_6">
-                  <property name="text">
-                   <string>Failsafe Mode</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QComboBox" name="fsm1CB">
-                  <item>
-                   <property name="text">
-                    <string>Hold</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Custom</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>No Pulses</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabHeli">
-      <attribute name="title">
-       <string>Heli Setup</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_72">
-       <item row="2" column="2" rowspan="2">
-        <spacer name="horizontalSpacer_27">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>647</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_107">
-         <property name="text">
-          <string>Swash Ring</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1" rowspan="2">
-        <widget class="QComboBox" name="swashCollectiveCB"/>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_103">
-         <property name="text">
-          <string>Swash Type</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QComboBox" name="swashTypeCB">
-         <item>
-          <property name="text">
-           <string>Off</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>120</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>120X</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>140</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>90</string>
-          </property>
-         </item>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <layout class="QGridLayout" name="gridLayout_20">
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="swashInvertELE">
-           <property name="text">
-            <string>Invert Elevator</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="swashInvertAIL">
-           <property name="text">
-            <string>Invert Aileron</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2">
-          <widget class="QCheckBox" name="swashInvertCOL">
-           <property name="text">
-            <string>Invert Collective</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="label_108">
-         <property name="text">
-          <string>Invert</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_106">
-         <property name="text">
-          <string>Collective</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QSpinBox" name="swashRingValSB">
-         <property name="suffix">
-          <string/>
-         </property>
-         <property name="minimum">
-          <number>0</number>
-         </property>
-         <property name="maximum">
-          <number>100</number>
-         </property>
-         <property name="singleStep">
-          <number>1</number>
-         </property>
-         <property name="value">
-          <number>0</number>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1">
-        <spacer name="verticalSpacer_21">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabPhases">
-      <attribute name="title">
-       <string>Flight Modes</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_16">
-       <item row="0" column="0">
-        <layout class="QGridLayout" name="pagesLayout">
-         <item row="1" column="0">
-          <widget class="QTabWidget" name="phases">
-           <property name="currentIndex">
-            <number>0</number>
-           </property>
-           <widget class="QWidget" name="phase0">
-            <attribute name="title">
-             <string>Flight Mode 0 (Default)</string>
-            </attribute>
-            <layout class="QVBoxLayout" name="verticalLayout_4a">
-             <item>
-              <layout class="QGridLayout" name="gridLayout_11a">
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38c">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase0FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase0FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39c">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase0Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm0name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="4" rowspan="2">
-                <spacer name="horizontalSpacer_12">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QGridLayout" name="gridLayout_12c">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase0Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase0Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase0Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase0Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14c" columnminimumwidth="80,0">
-                 <item row="4" column="0">
-                  <widget class="QLabel" name="phase0Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <spacer name="verticalSpacer_7">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="4" column="1">
-                  <widget class="QSpinBox" name="phase0Trim1Value">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                     <horstretch>1</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignCenter</set>
-                   </property>
-                   <property name="accelerated">
-                    <bool>true</bool>
-                   </property>
-                   <property name="minimum">
-                    <number>-896</number>
-                   </property>
-                   <property name="maximum">
-                    <number>896</number>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase0Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="1">
-                  <widget class="QSpinBox" name="phase0Trim2Value">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                     <horstretch>1</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignCenter</set>
-                   </property>
-                   <property name="accelerated">
-                    <bool>true</bool>
-                   </property>
-                   <property name="minimum">
-                    <number>-896</number>
-                   </property>
-                   <property name="maximum">
-                    <number>896</number>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="3" column="1">
-                  <spacer name="verticalSpacer_8">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="2" column="1">
-                  <spacer name="verticalSpacer_6">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="5" column="1">
-                  <spacer name="verticalSpacer_9">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15c" columnminimumwidth="80,0">
-                 <item row="4" column="0">
-                  <widget class="QLabel" name="phase0Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="4" column="1">
-                  <widget class="QSpinBox" name="phase0Trim4Value">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                     <horstretch>1</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignCenter</set>
-                   </property>
-                   <property name="accelerated">
-                    <bool>true</bool>
-                   </property>
-                   <property name="minimum">
-                    <number>-896</number>
-                   </property>
-                   <property name="maximum">
-                    <number>896</number>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase0Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="1">
-                  <widget class="QSpinBox" name="phase0Trim3Value">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                     <horstretch>1</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignCenter</set>
-                   </property>
-                   <property name="accelerated">
-                    <bool>true</bool>
-                   </property>
-                   <property name="minimum">
-                    <number>-896</number>
-                   </property>
-                   <property name="maximum">
-                    <number>896</number>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="5" column="1">
-                  <spacer name="verticalSpacer_11">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="3" column="1">
-                  <spacer name="verticalSpacer_12">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="2" column="1">
-                  <spacer name="verticalSpacer_10">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="0" column="1">
-                  <spacer name="verticalSpacer_13">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <widget class="Line" name="line">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QGridLayout" name="gridLayout_46" columnstretch="1,1">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase0gvGB">
-                 <layout class="QGridLayout" name="gridLayout_47" columnstretch="1,0,0,0">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase0GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QLineEdit" name="phase0GV3Name">
-                    <property name="maxLength">
-                     <number>6</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QLineEdit" name="phase0GV1Name">
-                    <property name="maxLength">
-                     <number>6</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="3">
-                   <widget class="QSpinBox" name="phase0GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase0GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QLineEdit" name="phase0GV2Name">
-                    <property name="maxLength">
-                     <number>6</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="3">
-                   <widget class="QSpinBox" name="phase0GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase0GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="3">
-                   <widget class="QSpinBox" name="phase0GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase0GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QLineEdit" name="phase0GV4Name">
-                    <property name="maxLength">
-                     <number>6</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="3">
-                   <widget class="QSpinBox" name="phase0GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase0GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QLineEdit" name="phase0GV5Name">
-                    <property name="maxLength">
-                     <number>6</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="3">
-                   <widget class="QSpinBox" name="phase0GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase0GV1Source"/>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase0GV2Source"/>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase0GV3Source"/>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase0GV4Source"/>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase0GV5Source"/>
-                  </item>
-                  <item row="5" column="3">
-                   <widget class="QSpinBox" name="phase0GV6Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="5" column="1">
-                   <widget class="QComboBox" name="phase0GV6Source"/>
-                  </item>
-                  <item row="5" column="0">
-                   <widget class="QLabel" name="phase0GV6_Label">
-                    <property name="text">
-                     <string>GVAR6</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="5" column="2">
-                   <widget class="QLineEdit" name="phase0GV6Name">
-                    <property name="maxLength">
-                     <number>6</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="6" column="0">
-                   <widget class="QLabel" name="phase0GV7_Label">
-                    <property name="text">
-                     <string>GVAR7</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="6" column="1">
-                   <widget class="QComboBox" name="phase0GV7Source"/>
-                  </item>
-                  <item row="6" column="2">
-                   <widget class="QLineEdit" name="phase0GV7Name">
-                    <property name="text">
-                     <string/>
-                    </property>
-                    <property name="maxLength">
-                     <number>6</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="6" column="3">
-                   <widget class="QSpinBox" name="phase0GV7Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase0reGB">
-                 <layout class="QGridLayout" name="gridLayout_48">
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase0REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QSpinBox" name="phase0RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QSpinBox" name="phase0RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase0REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="phase1">
-            <attribute name="title">
-             <string>FM 1</string>
-            </attribute>
-            <layout class="QGridLayout" name="gridLayout_17">
-             <item row="0" column="0">
-              <layout class="QGridLayout" name="gridLayout_11c_2">
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase1FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase1Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm1name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_37e_4">
-                 <property name="text">
-                  <string>Switch</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="phase1Switch"/>
-               </item>
-               <item row="0" column="4" rowspan="3">
-                <spacer name="horizontalSpacer_13">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39e_2">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase1FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38e_2">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="1" column="0">
-              <layout class="QGridLayout" name="gridLayout_12e_2">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase1Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase1Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase1Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase1Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14e_2" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase1Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase1Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_5c_2">
-                   <item>
-                    <spacer name="verticalSpacer_3c_2">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase1Trim2Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase1Trim2Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_4a_2">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_6b_2">
-                   <item>
-                    <spacer name="verticalSpacer_5b_2">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase1Trim1Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase1Trim1Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_6b_2">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15e_2" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase1Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase1Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_7b_2">
-                   <item>
-                    <spacer name="verticalSpacer_7b_2">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase1Trim3Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase1Trim3Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_8d_2">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_8d_2">
-                   <item>
-                    <spacer name="verticalSpacer_9d_2">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase1Trim4Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase1Trim4Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_10c_2">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item row="3" column="0">
-              <layout class="QGridLayout" name="gridLayout_38">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase1gvGB">
-                 <layout class="QGridLayout" name="gridLayout_49">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase1GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase1GV1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase1GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase1GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase1GV2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase1GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase1GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase1GV3Use"/>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QSpinBox" name="phase1GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase1GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase1GV4Use"/>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QSpinBox" name="phase1GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase1GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase1GV5Use"/>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QSpinBox" name="phase1GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase1reGB">
-                 <layout class="QGridLayout" name="gridLayout_50">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase1REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase1RE1Use"/>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase1REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase1RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase1RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase1RE2Use"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="2" column="0">
-              <widget class="Line" name="line_2">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="phase2">
-            <attribute name="title">
-             <string>FM 2</string>
-            </attribute>
-            <layout class="QVBoxLayout" name="verticalLayout_4c">
-             <item>
-              <layout class="QGridLayout" name="gridLayout_11c">
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase2FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase2FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39e">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase2Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm2name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_37e_2">
-                 <property name="text">
-                  <string>Switch</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="phase2Switch"/>
-               </item>
-               <item row="0" column="4" rowspan="3">
-                <spacer name="horizontalSpacer_14">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38e">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QGridLayout" name="gridLayout_12e">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase2Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase2Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase2Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase2Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14e" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase2Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase2Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_5c">
-                   <item>
-                    <spacer name="verticalSpacer_3c">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase2Trim2Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase2Trim2Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_4a">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_6b">
-                   <item>
-                    <spacer name="verticalSpacer_5b">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase2Trim1Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase2Trim1Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_6b">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15e" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase2Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase2Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_7b">
-                   <item>
-                    <spacer name="verticalSpacer_7b">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase2Trim3Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase2Trim3Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_8d">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_8d">
-                   <item>
-                    <spacer name="verticalSpacer_9d">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase2Trim4Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase2Trim4Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_10c">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <widget class="Line" name="line_3">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QGridLayout" name="gridLayout_39">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase2gvGB">
-                 <layout class="QGridLayout" name="gridLayout_51">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase2GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase2GV1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase2GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase2GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase2GV2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase2GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase2GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase2GV3Use"/>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QSpinBox" name="phase2GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase2GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase2GV4Use"/>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QSpinBox" name="phase2GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase2GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase2GV5Use"/>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QSpinBox" name="phase2GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase2reGB">
-                 <layout class="QGridLayout" name="gridLayout_52">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase2REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase2RE1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase2RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase2REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase2RE2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase2RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="phase3">
-            <attribute name="title">
-             <string>FM 3</string>
-            </attribute>
-            <layout class="QVBoxLayout" name="verticalLayout_4d">
-             <item>
-              <layout class="QGridLayout" name="gridLayout_11d">
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39a">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38a">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase3Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm3name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_37a_2">
-                 <property name="text">
-                  <string>Switch</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="phase3Switch"/>
-               </item>
-               <item row="0" column="4" rowspan="3">
-                <spacer name="horizontalSpacer_15">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase3FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase3FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QGridLayout" name="gridLayout_12a">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase3Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase3Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase3Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase3Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14a" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase3Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase3Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_5d">
-                   <item>
-                    <spacer name="verticalSpacer_3d">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase3Trim2Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase3Trim2Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_4b">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_6c">
-                   <item>
-                    <spacer name="verticalSpacer_5c">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase3Trim1Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase3Trim1Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_6c">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15a" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase3Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase3Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_7c">
-                   <item>
-                    <spacer name="verticalSpacer_7c">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase3Trim3Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase3Trim3Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_8e">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_8a">
-                   <item>
-                    <spacer name="verticalSpacer_9a">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase3Trim4Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase3Trim4Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_10d">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <widget class="Line" name="line_4">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QGridLayout" name="gridLayout_40">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase3gvGB">
-                 <layout class="QGridLayout" name="gridLayout_53">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase3GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase3GV1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase3GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase3GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase3GV2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase3GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase3GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase3GV3Use"/>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QSpinBox" name="phase3GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase3GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase3GV4Use"/>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QSpinBox" name="phase3GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase3GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase3GV5Use"/>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QSpinBox" name="phase3GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase3reGB">
-                 <layout class="QGridLayout" name="gridLayout_54">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase3REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase3RE1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase3RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase3REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase3RE2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase3RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="phase4">
-            <attribute name="title">
-             <string>FM 4</string>
-            </attribute>
-            <layout class="QVBoxLayout" name="verticalLayout_4e">
-             <item>
-              <layout class="QGridLayout" name="gridLayout_11e">
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm4name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase4Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_37b_2">
-                 <property name="text">
-                  <string>Switch</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="phase4Switch"/>
-               </item>
-               <item row="0" column="4" rowspan="3">
-                <spacer name="horizontalSpacer_19">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38b">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39b">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase4FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase4FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QGridLayout" name="gridLayout_12b">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase4Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase4Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase4Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase4Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14b" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase4Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase4Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_5a">
-                   <item>
-                    <spacer name="verticalSpacer_3a">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase4Trim2Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase4Trim2Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_4c">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_6d">
-                   <item>
-                    <spacer name="verticalSpacer_5d">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase4Trim1Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase4Trim1Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_6d">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15b" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase4Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase4Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_7d">
-                   <item>
-                    <spacer name="verticalSpacer_7d">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase4Trim3Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase4Trim3Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_8a">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_8b">
-                   <item>
-                    <spacer name="verticalSpacer_9b">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase4Trim4Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase4Trim4Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_10a">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <widget class="Line" name="line_5">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QGridLayout" name="gridLayout_41">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase4gvGB">
-                 <layout class="QGridLayout" name="gridLayout_55">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase4GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase4GV1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase4GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase4GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase4GV2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase4GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase4GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase4GV3Use"/>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QSpinBox" name="phase4GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase4GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase4GV4Use"/>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QSpinBox" name="phase4GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase4GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase4GV5Use"/>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QSpinBox" name="phase4GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase4reGB">
-                 <layout class="QGridLayout" name="gridLayout_56">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase4REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase4RE1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase4RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase4REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase4RE2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase4RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="phase5">
-            <attribute name="title">
-             <string>FM 5</string>
-            </attribute>
-            <layout class="QGridLayout" name="gridLayout_12">
-             <item row="1" column="0">
-              <layout class="QGridLayout" name="gridLayout_12b_3">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase5Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase5Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase5Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase5Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14b_3" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase5Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase5Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_5a_3">
-                   <item>
-                    <spacer name="verticalSpacer_3a_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase5Trim2Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase5Trim2Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_4c_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_6d_3">
-                   <item>
-                    <spacer name="verticalSpacer_5d_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase5Trim1Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase5Trim1Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_6d_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15b_3" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase5Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase5Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_7d_3">
-                   <item>
-                    <spacer name="verticalSpacer_7d_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase5Trim3Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase5Trim3Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_8a_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_8b_3">
-                   <item>
-                    <spacer name="verticalSpacer_9b_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase5Trim4Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase5Trim4Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_10a_3">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item row="0" column="0">
-              <layout class="QGridLayout" name="gridLayout_11e_3">
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm5name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase5Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_37b_6">
-                 <property name="text">
-                  <string>Switch</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="phase5Switch"/>
-               </item>
-               <item row="0" column="4" rowspan="3">
-                <spacer name="horizontalSpacer_20">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase5FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase5FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38b_3">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39b_3">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="2" column="0">
-              <widget class="Line" name="line_6">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <layout class="QGridLayout" name="gridLayout_42">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase5gvGB">
-                 <layout class="QGridLayout" name="gridLayout_57">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase5GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase5GV1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase5GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase5GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase5GV2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase5GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase5GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase5GV3Use"/>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QSpinBox" name="phase5GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase5GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase5GV4Use"/>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QSpinBox" name="phase5GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase5GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase5GV5Use"/>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QSpinBox" name="phase5GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase5reGB">
-                 <layout class="QGridLayout" name="gridLayout_58">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase5REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase5RE1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase5RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase5REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase5RE2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase5RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="phase6">
-            <attribute name="title">
-             <string>FM 6</string>
-            </attribute>
-            <layout class="QGridLayout" name="gridLayout_13">
-             <item row="1" column="0">
-              <layout class="QGridLayout" name="gridLayout_12b_4">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase6Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase6Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase6Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase6Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14b_4" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase6Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase6Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_5a_4">
-                   <item>
-                    <spacer name="verticalSpacer_3a_4">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase6Trim2Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase6Trim2Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_4c_4">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_6d_4">
-                   <item>
-                    <spacer name="verticalSpacer_5d_4">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase6Trim1Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase6Trim1Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_6d_4">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15b_4" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase6Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase6Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_7d_4">
-                   <item>
-                    <spacer name="verticalSpacer_7d_4">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase6Trim3Use">
-                     <property name="sizePolicy">
-                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase6Trim3Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_8a_4">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_8b_4">
-                   <item>
-                    <spacer name="verticalSpacer_9b_4">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase6Trim4Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase6Trim4Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_10a_4">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item row="0" column="0">
-              <layout class="QGridLayout" name="gridLayout_11e_4">
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase6Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm6name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_37b_8">
-                 <property name="text">
-                  <string>Switch</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="phase6Switch"/>
-               </item>
-               <item row="0" column="4" rowspan="3">
-                <spacer name="horizontalSpacer_21">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38b_4">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase6FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase6FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39b_4">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="3" column="0">
-              <layout class="QGridLayout" name="gridLayout_43">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase6gvGB">
-                 <layout class="QGridLayout" name="gridLayout_59">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase6GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase6GV1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase6GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase6GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase6GV2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase6GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase6GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase6GV3Use"/>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QSpinBox" name="phase6GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase6GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase6GV4Use"/>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QSpinBox" name="phase6GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase6GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase6GV5Use"/>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QSpinBox" name="phase6GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase6reGB">
-                 <layout class="QGridLayout" name="gridLayout_60">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase6REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase6RE1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase6RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase6REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase6RE2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase6RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="2" column="0">
-              <widget class="Line" name="line_7">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="phase7">
-            <attribute name="title">
-             <string>FM 7</string>
-            </attribute>
-            <layout class="QGridLayout" name="gridLayout_14">
-             <item row="2" column="0">
-              <widget class="Line" name="line_8">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <layout class="QGridLayout" name="gridLayout_11e_5">
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase7Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm7name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_37b_10">
-                 <property name="text">
-                  <string>Switch</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="phase7Switch"/>
-               </item>
-               <item row="0" column="4" rowspan="3">
-                <spacer name="horizontalSpacer_22">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase7FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase7FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38b_5">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39b_5">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="1" column="0">
-              <layout class="QGridLayout" name="gridLayout_12b_5">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase7Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase7Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase7Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase7Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14b_5" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase7Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase7Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_5a_5">
-                   <item>
-                    <spacer name="verticalSpacer_3a_5">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase7Trim2Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase7Trim2Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_4c_5">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_6d_5">
-                   <item>
-                    <spacer name="verticalSpacer_5d_5">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase7Trim1Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase7Trim1Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_6d_5">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15b_5" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase7Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase7Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_7d_5">
-                   <item>
-                    <spacer name="verticalSpacer_7d_5">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase7Trim3Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase7Trim3Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_8a_5">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_8b_5">
-                   <item>
-                    <spacer name="verticalSpacer_9b_5">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase7Trim4Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase7Trim4Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_10a_5">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item row="3" column="0">
-              <layout class="QGridLayout" name="gridLayout_44">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase7gvGB">
-                 <layout class="QGridLayout" name="gridLayout_61">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase7GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase7GV1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase7GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase7GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase7GV2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase7GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase7GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase7GV3Use"/>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QSpinBox" name="phase7GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase7GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase7GV4Use"/>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QSpinBox" name="phase7GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase7GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase7GV5Use"/>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QSpinBox" name="phase7GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase7reGB">
-                 <layout class="QGridLayout" name="gridLayout_62">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase7REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase7RE1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase7RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase7REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase7RE2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase7RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="phase8">
-            <attribute name="title">
-             <string>FM 8</string>
-            </attribute>
-            <layout class="QGridLayout" name="gridLayout_15">
-             <item row="1" column="0">
-              <layout class="QGridLayout" name="gridLayout_12b_6">
-               <item row="0" column="0">
-                <widget class="QSlider" name="phase8Trim2Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QSlider" name="phase8Trim3Slider">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="invertedAppearance">
-                  <bool>false</bool>
-                 </property>
-                 <property name="invertedControls">
-                  <bool>false</bool>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="2">
-                <widget class="QSlider" name="phase8Trim4Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QSlider" name="phase8Trim1Slider">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="tickPosition">
-                  <enum>QSlider::TicksBothSides</enum>
-                 </property>
-                 <property name="tickInterval">
-                  <number>25</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <layout class="QGridLayout" name="gridLayout_14b_6" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase8Trim1Label">
-                   <property name="text">
-                    <string>trim1</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase8Trim2Label">
-                   <property name="text">
-                    <string>trim2</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_5a_6">
-                   <item>
-                    <spacer name="verticalSpacer_3a_6">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase8Trim2Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase8Trim2Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_4c_6">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_6d_6">
-                   <item>
-                    <spacer name="verticalSpacer_5d_6">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase8Trim1Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase8Trim1Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_6d_6">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="2">
-                <layout class="QGridLayout" name="gridLayout_15b_6" columnstretch="0,1" columnminimumwidth="80,0">
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="phase8Trim4Label">
-                   <property name="text">
-                    <string>trim4</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="phase8Trim3Label">
-                   <property name="text">
-                    <string>trim3</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_7d_6">
-                   <item>
-                    <spacer name="verticalSpacer_7d_6">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase8Trim3Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase8Trim3Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_8a_6">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_8b_6">
-                   <item>
-                    <spacer name="verticalSpacer_9b_6">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item>
-                    <widget class="QComboBox" name="phase8Trim4Use"/>
-                   </item>
-                   <item>
-                    <widget class="QSpinBox" name="phase8Trim4Value">
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="accelerated">
-                      <bool>true</bool>
-                     </property>
-                     <property name="minimum">
-                      <number>-896</number>
-                     </property>
-                     <property name="maximum">
-                      <number>896</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <spacer name="verticalSpacer_10a_6">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>20</width>
-                       <height>40</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
-             <item row="2" column="0">
-              <widget class="Line" name="line_9">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <layout class="QGridLayout" name="gridLayout_11e_6">
-               <item row="1" column="3">
-                <widget class="QDoubleSpinBox" name="phase8FadeOut">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_fm8name">
-                 <property name="text">
-                  <string>Flight Mode Name</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_37b_12">
-                 <property name="text">
-                  <string>Switch</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="phase8Switch"/>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="phase8Name">
-                 <property name="maxLength">
-                  <number>6</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="4" rowspan="3">
-                <spacer name="horizontalSpacer_23">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item row="0" column="2">
-                <widget class="QLabel" name="label_38b_6">
-                 <property name="text">
-                  <string>Fade In</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="2">
-                <widget class="QLabel" name="label_39b_6">
-                 <property name="text">
-                  <string>Fade Out</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="3">
-                <widget class="QDoubleSpinBox" name="phase8FadeIn">
-                 <property name="decimals">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="3" column="0">
-              <layout class="QGridLayout" name="gridLayout_45">
-               <item row="0" column="0">
-                <widget class="QGroupBox" name="phase8gvGB">
-                 <layout class="QGridLayout" name="gridLayout_63">
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="phase8GV5_Label">
-                    <property name="text">
-                     <string>GVAR5</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="2">
-                   <widget class="QSpinBox" name="phase8GV3Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="1">
-                   <widget class="QComboBox" name="phase8GV4Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase8GV2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QSpinBox" name="phase8GV4Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="4" column="2">
-                   <widget class="QSpinBox" name="phase8GV5Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase8GV1Use"/>
-                  </item>
-                  <item row="3" column="0">
-                   <widget class="QLabel" name="phase8GV4_Label">
-                    <property name="text">
-                     <string>GVAR4</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase8GV2_Label">
-                    <property name="text">
-                     <string>GVAR2</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QComboBox" name="phase8GV3Use"/>
-                  </item>
-                  <item row="4" column="1">
-                   <widget class="QComboBox" name="phase8GV5Use"/>
-                  </item>
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase8GV1_Label">
-                    <property name="text">
-                     <string>GVAR1</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase8GV1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="phase8GV3_Label">
-                    <property name="text">
-                     <string>GVAR3</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase8GV2Use"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QGroupBox" name="phase8reGB">
-                 <layout class="QGridLayout" name="gridLayout_64">
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="phase8REB_Label">
-                    <property name="text">
-                     <string>Rotary encoder B</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QComboBox" name="phase8RE2Use"/>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QSpinBox" name="phase8RE2Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QComboBox" name="phase8RE1Use"/>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QSpinBox" name="phase8RE1Value">
-                    <property name="minimum">
-                     <number>-100</number>
-                    </property>
-                    <property name="maximum">
-                     <number>100</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="phase8REA_Label">
-                    <property name="text">
-                     <string>Rotary encoder A</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabExpo">
-      <attribute name="title">
-       <string>Sticks</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_118">
-       <item row="0" column="0">
-        <layout class="QGridLayout" name="exposLayout"/>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabMix">
-      <attribute name="title">
-       <string>Mixes</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_18">
-       <item row="1" column="0">
-        <layout class="QGridLayout" name="mixersLayout"/>
-       </item>
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="showNames_Ckb">
-         <property name="text">
-          <string>Show channels names in mixes</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabLimit">
-      <attribute name="title">
-       <string>Limits</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_401">
-       <item>
-        <widget class="QScrollArea" name="scrollArea">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents_2">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>998</width>
-            <height>481</height>
-           </rect>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_6" rowstretch="0,0" columnstretch="0,0">
-           <item row="0" column="0">
-            <widget class="QGroupBox" name="limitGB1">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string/>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_27" columnstretch="0,0,0,0,0,1,1">
-              <property name="sizeConstraint">
-               <enum>QLayout::SetMinimumSize</enum>
-              </property>
-              <item row="16" column="6">
-               <widget class="QSpinBox" name="ppmcenter_16">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QLineEdit" name="CHName_03">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="0">
-               <widget class="QLineEdit" name="CHName_13">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="0">
-               <widget class="QLineEdit" name="CHName_14">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QLineEdit" name="CHName_04">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_13">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_2">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="3">
-               <widget class="QSpinBox" name="minSB_15">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="3">
-               <widget class="QSpinBox" name="minSB_9">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="4">
-               <widget class="QSpinBox" name="maxSB_2">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="5">
-               <widget class="QComboBox" name="chInvCB_3">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="11" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_11">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="3">
-               <widget class="QSpinBox" name="minSB_11">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="4">
-               <widget class="QSpinBox" name="maxSB_11">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="4">
-               <widget class="QSpinBox" name="maxSB_8">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="5">
-               <widget class="QComboBox" name="chInvCB_8">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="9" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_9">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="4">
-               <widget class="QSpinBox" name="maxSB_14">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="5">
-               <widget class="QComboBox" name="chInvCB_14">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="15" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_15">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="5">
-               <widget class="QComboBox" name="chInvCB_5">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="12" column="3">
-               <widget class="QSpinBox" name="minSB_12">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="4">
-               <widget class="QSpinBox" name="maxSB_12">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="5">
-               <widget class="QComboBox" name="chInvCB_12">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="6" column="5">
-               <widget class="QComboBox" name="chInvCB_6">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="7" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_7">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="3">
-               <widget class="QSpinBox" name="minSB_7">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_6">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="3">
-               <widget class="QSpinBox" name="minSB_6">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="4">
-               <widget class="QSpinBox" name="maxSB_6">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="4">
-               <widget class="QSpinBox" name="maxSB_7">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="5">
-               <widget class="QComboBox" name="chInvCB_7">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="16" column="3">
-               <widget class="QSpinBox" name="minSB_16">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="4">
-               <widget class="QSpinBox" name="maxSB_16">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="4">
-               <widget class="QSpinBox" name="maxSB_9">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="5">
-               <widget class="QComboBox" name="chInvCB_9">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="13" column="3">
-               <widget class="QSpinBox" name="minSB_13">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="4">
-               <widget class="QSpinBox" name="maxSB_13">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="5">
-               <widget class="QComboBox" name="chInvCB_13">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="14" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_14">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="3">
-               <widget class="QSpinBox" name="minSB_14">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="5">
-               <widget class="QComboBox" name="chInvCB_11">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="12" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_12">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_5">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="3">
-               <widget class="QSpinBox" name="minSB_5">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="4">
-               <widget class="QSpinBox" name="maxSB_5">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="3">
-               <widget class="QSpinBox" name="minSB_1">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="4">
-               <widget class="QSpinBox" name="maxSB_1">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="5">
-               <widget class="QComboBox" name="chInvCB_1">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="2" column="5">
-               <widget class="QComboBox" name="chInvCB_2">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="4" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_4">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="3">
-               <widget class="QSpinBox" name="minSB_2">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_3">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="4">
-               <widget class="QSpinBox" name="maxSB_4">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="3">
-               <widget class="QSpinBox" name="minSB_3">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="4">
-               <widget class="QSpinBox" name="maxSB_3">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="5">
-               <widget class="QComboBox" name="chInvCB_4">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QLabel" name="label_46">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Offset</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="3">
-               <widget class="QLabel" name="label_49">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Min</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="5">
-               <widget class="QComboBox" name="chInvCB_16">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="4" column="3">
-               <widget class="QSpinBox" name="minSB_4">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="3">
-               <widget class="QSpinBox" name="minSB_8">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="4">
-               <widget class="QSpinBox" name="maxSB_15">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_16">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="5">
-               <widget class="QComboBox" name="chInvCB_15">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="8" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_8">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="4">
-               <widget class="QSpinBox" name="maxSB_10">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_1">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="4">
-               <widget class="QLabel" name="label_50">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Max</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="5">
-               <widget class="QLabel" name="label_54">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Invert</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_10">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="3">
-               <widget class="QSpinBox" name="minSB_10">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="5">
-               <widget class="QComboBox" name="chInvCB_10">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="1" column="6">
-               <widget class="QSpinBox" name="ppmcenter_1">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="6">
-               <widget class="QLabel" name="ppmc_label1">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="text">
-                 <string>Center</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="6">
-               <widget class="QSpinBox" name="ppmcenter_2">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="6">
-               <widget class="QSpinBox" name="ppmcenter_3">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="6">
-               <widget class="QSpinBox" name="ppmcenter_4">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="6">
-               <widget class="QSpinBox" name="ppmcenter_5">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="6">
-               <widget class="QSpinBox" name="ppmcenter_6">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="6">
-               <widget class="QSpinBox" name="ppmcenter_7">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="6">
-               <widget class="QSpinBox" name="ppmcenter_8">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="6">
-               <widget class="QSpinBox" name="ppmcenter_9">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="6">
-               <widget class="QSpinBox" name="ppmcenter_10">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="6">
-               <widget class="QSpinBox" name="ppmcenter_11">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="6">
-               <widget class="QSpinBox" name="ppmcenter_12">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="6">
-               <widget class="QSpinBox" name="ppmcenter_15">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="6">
-               <widget class="QSpinBox" name="ppmcenter_13">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="6">
-               <widget class="QSpinBox" name="ppmcenter_14">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="2">
-               <widget class="QLabel" name="label_sym01">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Sym</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QCheckBox" name="symckb_1">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="2">
-               <widget class="QCheckBox" name="symckb_2">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="2">
-               <widget class="QCheckBox" name="symckb_3">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="2">
-               <widget class="QCheckBox" name="symckb_4">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="2">
-               <widget class="QCheckBox" name="symckb_5">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="2">
-               <widget class="QCheckBox" name="symckb_6">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="2">
-               <widget class="QCheckBox" name="symckb_7">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="2">
-               <widget class="QCheckBox" name="symckb_8">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="2">
-               <widget class="QCheckBox" name="symckb_9">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="2">
-               <widget class="QCheckBox" name="symckb_10">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="2">
-               <widget class="QCheckBox" name="symckb_11">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="2">
-               <widget class="QCheckBox" name="symckb_12">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="2">
-               <widget class="QCheckBox" name="symckb_13">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="2">
-               <widget class="QCheckBox" name="symckb_14">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="2">
-               <widget class="QCheckBox" name="symckb_15">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="2">
-               <widget class="QCheckBox" name="symckb_16">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="0">
-               <widget class="QLineEdit" name="CHName_09">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="0">
-               <widget class="QLineEdit" name="CHName_12">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLineEdit" name="CHName_01">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QLabel" name="label_36">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Channel</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="0">
-               <widget class="QLineEdit" name="CHName_08">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="0">
-               <widget class="QLineEdit" name="CHName_06">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="0">
-               <widget class="QLineEdit" name="CHName_07">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="0">
-               <widget class="QLineEdit" name="CHName_16">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLineEdit" name="CHName_02">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="0">
-               <widget class="QLineEdit" name="CHName_05">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="0">
-               <widget class="QLineEdit" name="CHName_10">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="0">
-               <widget class="QLineEdit" name="CHName_11">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="0">
-               <widget class="QLineEdit" name="CHName_15">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="1" column="0" colspan="2">
-            <spacer name="verticalSpacer_3">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>1</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="0" column="1">
-            <widget class="QGroupBox" name="limitGB2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string/>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_28" columnstretch="0,0,0,0,0,1,1">
-              <property name="sizeConstraint">
-               <enum>QLayout::SetMinimumSize</enum>
-              </property>
-              <item row="4" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_20">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="5">
-               <widget class="QComboBox" name="chInvCB_22">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="11" column="5">
-               <widget class="QComboBox" name="chInvCB_27">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="5" column="5">
-               <widget class="QComboBox" name="chInvCB_21">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_18">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QLabel" name="label_62">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Offset</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="3">
-               <widget class="QLabel" name="label_63">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Min</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="4">
-               <widget class="QLabel" name="label_64">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Max</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="5">
-               <widget class="QLabel" name="label_67">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Invert</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_17">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="3">
-               <widget class="QSpinBox" name="minSB_17">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="4">
-               <widget class="QSpinBox" name="maxSB_17">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="5">
-               <widget class="QComboBox" name="chInvCB_17">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="2" column="3">
-               <widget class="QSpinBox" name="minSB_18">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="4">
-               <widget class="QSpinBox" name="maxSB_18">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="5">
-               <widget class="QComboBox" name="chInvCB_18">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_19">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="3">
-               <widget class="QSpinBox" name="minSB_19">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="4">
-               <widget class="QSpinBox" name="maxSB_19">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="5">
-               <widget class="QComboBox" name="chInvCB_19">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="4" column="3">
-               <widget class="QSpinBox" name="minSB_20">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="4">
-               <widget class="QSpinBox" name="maxSB_20">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="5">
-               <widget class="QComboBox" name="chInvCB_20">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="5" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_21">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="3">
-               <widget class="QSpinBox" name="minSB_21">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="4">
-               <widget class="QSpinBox" name="maxSB_21">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_22">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="3">
-               <widget class="QSpinBox" name="minSB_22">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="4">
-               <widget class="QSpinBox" name="maxSB_22">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_23">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="3">
-               <widget class="QSpinBox" name="minSB_23">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="4">
-               <widget class="QSpinBox" name="maxSB_23">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="5">
-               <widget class="QComboBox" name="chInvCB_23">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="8" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_24">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="3">
-               <widget class="QSpinBox" name="minSB_24">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="4">
-               <widget class="QSpinBox" name="maxSB_24">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="5">
-               <widget class="QComboBox" name="chInvCB_24">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="9" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_25">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="3">
-               <widget class="QSpinBox" name="minSB_25">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="4">
-               <widget class="QSpinBox" name="maxSB_25">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="5">
-               <widget class="QComboBox" name="chInvCB_25">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="10" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_26">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="3">
-               <widget class="QSpinBox" name="minSB_26">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="4">
-               <widget class="QSpinBox" name="maxSB_26">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="5">
-               <widget class="QComboBox" name="chInvCB_26">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="11" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_27">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="3">
-               <widget class="QSpinBox" name="minSB_27">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="4">
-               <widget class="QSpinBox" name="maxSB_27">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="3">
-               <widget class="QSpinBox" name="minSB_28">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="4">
-               <widget class="QSpinBox" name="maxSB_29">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="4">
-               <widget class="QSpinBox" name="maxSB_28">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_28">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="3">
-               <widget class="QSpinBox" name="minSB_29">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="5">
-               <widget class="QComboBox" name="chInvCB_28">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="14" column="4">
-               <widget class="QSpinBox" name="maxSB_30">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_29">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="3">
-               <widget class="QSpinBox" name="minSB_30">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="5">
-               <widget class="QComboBox" name="chInvCB_29">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="15" column="4">
-               <widget class="QSpinBox" name="maxSB_31">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_30">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="3">
-               <widget class="QSpinBox" name="minSB_31">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="5">
-               <widget class="QComboBox" name="chInvCB_30">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="16" column="3">
-               <widget class="QSpinBox" name="minSB_32">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="4">
-               <widget class="QSpinBox" name="maxSB_32">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_31">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="5">
-               <widget class="QComboBox" name="chInvCB_31">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="16" column="1">
-               <widget class="QDoubleSpinBox" name="offsetDSB_32">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="accelerated">
-                 <bool>true</bool>
-                </property>
-                <property name="decimals">
-                 <number>1</number>
-                </property>
-                <property name="minimum">
-                 <double>-100.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.100000000000000</double>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="5">
-               <widget class="QComboBox" name="chInvCB_32">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>---</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>INV</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="0" column="6">
-               <widget class="QLabel" name="ppmc_label2">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="text">
-                 <string>Center</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="6">
-               <widget class="QSpinBox" name="ppmcenter_17">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="6">
-               <widget class="QSpinBox" name="ppmcenter_18">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="6">
-               <widget class="QSpinBox" name="ppmcenter_19">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="6">
-               <widget class="QSpinBox" name="ppmcenter_20">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="6">
-               <widget class="QSpinBox" name="ppmcenter_21">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="6">
-               <widget class="QSpinBox" name="ppmcenter_22">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="6">
-               <widget class="QSpinBox" name="ppmcenter_23">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="6">
-               <widget class="QSpinBox" name="ppmcenter_24">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="6">
-               <widget class="QSpinBox" name="ppmcenter_25">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="6">
-               <widget class="QSpinBox" name="ppmcenter_26">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="6">
-               <widget class="QSpinBox" name="ppmcenter_27">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="6">
-               <widget class="QSpinBox" name="ppmcenter_28">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="6">
-               <widget class="QSpinBox" name="ppmcenter_29">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="6">
-               <widget class="QSpinBox" name="ppmcenter_30">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="6">
-               <widget class="QSpinBox" name="ppmcenter_31">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="6">
-               <widget class="QSpinBox" name="ppmcenter_32">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-                <property name="minimum">
-                 <number>1375</number>
-                </property>
-                <property name="maximum">
-                 <number>1625</number>
-                </property>
-                <property name="value">
-                 <number>1500</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="2">
-               <widget class="QLabel" name="label_sym02">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Sym</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QCheckBox" name="symckb_17">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="2">
-               <widget class="QCheckBox" name="symckb_18">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="2">
-               <widget class="QCheckBox" name="symckb_19">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="2">
-               <widget class="QCheckBox" name="symckb_20">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="2">
-               <widget class="QCheckBox" name="symckb_21">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="2">
-               <widget class="QCheckBox" name="symckb_22">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="2">
-               <widget class="QCheckBox" name="symckb_23">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="2">
-               <widget class="QCheckBox" name="symckb_24">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="2">
-               <widget class="QCheckBox" name="symckb_25">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="2">
-               <widget class="QCheckBox" name="symckb_26">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="2">
-               <widget class="QCheckBox" name="symckb_27">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="2">
-               <widget class="QCheckBox" name="symckb_28">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="2">
-               <widget class="QCheckBox" name="symckb_29">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="2">
-               <widget class="QCheckBox" name="symckb_30">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="2">
-               <widget class="QCheckBox" name="symckb_31">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="2">
-               <widget class="QCheckBox" name="symckb_32">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLineEdit" name="CHName_17">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QLabel" name="label_99">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::Panel</enum>
-                </property>
-                <property name="frameShadow">
-                 <enum>QFrame::Raised</enum>
-                </property>
-                <property name="midLineWidth">
-                 <number>0</number>
-                </property>
-                <property name="text">
-                 <string>Channel</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <property name="margin">
-                 <number>3</number>
-                </property>
-               </widget>
-              </item>
-              <item row="11" column="0">
-               <widget class="QLineEdit" name="CHName_27">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="16" column="0">
-               <widget class="QLineEdit" name="CHName_32">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="15" column="0">
-               <widget class="QLineEdit" name="CHName_31">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="6" column="0">
-               <widget class="QLineEdit" name="CHName_22">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="9" column="0">
-               <widget class="QLineEdit" name="CHName_25">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="8" column="0">
-               <widget class="QLineEdit" name="CHName_24">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="7" column="0">
-               <widget class="QLineEdit" name="CHName_23">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="13" column="0">
-               <widget class="QLineEdit" name="CHName_29">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="12" column="0">
-               <widget class="QLineEdit" name="CHName_28">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="10" column="0">
-               <widget class="QLineEdit" name="CHName_26">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QLineEdit" name="CHName_19">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLineEdit" name="CHName_18">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="0">
-               <widget class="QLineEdit" name="CHName_20">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="0">
-               <widget class="QLineEdit" name="CHName_21">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-               </widget>
-              </item>
-              <item row="14" column="0">
-               <widget class="QLineEdit" name="CHName_30">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maxLength">
-                 <number>6</number>
-                </property>
-                <property name="frame">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabCurve">
-      <attribute name="title">
-       <string>Curves</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QScrollArea" name="scrollArea_2">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>1</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAsNeeded</enum>
-         </property>
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents_3">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>969</width>
-            <height>467</height>
-           </rect>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_79" columnstretch="0,0,0,0,0,0">
-           <item row="3" column="4">
-            <spacer name="horizontalSpacer_29">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>5</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="2" column="4">
-            <spacer name="verticalSpacer_17">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="0" column="0" rowspan="4">
-            <layout class="QGridLayout" name="gridLayout_78">
-             <item row="0" column="1">
-              <widget class="QPushButton" name="curveEdit_1">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 1</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QPushButton" name="curveEdit_3">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 3</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QPushButton" name="resetCurve_2">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QCheckBox" name="plotCB_1">
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QPushButton" name="resetCurve_1">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QPushButton" name="resetCurve_3">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="2">
-              <widget class="QCheckBox" name="plotCB_3">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>128</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>128</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="0">
-              <widget class="QPushButton" name="resetCurve_5">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QPushButton" name="curveEdit_2">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 2</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="2">
-              <widget class="QCheckBox" name="plotCB_2">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="2">
-              <widget class="QCheckBox" name="plotCB_5">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QPushButton" name="resetCurve_4">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="QPushButton" name="curveEdit_4">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 4</string>
-               </property>
-              </widget>
-             </item>
-             <item row="14" column="0">
-              <widget class="QPushButton" name="resetCurve_15">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="14" column="1">
-              <widget class="QPushButton" name="curveEdit_15">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 15</string>
-               </property>
-              </widget>
-             </item>
-             <item row="14" column="2">
-              <widget class="QCheckBox" name="plotCB_15">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="15" column="0">
-              <widget class="QPushButton" name="resetCurve_16">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="15" column="1">
-              <widget class="QPushButton" name="curveEdit_16">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 16</string>
-               </property>
-              </widget>
-             </item>
-             <item row="15" column="2">
-              <widget class="QCheckBox" name="plotCB_16">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="0">
-              <widget class="QPushButton" name="resetCurve_6">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="1">
-              <widget class="QPushButton" name="curveEdit_6">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 6</string>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="2">
-              <widget class="QCheckBox" name="plotCB_6">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="2">
-              <widget class="QCheckBox" name="plotCB_4">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>128</green>
-                     <blue>128</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>128</green>
-                     <blue>128</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="1">
-              <widget class="QPushButton" name="curveEdit_5">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 5</string>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="0">
-              <widget class="QPushButton" name="resetCurve_11">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="9" column="2">
-              <widget class="QCheckBox" name="plotCB_10">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>123</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>123</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>123</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="1">
-              <widget class="QPushButton" name="curveEdit_9">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>128</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>128</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>128</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 9</string>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="1">
-              <widget class="QPushButton" name="curveEdit_11">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 11</string>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="2">
-              <widget class="QCheckBox" name="plotCB_11">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="11" column="0">
-              <widget class="QPushButton" name="resetCurve_12">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="11" column="2">
-              <widget class="QCheckBox" name="plotCB_12">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="11" column="1">
-              <widget class="QPushButton" name="curveEdit_12">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>255</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 12</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="0">
-              <widget class="QPushButton" name="resetCurve_7">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="1">
-              <widget class="QPushButton" name="curveEdit_7">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 7</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="2">
-              <widget class="QCheckBox" name="plotCB_7">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>127</green>
-                     <blue>127</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="0">
-              <widget class="QPushButton" name="resetCurve_8">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="1">
-              <widget class="QPushButton" name="curveEdit_8">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 8</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="2">
-              <widget class="QCheckBox" name="plotCB_8">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="0">
-              <widget class="QPushButton" name="resetCurve_9">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="2">
-              <widget class="QCheckBox" name="plotCB_9">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>128</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>128</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>127</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>0</red>
-                     <green>128</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="9" column="0">
-              <widget class="QPushButton" name="resetCurve_10">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="9" column="1">
-              <widget class="QPushButton" name="curveEdit_10">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>123</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>123</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>123</red>
-                     <green>0</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 10</string>
-               </property>
-              </widget>
-             </item>
-             <item row="12" column="0">
-              <widget class="QPushButton" name="resetCurve_13">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="12" column="1">
-              <widget class="QPushButton" name="curveEdit_13">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 13</string>
-               </property>
-              </widget>
-             </item>
-             <item row="12" column="2">
-              <widget class="QCheckBox" name="plotCB_13">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>127</red>
-                     <green>255</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="13" column="0">
-              <widget class="QPushButton" name="resetCurve_14">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="companion9x.qrc">
-                 <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>14</width>
-                 <height>14</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-             <item row="13" column="1">
-              <widget class="QPushButton" name="curveEdit_14">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>150</red>
-                     <green>147</green>
-                     <blue>145</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string>Curve 14</string>
-               </property>
-              </widget>
-             </item>
-             <item row="13" column="2">
-              <widget class="QCheckBox" name="plotCB_14">
-               <property name="palette">
-                <palette>
-                 <active>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </active>
-                 <inactive>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>255</green>
-                     <blue>255</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </inactive>
-                 <disabled>
-                  <colorrole role="WindowText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>146</red>
-                     <green>145</green>
-                     <blue>144</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Button">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>255</red>
-                     <green>0</green>
-                     <blue>0</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Text">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>165</red>
-                     <green>164</green>
-                     <blue>164</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="ButtonText">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>151</red>
-                     <green>150</green>
-                     <blue>149</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                  <colorrole role="Base">
-                   <brush brushstyle="SolidPattern">
-                    <color alpha="255">
-                     <red>244</red>
-                     <green>244</green>
-                     <blue>244</blue>
-                    </color>
-                   </brush>
-                  </colorrole>
-                 </disabled>
-                </palette>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="16" column="0" colspan="3">
-              <spacer name="verticalSpacer_16">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>5</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item row="0" column="1" rowspan="4">
-            <layout class="QGridLayout" name="gridLayout_7" rowstretch="0,0,0" columnstretch="1,0">
-             <item row="1" column="0">
-              <widget class="QLabel" name="curvetype_label">
-               <property name="text">
-                <string>Curve type</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QComboBox" name="curvetype_CB">
-               <item>
-                <property name="text">
-                 <string>3 points</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>3 points custom</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>5 points</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>5 points custom</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>9 points</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>9 points custom</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>17 points</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>17 points custom</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="cname_label">
-               <property name="text">
-                <string>Curve name</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QLineEdit" name="cname_LE">
-               <property name="maxLength">
-                <number>6</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0" colspan="2">
-              <widget class="QGraphicsView" name="curvePreview">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>400</width>
-                 <height>400</height>
-                </size>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="4" column="0" colspan="5">
-            <spacer name="verticalSpacer_5">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::MinimumExpanding</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>0</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="0" column="2" rowspan="4" colspan="2">
-            <layout class="QGridLayout" name="gridLayout_71">
-             <property name="horizontalSpacing">
-              <number>0</number>
-             </property>
-             <property name="verticalSpacing">
-              <number>2</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item row="15" column="1">
-              <widget class="QSpinBox" name="curvePt16_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="0">
-              <widget class="QSpinBox" name="curvePt08_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QSpinBox" name="curvePt01_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QSpinBox" name="curvePt02_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QSpinBox" name="curvePt01_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="QSpinBox" name="curvePt04_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QSpinBox" name="curvePt02_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="0">
-              <widget class="QSpinBox" name="curvePt07_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QSpinBox" name="curvePt03_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="1">
-              <widget class="QSpinBox" name="curvePt05_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QSpinBox" name="curvePt04_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="0">
-              <widget class="QSpinBox" name="curvePt05_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="1">
-              <widget class="QSpinBox" name="curvePt08_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="0">
-              <widget class="QSpinBox" name="curvePt09_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="16" column="1">
-              <widget class="QSpinBox" name="curvePt17_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="1">
-              <widget class="QSpinBox" name="curvePt09_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="9" column="0">
-              <widget class="QSpinBox" name="curvePt10_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="0">
-              <widget class="QSpinBox" name="curvePt06_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="1">
-              <widget class="QSpinBox" name="curvePt06_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="1">
-              <widget class="QSpinBox" name="curvePt07_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="14" column="0">
-              <widget class="QSpinBox" name="curvePt15_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="15" column="0">
-              <widget class="QSpinBox" name="curvePt16_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="9" column="1">
-              <widget class="QSpinBox" name="curvePt10_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="0">
-              <widget class="QSpinBox" name="curvePt11_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="1">
-              <widget class="QSpinBox" name="curvePt11_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="11" column="0">
-              <widget class="QSpinBox" name="curvePt12_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="11" column="1">
-              <widget class="QSpinBox" name="curvePt12_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="12" column="0">
-              <widget class="QSpinBox" name="curvePt13_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="12" column="1">
-              <widget class="QSpinBox" name="curvePt13_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="13" column="0">
-              <widget class="QSpinBox" name="curvePt14_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="13" column="1">
-              <widget class="QSpinBox" name="curvePt14_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="14" column="1">
-              <widget class="QSpinBox" name="curvePt15_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="16" column="0">
-              <widget class="QSpinBox" name="curvePt17_y">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QSpinBox" name="curvePt03_x">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-               </property>
-               <property name="accelerated">
-                <bool>true</bool>
-               </property>
-               <property name="minimum">
-                <number>-100</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="17" column="0" colspan="2">
-              <spacer name="verticalSpacer_23">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>5</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item row="0" column="5">
-            <spacer name="horizontalSpacer_5">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Expanding</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>5</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="0" column="4">
-            <widget class="QGroupBox" name="ca_GB">
-             <property name="font">
-              <font>
-               <weight>50</weight>
-               <bold>false</bold>
-              </font>
-             </property>
-             <property name="autoFillBackground">
-              <bool>false</bool>
-             </property>
-             <property name="title">
-              <string>Curve Creator</string>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_76" rowstretch="0,0,0,0,0,0,0,0">
-              <item row="4" column="0">
-               <widget class="QLabel" name="ca_ymax_label">
-                <property name="text">
-                 <string>Y at X=100</string>
-                </property>
-               </widget>
-              </item>
-              <item row="5" column="1" colspan="2">
-               <widget class="QComboBox" name="ca_side_CB">
-                <item>
-                 <property name="text">
-                  <string>Both</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>x&gt;0</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>x&lt;0</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="0" column="1" colspan="3">
-               <widget class="QComboBox" name="ca_ctype_CB">
-                <item>
-                 <property name="text">
-                  <string>Linear</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Single Expo</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Symmetrical f(x)=-f(-x)</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Symmetrical f(x)=f(-x)</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="7" column="0" colspan="4">
-               <layout class="QHBoxLayout" name="horizontalLayout_13">
-                <item>
-                 <spacer name="horizontalSpacer">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="ca_apply_PB">
-                  <property name="text">
-                   <string>Apply</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="horizontalSpacer_7">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-              <item row="5" column="0">
-               <widget class="QLabel" name="ca_side_label">
-                <property name="text">
-                 <string>Side</string>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="3">
-               <spacer name="horizontalSpacer_31">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="ca_ymin_label">
-                <property name="text">
-                 <string>Y at X=-100</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0">
-               <widget class="QLabel" name="ca_ymid_label">
-                <property name="text">
-                 <string>Y at X=0</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QSpinBox" name="ca_ymid_SB">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QLabel" name="ca_ctype_label">
-                <property name="text">
-                 <string>Curve type</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="ca_coeff_label">
-                <property name="text">
-                 <string>Coefficient</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QSpinBox" name="ca_coeff_SB">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="4" column="1">
-               <widget class="QSpinBox" name="ca_ymax_SB">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QSpinBox" name="ca_ymin_SB">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimum">
-                 <number>-100</number>
-                </property>
-                <property name="maximum">
-                 <number>100</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="clearMixesPB">
-         <property name="text">
-          <string>Clear All Curves</string>
-         </property>
-         <property name="icon">
-          <iconset resource="companion9x.qrc">
-           <normaloff>:/images/clear.png</normaloff>:/images/clear.png</iconset>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabCustomSwitches">
-      <attribute name="title">
-       <string>Custom switches</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_8" rowstretch="0" columnstretch="0">
-       <item row="0" column="0">
-        <widget class="QScrollArea" name="scrollArea_3">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>716</width>
-            <height>482</height>
-           </rect>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_74">
-           <item row="0" column="0">
-            <widget class="QGroupBox" name="cswitchGB1">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string/>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_26">
-              <item row="0" column="0">
-               <layout class="QGridLayout" name="gridLayout_21" rowstretch="0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0">
-                <item row="9" column="0">
-                 <widget class="QLabel" name="cswlabel_09">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS9</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="5">
-                 <widget class="QLabel" name="cswCol3">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Duration</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="15" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_15">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="13" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_13">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="15" column="0">
-                 <widget class="QLabel" name="cswlabel_15">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSF</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="14" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_14">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="13" column="0">
-                 <widget class="QLabel" name="cswlabel_13">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSD</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="4">
-                 <widget class="QLabel" name="cswCol3_1">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="midLineWidth">
-                   <number>0</number>
-                  </property>
-                  <property name="text">
-                   <string>AND</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                  <property name="margin">
-                   <number>3</number>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="3">
-                 <widget class="QLabel" name="cswCol2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>V2</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="2">
-                 <widget class="QLabel" name="cswCol1">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>V1</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="6" column="0">
-                 <widget class="QLabel" name="cswlabel_06">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS6</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="cswlabel_01">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="acceptDrops">
-                   <bool>false</bool>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS1</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="4" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_4">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="8" column="0">
-                 <widget class="QLabel" name="cswlabel_08">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS8</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="8" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_8">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="7" column="0">
-                 <widget class="QLabel" name="cswlabel_07">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS7</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="7" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_7">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="9" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_9">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="10" column="0">
-                 <widget class="QLabel" name="cswlabel_10">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSA</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="10" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_10">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="11" column="0">
-                 <widget class="QLabel" name="cswlabel_11">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSB</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="11" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_11">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="12" column="0">
-                 <widget class="QLabel" name="cswlabel_12">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSC</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="12" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_12">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="6" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_6">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_1">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="5" column="0">
-                 <widget class="QLabel" name="cswlabel_05">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS5</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="5" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_5">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_3">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QLabel" name="cswFuncLabel">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Function</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QLabel" name="cswlabel_03">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS3</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QLabel" name="cswlabel_02">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS2</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="14" column="0">
-                 <widget class="QLabel" name="cswlabel_14">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSE</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="16" column="0">
-                 <widget class="QLabel" name="cswlabel_16">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSG</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="16" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_16">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="4" column="0">
-                 <widget class="QLabel" name="cswlabel_04">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CS4</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="6">
-                 <widget class="QLabel" name="cswCol4">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Delay</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QGroupBox" name="cswitchGB2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string/>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_25">
-              <item row="0" column="0">
-               <layout class="QGridLayout" name="gridLayout_22" rowstretch="0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1">
-                <item row="15" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_31">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="16" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_32">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="14" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_30">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="13" column="0">
-                 <widget class="QLabel" name="cswlabel_29">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CST</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="13" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_29">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="9" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_25">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="4">
-                 <widget class="QLabel" name="cswCol3_12">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="midLineWidth">
-                   <number>0</number>
-                  </property>
-                  <property name="text">
-                   <string>AND</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                  <property name="margin">
-                   <number>3</number>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="3">
-                 <widget class="QLabel" name="cswCol2_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>V2</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="2">
-                 <widget class="QLabel" name="cswCol1_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>V1</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="6" column="0">
-                 <widget class="QLabel" name="cswlabel_22">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSM</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="9" column="0">
-                 <widget class="QLabel" name="cswlabel_25">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSP</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="cswlabel_17">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSH</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="4" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_20">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="8" column="0">
-                 <widget class="QLabel" name="cswlabel_24">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSO</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="7" column="0">
-                 <widget class="QLabel" name="cswlabel_23">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSN</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="7" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_23">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="10" column="0">
-                 <widget class="QLabel" name="cswlabel_26">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSQ</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="10" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_26">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="11" column="0">
-                 <widget class="QLabel" name="cswlabel_27">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSR</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="11" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_27">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="12" column="0">
-                 <widget class="QLabel" name="cswlabel_28">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSS</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="12" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_28">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="6" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_22">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_17">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="5" column="0">
-                 <widget class="QLabel" name="cswlabel_21">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSL</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_18">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_19">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="4" column="0">
-                 <widget class="QLabel" name="cswlabel_20">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSK</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QLabel" name="cswFuncLabel_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Function</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QLabel" name="cswlabel_19">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSJ</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QLabel" name="cswlabel_18">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSI</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="14" column="0">
-                 <widget class="QLabel" name="cswlabel_30">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSU</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="15" column="0">
-                 <widget class="QLabel" name="cswlabel_31">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSV</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="16" column="0">
-                 <widget class="QLabel" name="cswlabel_32">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="mouseTracking">
-                   <bool>true</bool>
-                  </property>
-                  <property name="contextMenuPolicy">
-                   <enum>Qt::CustomContextMenu</enum>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>CSW</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="8" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_24">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="5" column="1">
-                 <widget class="QComboBox" name="cswitchFunc_21">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="5">
-                 <widget class="QLabel" name="cswCol3_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Duration</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="6">
-                 <widget class="QLabel" name="cswCol4_2">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Delay</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="1" column="0" colspan="2">
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>1</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabSafetySwitches">
-      <attribute name="title">
-       <string>Safety Switches</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_402">
-       <item>
-        <widget class="QScrollArea" name="scrollArea_5">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents_4">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>163</width>
-            <height>354</height>
-           </rect>
-          </property>
-          <layout class="QGridLayout" name="grid_tabSafetySwitches" rowstretch="0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1" columnstretch="0,10,10">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_56">
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="midLineWidth">
-              <number>0</number>
-             </property>
-             <property name="text">
-              <string>Channel</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="margin">
-              <number>3</number>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QLabel" name="label_66">
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="midLineWidth">
-              <number>0</number>
-             </property>
-             <property name="text">
-              <string>Switch</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="margin">
-              <number>3</number>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="2">
-            <widget class="QLabel" name="label_80">
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="midLineWidth">
-              <number>0</number>
-             </property>
-             <property name="text">
-              <string>Value</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="margin">
-              <number>3</number>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_97">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH1</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_88">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH2</string>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="0">
-            <widget class="QLabel" name="label_85">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH3</string>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="0">
-            <widget class="QLabel" name="label_84">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH4</string>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="0">
-            <widget class="QLabel" name="label_89">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH5</string>
-             </property>
-            </widget>
-           </item>
-           <item row="6" column="0">
-            <widget class="QLabel" name="label_90">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH6</string>
-             </property>
-            </widget>
-           </item>
-           <item row="7" column="0">
-            <widget class="QLabel" name="label_86">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH7</string>
-             </property>
-            </widget>
-           </item>
-           <item row="8" column="0">
-            <widget class="QLabel" name="label_98">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH8</string>
-             </property>
-            </widget>
-           </item>
-           <item row="9" column="0">
-            <widget class="QLabel" name="label_91">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH9</string>
-             </property>
-            </widget>
-           </item>
-           <item row="10" column="0">
-            <widget class="QLabel" name="label_92">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH10</string>
-             </property>
-            </widget>
-           </item>
-           <item row="11" column="0">
-            <widget class="QLabel" name="label_83">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH11</string>
-             </property>
-            </widget>
-           </item>
-           <item row="12" column="0">
-            <widget class="QLabel" name="label_93">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH12</string>
-             </property>
-            </widget>
-           </item>
-           <item row="13" column="0">
-            <widget class="QLabel" name="label_94">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH13</string>
-             </property>
-            </widget>
-           </item>
-           <item row="14" column="0">
-            <widget class="QLabel" name="label_95">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH14</string>
-             </property>
-            </widget>
-           </item>
-           <item row="15" column="0">
-            <widget class="QLabel" name="label_87">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH15</string>
-             </property>
-            </widget>
-           </item>
-           <item row="16" column="0">
-            <widget class="QLabel" name="label_96">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::Panel</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Raised</enum>
-             </property>
-             <property name="text">
-              <string notr="true">CH16</string>
-             </property>
-            </widget>
-           </item>
-           <item row="17" column="0" colspan="3">
-            <spacer name="verticalSpacer_22">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>1</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabCustomFunctions">
-      <attribute name="title">
-       <string>Custom Functions</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_fswitches" columnstretch="0">
-       <item row="1" column="0">
-        <widget class="QScrollArea" name="scrollArea_4">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents_5">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>526</width>
-            <height>48</height>
-           </rect>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_75">
-           <item row="0" column="0">
-            <widget class="QGroupBox" name="FSwitchGB1">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string/>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_24">
-              <item row="0" column="0">
-               <layout class="QGridLayout" name="fswitchlayout1" columnstretch="0,0,1,1,0">
-                <property name="sizeConstraint">
-                 <enum>QLayout::SetNoConstraint</enum>
-                </property>
-                <item row="0" column="1">
-                 <widget class="QLabel" name="fswFuncLabel_3">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Switch</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="2">
-                 <widget class="QLabel" name="fswFuncLabel_2">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Function</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="3">
-                 <widget class="QLabel" name="fswFuncLabel_4">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Param</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="4">
-                 <widget class="QLabel" name="fsw_en1">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Enable</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="0">
-                 <spacer name="horizontalSpacer_2">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QGroupBox" name="FSwitchGB2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string/>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_23">
-              <item row="0" column="0">
-               <layout class="QGridLayout" name="fswitchlayout2" columnstretch="0,0,1,1,0">
-                <property name="sizeConstraint">
-                 <enum>QLayout::SetNoConstraint</enum>
-                </property>
-                <item row="0" column="0">
-                 <spacer name="horizontalSpacer_4">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QLabel" name="fswFuncLabel_5">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Switch</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="2">
-                 <widget class="QLabel" name="fswFuncLabel_6">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Function</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="3">
-                 <widget class="QLabel" name="fswFuncLabel_7">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Param</string>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="4">
-                 <widget class="QLabel" name="fsw_en2">
-                  <property name="frameShape">
-                   <enum>QFrame::Panel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string>Enable</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="1" column="0" colspan="2">
-            <spacer name="verticalSpacer_14">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>579</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabTelemetry">
-      <attribute name="title">
-       <string>Telemetry</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_33">
-       <item row="0" column="0">
-        <layout class="QGridLayout" name="gridLayout_3">
-         <item row="4" column="0">
-          <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,1">
-           <property name="sizeConstraint">
-            <enum>QLayout::SetMinimumSize</enum>
-           </property>
-           <item>
-            <widget class="QGroupBox" name="serialGB">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string>Serial Protocol</string>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_5">
-              <property name="topMargin">
-               <number>1</number>
-              </property>
-              <property name="bottomMargin">
-               <number>1</number>
-              </property>
-              <item>
-               <layout class="QGridLayout" name="gridLayout_29" columnstretch="0,1,1,1">
-                <item row="2" column="0">
-                 <widget class="QLabel" name="label_3">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Volt source</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QComboBox" name="frskyUnitsCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>Metric</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Imperial</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="2" column="2">
-                 <widget class="QLabel" name="current_label">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="minimumSize">
-                   <size>
-                    <width>0</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string>Current source</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="0">
-                 <widget class="QLabel" name="label_111">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="minimumSize">
-                   <size>
-                    <width>100</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string>Protocol</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="3">
-                 <widget class="QComboBox" name="frskyCurrentCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>NONE</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>A1</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>A2</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>FAS</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="0" column="1" colspan="3">
-                 <widget class="QComboBox" name="frskyProtoCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>None</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>FrSky Sensor Hub</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="2" column="1">
-                 <widget class="QComboBox" name="frskyVoltCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>A1</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>A2</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>FAS</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>CEL</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="1" column="3">
-                 <widget class="QComboBox" name="frskyBladesCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>2</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>3</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>4</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="label_110">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="minimumSize">
-                   <size>
-                    <width>0</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string>Units</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="2">
-                 <widget class="QLabel" name="blades_label">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Blades</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="altimetryGB">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string>Altimetry / Vario</string>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_31">
-              <property name="topMargin">
-               <number>1</number>
-              </property>
-              <property name="bottomMargin">
-               <number>1</number>
-              </property>
-              <item row="0" column="0">
-               <layout class="QGridLayout" name="gridLayout_30" rowstretch="1,0,0" columnstretch="0,0">
-                <item row="0" column="1">
-                 <widget class="QComboBox" name="varioSourceCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>Alti</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Alti+</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Vario</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>A1</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>A2</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <layout class="QGridLayout" name="gridLayout_65" columnstretch="1,0,0,0">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="VarioLabel_1">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Sink Max</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QDoubleSpinBox" name="varioLimitCenterMin_DSB">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="decimals">
-                     <number>1</number>
-                    </property>
-                    <property name="minimum">
-                     <double>-2.000000000000000</double>
-                    </property>
-                    <property name="maximum">
-                     <double>0.000000000000000</double>
-                    </property>
-                    <property name="singleStep">
-                     <double>0.100000000000000</double>
-                    </property>
-                    <property name="value">
-                     <double>-0.500000000000000</double>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="2">
-                   <widget class="QDoubleSpinBox" name="varioLimitCenterMax_DSB">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="decimals">
-                     <number>1</number>
-                    </property>
-                    <property name="minimum">
-                     <double>-1.000000000000000</double>
-                    </property>
-                    <property name="maximum">
-                     <double>2.000000000000000</double>
-                    </property>
-                    <property name="singleStep">
-                     <double>0.100000000000000</double>
-                    </property>
-                    <property name="value">
-                     <double>0.500000000000000</double>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="3">
-                   <widget class="QDoubleSpinBox" name="varioLimitMax_DSB">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="decimals">
-                     <number>0</number>
-                    </property>
-                    <property name="minimum">
-                     <double>3.000000000000000</double>
-                    </property>
-                    <property name="maximum">
-                     <double>17.000000000000000</double>
-                    </property>
-                    <property name="value">
-                     <double>10.000000000000000</double>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QDoubleSpinBox" name="varioLimitMin_DSB">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="decimals">
-                     <number>0</number>
-                    </property>
-                    <property name="minimum">
-                     <double>-17.000000000000000</double>
-                    </property>
-                    <property name="maximum">
-                     <double>-3.000000000000000</double>
-                    </property>
-                    <property name="value">
-                     <double>-10.000000000000000</double>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QCheckBox" name="varioLimitMinOff_ChkB">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Off</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="3">
-                   <widget class="QLabel" name="VarioLabel_4">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Climb Max</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QLabel" name="VarioLabel_2">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Sink Min</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="2">
-                   <widget class="QLabel" name="VarioLabel_3">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Climb Min</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item row="0" column="0">
-                 <widget class="QLabel" name="varioSource_label">
-                  <property name="text">
-                   <string>Vario source</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="varioLimit_label">
-                  <property name="text">
-                   <string>Vario limits</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0" colspan="2">
-                 <layout class="QHBoxLayout" name="horizontalLayout_15">
-                  <item>
-                   <widget class="QCheckBox" name="AltitudeGPS_ChkB">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Use GPS as altitude source</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QCheckBox" name="AltitudeToolbar_ChkB">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Display altitude in toolbar</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="1" column="0">
-          <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,1,0">
-           <property name="sizeConstraint">
-            <enum>QLayout::SetMinimumSize</enum>
-           </property>
-           <item>
-            <widget class="QGroupBox" name="groupBox">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="autoFillBackground">
-              <bool>true</bool>
-             </property>
-             <property name="styleSheet">
-              <string notr="true"/>
-             </property>
-             <property name="title">
-              <string>A1</string>
-             </property>
-             <property name="flat">
-              <bool>false</bool>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_2">
-              <property name="topMargin">
-               <number>1</number>
-              </property>
-              <property name="bottomMargin">
-               <number>1</number>
-              </property>
-              <item>
-               <layout class="QGridLayout" name="gridLayout_9" columnstretch="0,1,0,1" columnminimumwidth="0,0,90,0">
-                <item row="0" column="0">
-                 <widget class="QLabel" name="label_916">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Unit</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="label_A1Max">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Max Value</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QLabel" name="label_913">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Alarm 1    </string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="1">
-                 <widget class="QComboBox" name="a11LevelCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>----</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Yellow</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Orange</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Red</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="2" column="2">
-                 <widget class="QComboBox" name="a11GreaterCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>&lt;</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>&gt;</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QLabel" name="label_915">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Alarm 2</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="1">
-                 <widget class="QComboBox" name="a12LevelCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>----</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Yellow</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Orange</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Red</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="3" column="2">
-                 <widget class="QComboBox" name="a12GreaterCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>&lt;</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>&gt;</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="1" column="2">
-                 <widget class="QLabel" name="a1CalibLabel">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Min Value</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QDoubleSpinBox" name="a1RatioSB">
-                  <property name="enabled">
-                   <bool>true</bool>
-                  </property>
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="decimals">
-                   <number>0</number>
-                  </property>
-                  <property name="maximum">
-                   <double>255.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="3">
-                 <widget class="QDoubleSpinBox" name="a1CalibSB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="decimals">
-                   <number>2</number>
-                  </property>
-                  <property name="minimum">
-                   <double>-12.800000000000001</double>
-                  </property>
-                  <property name="maximum">
-                   <double>12.699999999999999</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.100000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="3">
-                 <widget class="QDoubleSpinBox" name="a11ValueSB">
-                  <property name="enabled">
-                   <bool>true</bool>
-                  </property>
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="decimals">
-                   <number>0</number>
-                  </property>
-                  <property name="maximum">
-                   <double>255.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="3">
-                 <widget class="QDoubleSpinBox" name="a12ValueSB">
-                  <property name="enabled">
-                   <bool>true</bool>
-                  </property>
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="decimals">
-                   <number>0</number>
-                  </property>
-                  <property name="maximum">
-                   <double>255.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1" colspan="3">
-                 <widget class="QComboBox" name="a1UnitCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>Volts (V)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Amps (A)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Speed (m/s or ft/s)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Raw (-)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Speed (km/h or miles/h)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Meters (m or ft)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Temp (°)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Fuel (%)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>mAmps (mA)</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="groupBox_2">
-             <property name="title">
-              <string>A2</string>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout">
-              <property name="topMargin">
-               <number>1</number>
-              </property>
-              <property name="bottomMargin">
-               <number>1</number>
-              </property>
-              <item>
-               <layout class="QGridLayout" name="gridLayout_10" columnstretch="0,1,1,1">
-                <item row="0" column="0">
-                 <widget class="QLabel" name="label_920">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Unit</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="0">
-                 <widget class="QLabel" name="label_A2Max">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Max Value</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QLabel" name="label_922">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Alarm 1    </string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="1">
-                 <widget class="QComboBox" name="a21LevelCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>----</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Yellow</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Orange</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Red</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="2" column="2">
-                 <widget class="QComboBox" name="a21GreaterCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>&lt;</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>&gt;</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QLabel" name="label_923">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Alarm 2</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="1">
-                 <widget class="QComboBox" name="a22LevelCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>----</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Yellow</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Orange</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Red</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="3" column="2">
-                 <widget class="QComboBox" name="a22GreaterCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>&lt;</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>&gt;</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-                <item row="1" column="2">
-                 <widget class="QLabel" name="a2CalibLabel">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Min Value</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QDoubleSpinBox" name="a2RatioSB">
-                  <property name="enabled">
-                   <bool>true</bool>
-                  </property>
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="decimals">
-                   <number>0</number>
-                  </property>
-                  <property name="maximum">
-                   <double>255.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="3">
-                 <widget class="QDoubleSpinBox" name="a2CalibSB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="decimals">
-                   <number>2</number>
-                  </property>
-                  <property name="minimum">
-                   <double>-0.800000000000000</double>
-                  </property>
-                  <property name="maximum">
-                   <double>0.700000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.100000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="3">
-                 <widget class="QDoubleSpinBox" name="a21ValueSB">
-                  <property name="enabled">
-                   <bool>true</bool>
-                  </property>
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="decimals">
-                   <number>0</number>
-                  </property>
-                  <property name="maximum">
-                   <double>255.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="3">
-                 <widget class="QDoubleSpinBox" name="a22ValueSB">
-                  <property name="enabled">
-                   <bool>true</bool>
-                  </property>
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="decimals">
-                   <number>0</number>
-                  </property>
-                  <property name="maximum">
-                   <double>255.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1" colspan="3">
-                 <widget class="QComboBox" name="a2UnitCB">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <item>
-                   <property name="text">
-                    <string>Volts (V)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Amps (A)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Speed (m/s or ft/s)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Raw (-)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Speed (km/h or miles/h)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Meters (m or ft)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Temp (°)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Fuel (%)</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>mAmps (mA)</string>
-                   </property>
-                  </item>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="RSSIGB">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string>RSSI</string>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_4">
-              <item row="0" column="0">
-               <widget class="QLabel" name="label_914">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true"/>
-                </property>
-                <property name="text">
-                 <string>Alarm 1</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QComboBox" name="rssiAlarm1CB">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>----</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Yellow</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Orange</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Red</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="0" column="2">
-               <widget class="QSpinBox" name="rssiAlarm1SB">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="suffix">
-                 <string/>
-                </property>
-                <property name="minimum">
-                 <number>20</number>
-                </property>
-                <property name="maximum">
-                 <number>80</number>
-                </property>
-                <property name="singleStep">
-                 <number>1</number>
-                </property>
-                <property name="value">
-                 <number>50</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="label_917">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Alarm 2</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QComboBox" name="rssiAlarm2CB">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>----</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Yellow</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Orange</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Red</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
-              <item row="1" column="2">
-               <widget class="QSpinBox" name="rssiAlarm2SB">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="suffix">
-                 <string/>
-                </property>
-                <property name="minimum">
-                 <number>20</number>
-                </property>
-                <property name="maximum">
-                 <number>80</number>
-                </property>
-                <property name="singleStep">
-                 <number>1</number>
-                </property>
-                <property name="value">
-                 <number>50</number>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <spacer name="verticalSpacer_15">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>20</width>
-                  <height>40</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="5" column="0">
-          <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <item>
-            <widget class="QGroupBox" name="groupBox_5">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string/>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_5">
-              <property name="topMargin">
-               <number>1</number>
-              </property>
-              <property name="bottomMargin">
-               <number>1</number>
-              </property>
-              <item row="0" column="0" colspan="2">
-               <widget class="QTabWidget" name="tabCsView">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="currentIndex">
-                 <number>0</number>
-                </property>
-                <widget class="QWidget" name="tab">
-                 <attribute name="title">
-                  <string>Telemetry screen 1</string>
-                 </attribute>
-                 <layout class="QGridLayout" name="gridLayout_35">
-                  <item row="0" column="0" colspan="2">
-                   <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,0,1">
-                    <item>
-                     <widget class="QLabel" name="telemetryCS1Type_LABEL">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
-                      <property name="minimumSize">
-                       <size>
-                        <width>0</width>
-                        <height>0</height>
-                       </size>
-                      </property>
-                      <property name="text">
-                       <string>Custom Screen Type</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QComboBox" name="telemetryCSType1">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
-                      <property name="minimumSize">
-                       <size>
-                        <width>90</width>
-                        <height>0</height>
-                       </size>
-                      </property>
-                      <item>
-                       <property name="text">
-                        <string>Nums</string>
-                       </property>
-                      </item>
-                      <item>
-                       <property name="text">
-                        <string>Bars</string>
-                       </property>
-                      </item>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_16">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QGroupBox" name="CS1Nums">
-                    <layout class="QGridLayout" name="telemetryCS1Nums">
-                     <item row="1" column="0">
-                      <widget class="QComboBox" name="telemetryCS1F2_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="0">
-                      <widget class="QComboBox" name="telemetryCS1F1_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="0">
-                      <widget class="QComboBox" name="telemetryCS1F3_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="2">
-                      <widget class="QComboBox" name="telemetryCS1F9_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QComboBox" name="telemetryCS1F4_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="1">
-                      <widget class="QComboBox" name="telemetryCS1F5_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="1">
-                      <widget class="QComboBox" name="telemetryCS1F6_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QComboBox" name="telemetryCS1F10_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="1">
-                      <widget class="QComboBox" name="telemetryCS1F7_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="1">
-                      <widget class="QComboBox" name="telemetryCS1F8_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="2">
-                      <widget class="QComboBox" name="telemetryCS1F11_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="2">
-                      <widget class="QComboBox" name="telemetryCS1F12_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                    </layout>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QGroupBox" name="CS1Bars">
-                    <layout class="QGridLayout" name="telemetryCS1Bars" columnstretch="1,0,1,0">
-                     <item row="0" column="0">
-                      <widget class="QLabel" name="label_265">
-                       <property name="text">
-                        <string>Source</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="1">
-                      <widget class="QLabel" name="label_266">
-                       <property name="text">
-                        <string>Min</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="2">
-                      <widget class="QLabel" name="label_267">
-                       <property name="text">
-                        <string>Gauge</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="3">
-                      <widget class="QLabel" name="label_268">
-                       <property name="text">
-                        <string>Max</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="0">
-                      <widget class="QComboBox" name="telBarCS1B1_CB"/>
-                     </item>
-                     <item row="1" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS1SB1">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QLabel" name="telBarCS1BAR1">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 1</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS1SB1">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="0">
-                      <widget class="QComboBox" name="telBarCS1B2_CB"/>
-                     </item>
-                     <item row="2" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS1SB2">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="2">
-                      <widget class="QLabel" name="telBarCS1BAR2">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 2</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS1SB2">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QComboBox" name="telBarCS1B3_CB"/>
-                     </item>
-                     <item row="3" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS1SB3">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="2">
-                      <widget class="QLabel" name="telBarCS1BAR3">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 3</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="3" rowspan="2">
-                      <widget class="QDoubleSpinBox" name="telMaxCS1SB3">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="4" column="0" rowspan="2">
-                      <widget class="QComboBox" name="telBarCS1B4_CB"/>
-                     </item>
-                     <item row="4" column="1" rowspan="2">
-                      <widget class="QDoubleSpinBox" name="telMinCS1SB4">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="2">
-                      <widget class="QLabel" name="telBarCS1BAR4">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 4</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS1SB4">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                    </layout>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-                <widget class="QWidget" name="tab_2">
-                 <attribute name="title">
-                  <string>Telemetry screen 2</string>
-                 </attribute>
-                 <layout class="QGridLayout" name="gridLayout_36">
-                  <item row="1" column="0">
-                   <widget class="QGroupBox" name="CS2Nums">
-                    <layout class="QGridLayout" name="telemetryCS2Nums">
-                     <item row="1" column="0">
-                      <widget class="QComboBox" name="telemetryCS2F2_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="0">
-                      <widget class="QComboBox" name="telemetryCS2F1_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="0">
-                      <widget class="QComboBox" name="telemetryCS2F3_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="2">
-                      <widget class="QComboBox" name="telemetryCS2F9_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QComboBox" name="telemetryCS2F4_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="1">
-                      <widget class="QComboBox" name="telemetryCS2F5_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="1">
-                      <widget class="QComboBox" name="telemetryCS2F6_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="1">
-                      <widget class="QComboBox" name="telemetryCS2F7_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="1">
-                      <widget class="QComboBox" name="telemetryCS2F8_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QComboBox" name="telemetryCS2F10_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="2">
-                      <widget class="QComboBox" name="telemetryCS2F11_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="2">
-                      <widget class="QComboBox" name="telemetryCS2F12_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                    </layout>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QGroupBox" name="CS2Bars">
-                    <layout class="QGridLayout" name="telemetryCS2Bars" columnstretch="1,0,1,0">
-                     <item row="0" column="0">
-                      <widget class="QLabel" name="label_285">
-                       <property name="text">
-                        <string>Source</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="1">
-                      <widget class="QLabel" name="label_286">
-                       <property name="text">
-                        <string>Min</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="2">
-                      <widget class="QLabel" name="label_287">
-                       <property name="text">
-                        <string>Gauge</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="3">
-                      <widget class="QLabel" name="label_288">
-                       <property name="text">
-                        <string>Max</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="0">
-                      <widget class="QComboBox" name="telBarCS2B1_CB"/>
-                     </item>
-                     <item row="1" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS2SB1">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QLabel" name="telBarCS2BAR1">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 1</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS2SB1">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="0">
-                      <widget class="QComboBox" name="telBarCS2B2_CB"/>
-                     </item>
-                     <item row="2" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS2SB2">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="2">
-                      <widget class="QLabel" name="telBarCS2BAR2">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 2</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS2SB2">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QComboBox" name="telBarCS2B3_CB"/>
-                     </item>
-                     <item row="3" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS2SB3">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="2">
-                      <widget class="QLabel" name="telBarCS2BAR3">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 3</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="3" rowspan="2">
-                      <widget class="QDoubleSpinBox" name="telMaxCS2SB3">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="4" column="0" rowspan="2">
-                      <widget class="QComboBox" name="telBarCS2B4_CB"/>
-                     </item>
-                     <item row="4" column="1" rowspan="2">
-                      <widget class="QDoubleSpinBox" name="telMinCS2SB4">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="2">
-                      <widget class="QLabel" name="telBarCS2BAR4">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 4</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS2SB4">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                    </layout>
-                   </widget>
-                  </item>
-                  <item row="0" column="0" colspan="2">
-                   <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,1">
-                    <item>
-                     <widget class="QLabel" name="telemetryCS2Type_LABEL">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
-                      <property name="text">
-                       <string>Custom Screen Type</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QComboBox" name="telemetryCSType2">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
-                      <property name="minimumSize">
-                       <size>
-                        <width>90</width>
-                        <height>0</height>
-                       </size>
-                      </property>
-                      <item>
-                       <property name="text">
-                        <string>Nums</string>
-                       </property>
-                      </item>
-                      <item>
-                       <property name="text">
-                        <string>Bars</string>
-                       </property>
-                      </item>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_17">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                 </layout>
-                </widget>
-                <widget class="QWidget" name="tab_3">
-                 <attribute name="title">
-                  <string>Telemetry screen 3</string>
-                 </attribute>
-                 <layout class="QGridLayout" name="gridLayout_32">
-                  <item row="0" column="0" colspan="2">
-                   <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="0,0,1">
-                    <item>
-                     <widget class="QLabel" name="telemetryCS3Type_LABEL">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
-                      <property name="text">
-                       <string>Custom Screen Type</string>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QComboBox" name="telemetryCSType3">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
-                      <property name="minimumSize">
-                       <size>
-                        <width>90</width>
-                        <height>0</height>
-                       </size>
-                      </property>
-                      <item>
-                       <property name="text">
-                        <string>Nums</string>
-                       </property>
-                      </item>
-                      <item>
-                       <property name="text">
-                        <string>Bars</string>
-                       </property>
-                      </item>
-                     </widget>
-                    </item>
-                    <item>
-                     <spacer name="horizontalSpacer_18">
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" stdset="0">
-                       <size>
-                        <width>40</width>
-                        <height>20</height>
-                       </size>
-                      </property>
-                     </spacer>
-                    </item>
-                   </layout>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QGroupBox" name="CS3Nums">
-                    <layout class="QGridLayout" name="telemetryCS3Nums">
-                     <item row="1" column="0">
-                      <widget class="QComboBox" name="telemetryCS3F2_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="0">
-                      <widget class="QComboBox" name="telemetryCS3F1_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="0">
-                      <widget class="QComboBox" name="telemetryCS3F3_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="2">
-                      <widget class="QComboBox" name="telemetryCS3F9_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QComboBox" name="telemetryCS3F4_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="1">
-                      <widget class="QComboBox" name="telemetryCS3F5_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="1">
-                      <widget class="QComboBox" name="telemetryCS3F6_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="1">
-                      <widget class="QComboBox" name="telemetryCS3F7_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="1">
-                      <widget class="QComboBox" name="telemetryCS3F8_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QComboBox" name="telemetryCS3F10_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="2">
-                      <widget class="QComboBox" name="telemetryCS3F11_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="2">
-                      <widget class="QComboBox" name="telemetryCS3F12_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                    </layout>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QGroupBox" name="CS3Bars">
-                    <layout class="QGridLayout" name="telemetryCS3Bars" columnstretch="1,0,1,0">
-                     <item row="0" column="0">
-                      <widget class="QLabel" name="label_277">
-                       <property name="text">
-                        <string>Source</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="1">
-                      <widget class="QLabel" name="label_278">
-                       <property name="text">
-                        <string>Min</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="2">
-                      <widget class="QLabel" name="label_279">
-                       <property name="text">
-                        <string>Gauge</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="3">
-                      <widget class="QLabel" name="label_280">
-                       <property name="text">
-                        <string>Max</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="0">
-                      <widget class="QComboBox" name="telBarCS3B1_CB">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS3SB1">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QLabel" name="telBarCS3BAR1">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 1</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS3SB1">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="0">
-                      <widget class="QComboBox" name="telBarCS3B2_CB"/>
-                     </item>
-                     <item row="2" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS3SB2">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="2">
-                      <widget class="QLabel" name="telBarCS3BAR2">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 2</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS3SB2">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QComboBox" name="telBarCS3B3_CB"/>
-                     </item>
-                     <item row="3" column="1">
-                      <widget class="QDoubleSpinBox" name="telMinCS3SB3">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="2">
-                      <widget class="QLabel" name="telBarCS3BAR3">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 3</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="3" rowspan="2">
-                      <widget class="QDoubleSpinBox" name="telMaxCS3SB3">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="4" column="0" rowspan="2">
-                      <widget class="QComboBox" name="telBarCS3B4_CB"/>
-                     </item>
-                     <item row="4" column="1" rowspan="2">
-                      <widget class="QDoubleSpinBox" name="telMinCS3SB4">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="2">
-                      <widget class="QLabel" name="telBarCS3BAR4">
-                       <property name="autoFillBackground">
-                        <bool>false</bool>
-                       </property>
-                       <property name="styleSheet">
-                        <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
-</string>
-                       </property>
-                       <property name="frameShape">
-                        <enum>QFrame::Panel</enum>
-                       </property>
-                       <property name="frameShadow">
-                        <enum>QFrame::Raised</enum>
-                       </property>
-                       <property name="text">
-                        <string>Gauge 4</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="3">
-                      <widget class="QDoubleSpinBox" name="telMaxCS3SB4">
-                       <property name="decimals">
-                        <number>0</number>
-                       </property>
-                      </widget>
-                     </item>
-                    </layout>
-                   </widget>
-                  </item>
-                 </layout>
-                </widget>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0">
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>1</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabTemplates">
-      <attribute name="title">
-       <string>Templates</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_19">
-       <item row="0" column="0">
-        <widget class="QListWidget" name="templateList"/>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>modelNameLE</tabstop>
-  <tabstop>modelVoice_SB</tabstop>
-  <tabstop>timer1ValTE</tabstop>
-  <tabstop>timer1DirCB</tabstop>
-  <tabstop>timer1ModeCB</tabstop>
-  <tabstop>timer1ModeBCB</tabstop>
-  <tabstop>timer1Perm</tabstop>
-  <tabstop>timer1Minute</tabstop>
-  <tabstop>timer1CountDownBeep</tabstop>
-  <tabstop>timer2ValTE</tabstop>
-  <tabstop>timer2DirCB</tabstop>
-  <tabstop>timer2ModeCB</tabstop>
-  <tabstop>timer2ModeBCB</tabstop>
-  <tabstop>timer2Perm</tabstop>
-  <tabstop>timer2Minute</tabstop>
-  <tabstop>timer2CountDownBeep</tabstop>
-  <tabstop>swwarn0_CB</tabstop>
-  <tabstop>swwarn1_ChkB</tabstop>
-  <tabstop>swwarn2_ChkB</tabstop>
-  <tabstop>swwarn3_ChkB</tabstop>
-  <tabstop>swwarn4_CB</tabstop>
-  <tabstop>swwarn5_ChkB</tabstop>
-  <tabstop>swwarn6_ChkB</tabstop>
-  <tabstop>tswwarn0_CB</tabstop>
-  <tabstop>chkSA</tabstop>
-  <tabstop>chkSB</tabstop>
-  <tabstop>chkSC</tabstop>
-  <tabstop>chkSD</tabstop>
-  <tabstop>chkSE</tabstop>
-  <tabstop>chkSF</tabstop>
-  <tabstop>chkSG</tabstop>
-  <tabstop>bcRUDChkB</tabstop>
-  <tabstop>bcELEChkB</tabstop>
-  <tabstop>bcTHRChkB</tabstop>
-  <tabstop>bcAILChkB</tabstop>
-  <tabstop>bcP1ChkB</tabstop>
-  <tabstop>bcP2ChkB</tabstop>
-  <tabstop>bcP3ChkB</tabstop>
-  <tabstop>bcP4ChkB</tabstop>
-  <tabstop>bcREaChkB</tabstop>
-  <tabstop>bcREbChkB</tabstop>
-  <tabstop>swashTypeCB</tabstop>
-  <tabstop>swashCollectiveCB</tabstop>
-  <tabstop>swashRingValSB</tabstop>
-  <tabstop>swashInvertELE</tabstop>
-  <tabstop>swashInvertAIL</tabstop>
-  <tabstop>swashInvertCOL</tabstop>
-  <tabstop>phase0Name</tabstop>
-  <tabstop>phase0Trim2Slider</tabstop>
-  <tabstop>phase0Trim1Slider</tabstop>
-  <tabstop>phase0Trim4Slider</tabstop>
-  <tabstop>phase0Trim3Slider</tabstop>
-  <tabstop>phase0Trim2Value</tabstop>
-  <tabstop>phase0Trim3Value</tabstop>
-  <tabstop>phase0Trim1Value</tabstop>
-  <tabstop>phase0Trim4Value</tabstop>
-  <tabstop>phase0GV1Source</tabstop>
-  <tabstop>phase0GV1Name</tabstop>
-  <tabstop>phase0GV1Value</tabstop>
-  <tabstop>phase0GV2Source</tabstop>
-  <tabstop>phase0GV2Name</tabstop>
-  <tabstop>phase0GV2Value</tabstop>
-  <tabstop>phase0GV3Source</tabstop>
-  <tabstop>phase0GV3Name</tabstop>
-  <tabstop>phase0GV3Value</tabstop>
-  <tabstop>phase0GV4Source</tabstop>
-  <tabstop>phase0GV4Name</tabstop>
-  <tabstop>phase0GV4Value</tabstop>
-  <tabstop>phase0GV5Source</tabstop>
-  <tabstop>phase0GV5Name</tabstop>
-  <tabstop>phase0GV5Value</tabstop>
-  <tabstop>phase0RE1Value</tabstop>
-  <tabstop>phase0RE2Value</tabstop>
-  <tabstop>phase1Name</tabstop>
-  <tabstop>phase1Switch</tabstop>
-  <tabstop>phase1Trim2Slider</tabstop>
-  <tabstop>phase1Trim1Slider</tabstop>
-  <tabstop>phase1Trim4Slider</tabstop>
-  <tabstop>phase1Trim3Slider</tabstop>
-  <tabstop>phase1Trim2Use</tabstop>
-  <tabstop>phase1Trim2Value</tabstop>
-  <tabstop>phase1Trim3Use</tabstop>
-  <tabstop>phase1Trim3Value</tabstop>
-  <tabstop>phase1Trim1Use</tabstop>
-  <tabstop>phase1Trim1Value</tabstop>
-  <tabstop>phase1Trim4Use</tabstop>
-  <tabstop>phase1Trim4Value</tabstop>
-  <tabstop>phase1GV1Use</tabstop>
-  <tabstop>phase1GV1Value</tabstop>
-  <tabstop>phase1GV2Use</tabstop>
-  <tabstop>phase1GV2Value</tabstop>
-  <tabstop>phase1GV3Use</tabstop>
-  <tabstop>phase1GV3Value</tabstop>
-  <tabstop>phase1GV4Use</tabstop>
-  <tabstop>phase1GV4Value</tabstop>
-  <tabstop>phase1GV5Use</tabstop>
-  <tabstop>phase1GV5Value</tabstop>
-  <tabstop>phase1RE1Use</tabstop>
-  <tabstop>phase1RE1Value</tabstop>
-  <tabstop>phase1RE2Use</tabstop>
-  <tabstop>phase1RE2Value</tabstop>
-  <tabstop>phase2Name</tabstop>
-  <tabstop>phase2Switch</tabstop>
-  <tabstop>phase2Trim2Slider</tabstop>
-  <tabstop>phase2Trim1Slider</tabstop>
-  <tabstop>phase2Trim4Slider</tabstop>
-  <tabstop>phase2Trim3Slider</tabstop>
-  <tabstop>phase2Trim2Use</tabstop>
-  <tabstop>phase2Trim2Value</tabstop>
-  <tabstop>phase2Trim3Use</tabstop>
-  <tabstop>phase2Trim3Value</tabstop>
-  <tabstop>phase2Trim1Use</tabstop>
-  <tabstop>phase2Trim1Value</tabstop>
-  <tabstop>phase2Trim4Use</tabstop>
-  <tabstop>phase2Trim4Value</tabstop>
-  <tabstop>phase2GV1Use</tabstop>
-  <tabstop>phase2GV1Value</tabstop>
-  <tabstop>phase2GV2Use</tabstop>
-  <tabstop>phase2GV2Value</tabstop>
-  <tabstop>phase2GV3Use</tabstop>
-  <tabstop>phase2GV3Value</tabstop>
-  <tabstop>phase2GV4Use</tabstop>
-  <tabstop>phase2GV4Value</tabstop>
-  <tabstop>phase2GV5Use</tabstop>
-  <tabstop>phase2GV5Value</tabstop>
-  <tabstop>phase2RE1Use</tabstop>
-  <tabstop>phase2RE1Value</tabstop>
-  <tabstop>phase2RE2Use</tabstop>
-  <tabstop>phase2RE2Value</tabstop>
-  <tabstop>phase3Name</tabstop>
-  <tabstop>phase3Switch</tabstop>
-  <tabstop>phase3Trim2Slider</tabstop>
-  <tabstop>phase3Trim1Slider</tabstop>
-  <tabstop>phase3Trim4Slider</tabstop>
-  <tabstop>phase3Trim3Slider</tabstop>
-  <tabstop>phase3Trim2Use</tabstop>
-  <tabstop>phase3Trim2Value</tabstop>
-  <tabstop>phase3Trim3Use</tabstop>
-  <tabstop>phase3Trim3Value</tabstop>
-  <tabstop>phase3Trim1Use</tabstop>
-  <tabstop>phase3Trim1Value</tabstop>
-  <tabstop>phase3Trim4Use</tabstop>
-  <tabstop>phase3Trim4Value</tabstop>
-  <tabstop>phase3GV1Use</tabstop>
-  <tabstop>phase3GV1Value</tabstop>
-  <tabstop>phase3GV2Use</tabstop>
-  <tabstop>phase3GV2Value</tabstop>
-  <tabstop>phase3GV3Use</tabstop>
-  <tabstop>phase3GV3Value</tabstop>
-  <tabstop>phase3GV4Use</tabstop>
-  <tabstop>phase3GV4Value</tabstop>
-  <tabstop>phase3GV5Use</tabstop>
-  <tabstop>phase3GV5Value</tabstop>
-  <tabstop>phase3RE1Use</tabstop>
-  <tabstop>phase3RE1Value</tabstop>
-  <tabstop>phase3RE2Use</tabstop>
-  <tabstop>phase3RE2Value</tabstop>
-  <tabstop>phase4Name</tabstop>
-  <tabstop>phase4Switch</tabstop>
-  <tabstop>phase4Trim2Slider</tabstop>
-  <tabstop>phase4Trim1Slider</tabstop>
-  <tabstop>phase4Trim4Slider</tabstop>
-  <tabstop>phase4Trim3Slider</tabstop>
-  <tabstop>phase4Trim2Use</tabstop>
-  <tabstop>phase4Trim2Value</tabstop>
-  <tabstop>phase4Trim3Use</tabstop>
-  <tabstop>phase4Trim3Value</tabstop>
-  <tabstop>phase4Trim1Use</tabstop>
-  <tabstop>phase4Trim1Value</tabstop>
-  <tabstop>phase4Trim4Use</tabstop>
-  <tabstop>phase4Trim4Value</tabstop>
-  <tabstop>phase4GV1Use</tabstop>
-  <tabstop>phase4GV1Value</tabstop>
-  <tabstop>phase4GV2Use</tabstop>
-  <tabstop>phase4GV2Value</tabstop>
-  <tabstop>phase4GV3Use</tabstop>
-  <tabstop>phase4GV3Value</tabstop>
-  <tabstop>phase4GV4Use</tabstop>
-  <tabstop>phase4GV4Value</tabstop>
-  <tabstop>phase4GV5Use</tabstop>
-  <tabstop>phase4GV5Value</tabstop>
-  <tabstop>phase4RE1Use</tabstop>
-  <tabstop>phase4RE1Value</tabstop>
-  <tabstop>phase4RE2Use</tabstop>
-  <tabstop>phase4RE2Value</tabstop>
-  <tabstop>phase5Name</tabstop>
-  <tabstop>phase5Switch</tabstop>
-  <tabstop>phase5Trim2Slider</tabstop>
-  <tabstop>phase5Trim1Slider</tabstop>
-  <tabstop>phase5Trim4Slider</tabstop>
-  <tabstop>phase5Trim3Slider</tabstop>
-  <tabstop>phase5Trim2Use</tabstop>
-  <tabstop>phase5Trim2Value</tabstop>
-  <tabstop>phase5Trim3Use</tabstop>
-  <tabstop>phase5Trim3Value</tabstop>
-  <tabstop>phase5Trim1Use</tabstop>
-  <tabstop>phase5Trim1Value</tabstop>
-  <tabstop>phase5Trim4Use</tabstop>
-  <tabstop>phase5Trim4Value</tabstop>
-  <tabstop>phase5GV1Use</tabstop>
-  <tabstop>phase5GV1Value</tabstop>
-  <tabstop>phase5GV2Use</tabstop>
-  <tabstop>phase5GV2Value</tabstop>
-  <tabstop>phase5GV3Use</tabstop>
-  <tabstop>phase5GV3Value</tabstop>
-  <tabstop>phase5GV4Use</tabstop>
-  <tabstop>phase5GV4Value</tabstop>
-  <tabstop>phase5GV5Use</tabstop>
-  <tabstop>phase5GV5Value</tabstop>
-  <tabstop>phase5RE1Use</tabstop>
-  <tabstop>phase5RE1Value</tabstop>
-  <tabstop>phase5RE2Use</tabstop>
-  <tabstop>phase5RE2Value</tabstop>
-  <tabstop>phase6Name</tabstop>
-  <tabstop>phase6Switch</tabstop>
-  <tabstop>phase6Trim2Slider</tabstop>
-  <tabstop>phase6Trim1Slider</tabstop>
-  <tabstop>phase6Trim4Slider</tabstop>
-  <tabstop>phase6Trim3Slider</tabstop>
-  <tabstop>phase6Trim2Use</tabstop>
-  <tabstop>phase6Trim2Value</tabstop>
-  <tabstop>phase6Trim3Use</tabstop>
-  <tabstop>phase6Trim3Value</tabstop>
-  <tabstop>phase6Trim1Use</tabstop>
-  <tabstop>phase6Trim1Value</tabstop>
-  <tabstop>phase6Trim4Use</tabstop>
-  <tabstop>phase6Trim4Value</tabstop>
-  <tabstop>phase6GV1Use</tabstop>
-  <tabstop>phase6GV1Value</tabstop>
-  <tabstop>phase6GV2Use</tabstop>
-  <tabstop>phase6GV2Value</tabstop>
-  <tabstop>phase6GV3Use</tabstop>
-  <tabstop>phase6GV3Value</tabstop>
-  <tabstop>phase6GV4Use</tabstop>
-  <tabstop>phase6GV4Value</tabstop>
-  <tabstop>phase6GV5Use</tabstop>
-  <tabstop>phase6GV5Value</tabstop>
-  <tabstop>phase6RE1Use</tabstop>
-  <tabstop>phase6RE1Value</tabstop>
-  <tabstop>phase6RE2Use</tabstop>
-  <tabstop>phase6RE2Value</tabstop>
-  <tabstop>phase7Name</tabstop>
-  <tabstop>phase7Switch</tabstop>
-  <tabstop>phase7Trim2Slider</tabstop>
-  <tabstop>phase7Trim1Slider</tabstop>
-  <tabstop>phase7Trim4Slider</tabstop>
-  <tabstop>phase7Trim3Slider</tabstop>
-  <tabstop>phase7Trim2Use</tabstop>
-  <tabstop>phase7Trim2Value</tabstop>
-  <tabstop>phase7Trim3Use</tabstop>
-  <tabstop>phase7Trim3Value</tabstop>
-  <tabstop>phase7Trim1Use</tabstop>
-  <tabstop>phase7Trim1Value</tabstop>
-  <tabstop>phase7Trim4Use</tabstop>
-  <tabstop>phase7Trim4Value</tabstop>
-  <tabstop>phase7GV1Use</tabstop>
-  <tabstop>phase7GV1Value</tabstop>
-  <tabstop>phase7GV2Use</tabstop>
-  <tabstop>phase7GV2Value</tabstop>
-  <tabstop>phase7GV3Use</tabstop>
-  <tabstop>phase7GV3Value</tabstop>
-  <tabstop>phase7GV4Use</tabstop>
-  <tabstop>phase7GV4Value</tabstop>
-  <tabstop>phase7GV5Use</tabstop>
-  <tabstop>phase7GV5Value</tabstop>
-  <tabstop>phase7RE1Use</tabstop>
-  <tabstop>phase7RE1Value</tabstop>
-  <tabstop>phase7RE2Use</tabstop>
-  <tabstop>phase7RE2Value</tabstop>
-  <tabstop>phase8Name</tabstop>
-  <tabstop>phase8Switch</tabstop>
-  <tabstop>phase8Trim2Slider</tabstop>
-  <tabstop>phase8Trim1Slider</tabstop>
-  <tabstop>phase8Trim4Slider</tabstop>
-  <tabstop>phase8Trim3Slider</tabstop>
-  <tabstop>phase8Trim2Use</tabstop>
-  <tabstop>phase8Trim2Value</tabstop>
-  <tabstop>phase8Trim3Use</tabstop>
-  <tabstop>phase8Trim3Value</tabstop>
-  <tabstop>phase8Trim1Use</tabstop>
-  <tabstop>phase8Trim1Value</tabstop>
-  <tabstop>phase8Trim4Use</tabstop>
-  <tabstop>phase8Trim4Value</tabstop>
-  <tabstop>phase8GV1Use</tabstop>
-  <tabstop>phase8GV1Value</tabstop>
-  <tabstop>phase8GV2Use</tabstop>
-  <tabstop>phase8GV2Value</tabstop>
-  <tabstop>phase8GV3Use</tabstop>
-  <tabstop>phase8GV3Value</tabstop>
-  <tabstop>phase8GV4Use</tabstop>
-  <tabstop>phase8GV4Value</tabstop>
-  <tabstop>phase8GV5Use</tabstop>
-  <tabstop>phase8GV5Value</tabstop>
-  <tabstop>phase8RE1Use</tabstop>
-  <tabstop>phase8RE1Value</tabstop>
-  <tabstop>phase8RE2Use</tabstop>
-  <tabstop>phase8RE2Value</tabstop>
-  <tabstop>CHName_01</tabstop>
-  <tabstop>offsetDSB_1</tabstop>
-  <tabstop>symckb_1</tabstop>
-  <tabstop>minSB_1</tabstop>
-  <tabstop>maxSB_1</tabstop>
-  <tabstop>chInvCB_1</tabstop>
-  <tabstop>ppmcenter_1</tabstop>
-  <tabstop>CHName_02</tabstop>
-  <tabstop>offsetDSB_2</tabstop>
-  <tabstop>symckb_2</tabstop>
-  <tabstop>minSB_2</tabstop>
-  <tabstop>maxSB_2</tabstop>
-  <tabstop>chInvCB_2</tabstop>
-  <tabstop>ppmcenter_2</tabstop>
-  <tabstop>CHName_03</tabstop>
-  <tabstop>offsetDSB_3</tabstop>
-  <tabstop>symckb_3</tabstop>
-  <tabstop>minSB_3</tabstop>
-  <tabstop>maxSB_3</tabstop>
-  <tabstop>chInvCB_3</tabstop>
-  <tabstop>ppmcenter_3</tabstop>
-  <tabstop>CHName_04</tabstop>
-  <tabstop>offsetDSB_4</tabstop>
-  <tabstop>symckb_4</tabstop>
-  <tabstop>minSB_4</tabstop>
-  <tabstop>maxSB_4</tabstop>
-  <tabstop>chInvCB_4</tabstop>
-  <tabstop>ppmcenter_4</tabstop>
-  <tabstop>CHName_05</tabstop>
-  <tabstop>offsetDSB_5</tabstop>
-  <tabstop>symckb_5</tabstop>
-  <tabstop>minSB_5</tabstop>
-  <tabstop>maxSB_5</tabstop>
-  <tabstop>chInvCB_5</tabstop>
-  <tabstop>ppmcenter_5</tabstop>
-  <tabstop>CHName_06</tabstop>
-  <tabstop>offsetDSB_6</tabstop>
-  <tabstop>symckb_6</tabstop>
-  <tabstop>minSB_6</tabstop>
-  <tabstop>maxSB_6</tabstop>
-  <tabstop>chInvCB_6</tabstop>
-  <tabstop>ppmcenter_6</tabstop>
-  <tabstop>CHName_07</tabstop>
-  <tabstop>offsetDSB_7</tabstop>
-  <tabstop>symckb_7</tabstop>
-  <tabstop>minSB_7</tabstop>
-  <tabstop>maxSB_7</tabstop>
-  <tabstop>chInvCB_7</tabstop>
-  <tabstop>ppmcenter_7</tabstop>
-  <tabstop>CHName_08</tabstop>
-  <tabstop>offsetDSB_8</tabstop>
-  <tabstop>symckb_8</tabstop>
-  <tabstop>minSB_8</tabstop>
-  <tabstop>maxSB_8</tabstop>
-  <tabstop>chInvCB_8</tabstop>
-  <tabstop>ppmcenter_8</tabstop>
-  <tabstop>CHName_09</tabstop>
-  <tabstop>offsetDSB_9</tabstop>
-  <tabstop>symckb_9</tabstop>
-  <tabstop>minSB_9</tabstop>
-  <tabstop>maxSB_9</tabstop>
-  <tabstop>chInvCB_9</tabstop>
-  <tabstop>ppmcenter_9</tabstop>
-  <tabstop>CHName_10</tabstop>
-  <tabstop>offsetDSB_10</tabstop>
-  <tabstop>symckb_10</tabstop>
-  <tabstop>minSB_10</tabstop>
-  <tabstop>maxSB_10</tabstop>
-  <tabstop>chInvCB_10</tabstop>
-  <tabstop>ppmcenter_10</tabstop>
-  <tabstop>CHName_11</tabstop>
-  <tabstop>offsetDSB_11</tabstop>
-  <tabstop>symckb_11</tabstop>
-  <tabstop>minSB_11</tabstop>
-  <tabstop>maxSB_11</tabstop>
-  <tabstop>chInvCB_11</tabstop>
-  <tabstop>ppmcenter_11</tabstop>
-  <tabstop>CHName_12</tabstop>
-  <tabstop>offsetDSB_12</tabstop>
-  <tabstop>symckb_12</tabstop>
-  <tabstop>minSB_12</tabstop>
-  <tabstop>maxSB_12</tabstop>
-  <tabstop>chInvCB_12</tabstop>
-  <tabstop>ppmcenter_12</tabstop>
-  <tabstop>CHName_13</tabstop>
-  <tabstop>offsetDSB_13</tabstop>
-  <tabstop>symckb_13</tabstop>
-  <tabstop>minSB_13</tabstop>
-  <tabstop>maxSB_13</tabstop>
-  <tabstop>chInvCB_13</tabstop>
-  <tabstop>ppmcenter_13</tabstop>
-  <tabstop>CHName_14</tabstop>
-  <tabstop>offsetDSB_14</tabstop>
-  <tabstop>symckb_14</tabstop>
-  <tabstop>minSB_14</tabstop>
-  <tabstop>maxSB_14</tabstop>
-  <tabstop>chInvCB_14</tabstop>
-  <tabstop>ppmcenter_14</tabstop>
-  <tabstop>CHName_15</tabstop>
-  <tabstop>offsetDSB_15</tabstop>
-  <tabstop>symckb_15</tabstop>
-  <tabstop>minSB_15</tabstop>
-  <tabstop>maxSB_15</tabstop>
-  <tabstop>chInvCB_15</tabstop>
-  <tabstop>ppmcenter_15</tabstop>
-  <tabstop>CHName_16</tabstop>
-  <tabstop>offsetDSB_16</tabstop>
-  <tabstop>symckb_16</tabstop>
-  <tabstop>minSB_16</tabstop>
-  <tabstop>maxSB_16</tabstop>
-  <tabstop>chInvCB_16</tabstop>
-  <tabstop>ppmcenter_16</tabstop>
-  <tabstop>CHName_17</tabstop>
-  <tabstop>offsetDSB_17</tabstop>
-  <tabstop>symckb_17</tabstop>
-  <tabstop>minSB_17</tabstop>
-  <tabstop>maxSB_17</tabstop>
-  <tabstop>chInvCB_17</tabstop>
-  <tabstop>ppmcenter_17</tabstop>
-  <tabstop>CHName_18</tabstop>
-  <tabstop>offsetDSB_18</tabstop>
-  <tabstop>symckb_18</tabstop>
-  <tabstop>minSB_18</tabstop>
-  <tabstop>maxSB_18</tabstop>
-  <tabstop>chInvCB_18</tabstop>
-  <tabstop>ppmcenter_18</tabstop>
-  <tabstop>CHName_19</tabstop>
-  <tabstop>offsetDSB_19</tabstop>
-  <tabstop>symckb_19</tabstop>
-  <tabstop>minSB_19</tabstop>
-  <tabstop>maxSB_19</tabstop>
-  <tabstop>chInvCB_19</tabstop>
-  <tabstop>ppmcenter_19</tabstop>
-  <tabstop>CHName_20</tabstop>
-  <tabstop>offsetDSB_20</tabstop>
-  <tabstop>symckb_20</tabstop>
-  <tabstop>minSB_20</tabstop>
-  <tabstop>maxSB_20</tabstop>
-  <tabstop>chInvCB_20</tabstop>
-  <tabstop>ppmcenter_20</tabstop>
-  <tabstop>CHName_21</tabstop>
-  <tabstop>offsetDSB_21</tabstop>
-  <tabstop>symckb_21</tabstop>
-  <tabstop>minSB_21</tabstop>
-  <tabstop>maxSB_21</tabstop>
-  <tabstop>chInvCB_21</tabstop>
-  <tabstop>ppmcenter_21</tabstop>
-  <tabstop>CHName_22</tabstop>
-  <tabstop>offsetDSB_22</tabstop>
-  <tabstop>symckb_22</tabstop>
-  <tabstop>minSB_22</tabstop>
-  <tabstop>maxSB_22</tabstop>
-  <tabstop>chInvCB_22</tabstop>
-  <tabstop>ppmcenter_22</tabstop>
-  <tabstop>CHName_23</tabstop>
-  <tabstop>offsetDSB_23</tabstop>
-  <tabstop>symckb_23</tabstop>
-  <tabstop>minSB_23</tabstop>
-  <tabstop>maxSB_23</tabstop>
-  <tabstop>chInvCB_23</tabstop>
-  <tabstop>ppmcenter_23</tabstop>
-  <tabstop>CHName_24</tabstop>
-  <tabstop>offsetDSB_24</tabstop>
-  <tabstop>symckb_24</tabstop>
-  <tabstop>minSB_24</tabstop>
-  <tabstop>maxSB_24</tabstop>
-  <tabstop>chInvCB_24</tabstop>
-  <tabstop>ppmcenter_24</tabstop>
-  <tabstop>CHName_25</tabstop>
-  <tabstop>offsetDSB_25</tabstop>
-  <tabstop>symckb_25</tabstop>
-  <tabstop>minSB_25</tabstop>
-  <tabstop>maxSB_25</tabstop>
-  <tabstop>chInvCB_25</tabstop>
-  <tabstop>ppmcenter_25</tabstop>
-  <tabstop>CHName_26</tabstop>
-  <tabstop>offsetDSB_26</tabstop>
-  <tabstop>symckb_26</tabstop>
-  <tabstop>minSB_26</tabstop>
-  <tabstop>maxSB_26</tabstop>
-  <tabstop>chInvCB_26</tabstop>
-  <tabstop>ppmcenter_26</tabstop>
-  <tabstop>CHName_27</tabstop>
-  <tabstop>offsetDSB_27</tabstop>
-  <tabstop>symckb_27</tabstop>
-  <tabstop>minSB_27</tabstop>
-  <tabstop>maxSB_27</tabstop>
-  <tabstop>chInvCB_27</tabstop>
-  <tabstop>ppmcenter_27</tabstop>
-  <tabstop>CHName_28</tabstop>
-  <tabstop>offsetDSB_28</tabstop>
-  <tabstop>symckb_28</tabstop>
-  <tabstop>minSB_28</tabstop>
-  <tabstop>maxSB_28</tabstop>
-  <tabstop>chInvCB_28</tabstop>
-  <tabstop>ppmcenter_28</tabstop>
-  <tabstop>CHName_29</tabstop>
-  <tabstop>offsetDSB_29</tabstop>
-  <tabstop>symckb_29</tabstop>
-  <tabstop>minSB_29</tabstop>
-  <tabstop>maxSB_29</tabstop>
-  <tabstop>chInvCB_29</tabstop>
-  <tabstop>ppmcenter_29</tabstop>
-  <tabstop>CHName_30</tabstop>
-  <tabstop>offsetDSB_30</tabstop>
-  <tabstop>symckb_30</tabstop>
-  <tabstop>minSB_30</tabstop>
-  <tabstop>maxSB_30</tabstop>
-  <tabstop>chInvCB_30</tabstop>
-  <tabstop>ppmcenter_30</tabstop>
-  <tabstop>CHName_31</tabstop>
-  <tabstop>offsetDSB_31</tabstop>
-  <tabstop>symckb_31</tabstop>
-  <tabstop>minSB_31</tabstop>
-  <tabstop>maxSB_31</tabstop>
-  <tabstop>chInvCB_31</tabstop>
-  <tabstop>ppmcenter_31</tabstop>
-  <tabstop>CHName_32</tabstop>
-  <tabstop>offsetDSB_32</tabstop>
-  <tabstop>symckb_32</tabstop>
-  <tabstop>minSB_32</tabstop>
-  <tabstop>maxSB_32</tabstop>
-  <tabstop>chInvCB_32</tabstop>
-  <tabstop>ppmcenter_32</tabstop>
-  <tabstop>a11LevelCB</tabstop>
-  <tabstop>a1RatioSB</tabstop>
-  <tabstop>a11ValueSB</tabstop>
-  <tabstop>a22GreaterCB</tabstop>
-  <tabstop>a1CalibSB</tabstop>
-  <tabstop>scrollArea</tabstop>
-  <tabstop>a21ValueSB</tabstop>
-  <tabstop>a21LevelCB</tabstop>
-  <tabstop>scrollArea_5</tabstop>
-  <tabstop>a1UnitCB</tabstop>
-  <tabstop>a2CalibSB</tabstop>
-  <tabstop>a12ValueSB</tabstop>
-  <tabstop>a22ValueSB</tabstop>
-  <tabstop>a21GreaterCB</tabstop>
-  <tabstop>a22LevelCB</tabstop>
-  <tabstop>clearMixesPB</tabstop>
-  <tabstop>pushButton</tabstop>
-  <tabstop>a12GreaterCB</tabstop>
-  <tabstop>a2RatioSB</tabstop>
-  <tabstop>templateList</tabstop>
-  <tabstop>a11GreaterCB</tabstop>
-  <tabstop>a12LevelCB</tabstop>
-  <tabstop>scrollArea_2</tabstop>
-  <tabstop>curvePt01_y</tabstop>
-  <tabstop>curvePt01_x</tabstop>
-  <tabstop>curvePt02_y</tabstop>
-  <tabstop>curvePt02_x</tabstop>
-  <tabstop>curvePt03_y</tabstop>
-  <tabstop>curvePt03_x</tabstop>
-  <tabstop>curvePt04_y</tabstop>
-  <tabstop>curvePt04_x</tabstop>
-  <tabstop>curvePt05_y</tabstop>
-  <tabstop>curvePt05_x</tabstop>
-  <tabstop>curvePt06_y</tabstop>
-  <tabstop>curvePt06_x</tabstop>
-  <tabstop>curvePt07_y</tabstop>
-  <tabstop>curvePt07_x</tabstop>
-  <tabstop>curvePt08_y</tabstop>
-  <tabstop>curvePt08_x</tabstop>
-  <tabstop>curvePt09_y</tabstop>
-  <tabstop>curvePt09_x</tabstop>
-  <tabstop>curvePt10_y</tabstop>
-  <tabstop>curvePt10_x</tabstop>
-  <tabstop>curvePt11_y</tabstop>
-  <tabstop>curvePt11_x</tabstop>
-  <tabstop>curvePt12_y</tabstop>
-  <tabstop>curvePt12_x</tabstop>
-  <tabstop>curvePt13_y</tabstop>
-  <tabstop>curvePt13_x</tabstop>
-  <tabstop>curvePt14_y</tabstop>
-  <tabstop>curvePt14_x</tabstop>
-  <tabstop>curvePt15_y</tabstop>
-  <tabstop>curvePt15_x</tabstop>
-  <tabstop>curvePt16_y</tabstop>
-  <tabstop>curvePt16_x</tabstop>
-  <tabstop>curvePt17_y</tabstop>
-  <tabstop>curvePt17_x</tabstop>
-  <tabstop>resetCurve_1</tabstop>
-  <tabstop>curveEdit_1</tabstop>
-  <tabstop>plotCB_1</tabstop>
-  <tabstop>resetCurve_2</tabstop>
-  <tabstop>curveEdit_2</tabstop>
-  <tabstop>plotCB_2</tabstop>
-  <tabstop>resetCurve_3</tabstop>
-  <tabstop>curveEdit_3</tabstop>
-  <tabstop>plotCB_3</tabstop>
-  <tabstop>resetCurve_4</tabstop>
-  <tabstop>curveEdit_4</tabstop>
-  <tabstop>plotCB_4</tabstop>
-  <tabstop>resetCurve_5</tabstop>
-  <tabstop>curveEdit_5</tabstop>
-  <tabstop>plotCB_5</tabstop>
-  <tabstop>resetCurve_6</tabstop>
-  <tabstop>curveEdit_6</tabstop>
-  <tabstop>plotCB_6</tabstop>
-  <tabstop>resetCurve_7</tabstop>
-  <tabstop>curveEdit_7</tabstop>
-  <tabstop>plotCB_7</tabstop>
-  <tabstop>resetCurve_8</tabstop>
-  <tabstop>curveEdit_8</tabstop>
-  <tabstop>plotCB_8</tabstop>
-  <tabstop>resetCurve_9</tabstop>
-  <tabstop>curveEdit_9</tabstop>
-  <tabstop>plotCB_9</tabstop>
-  <tabstop>resetCurve_10</tabstop>
-  <tabstop>curveEdit_10</tabstop>
-  <tabstop>plotCB_10</tabstop>
-  <tabstop>resetCurve_11</tabstop>
-  <tabstop>curveEdit_11</tabstop>
-  <tabstop>plotCB_11</tabstop>
-  <tabstop>resetCurve_12</tabstop>
-  <tabstop>curveEdit_12</tabstop>
-  <tabstop>plotCB_12</tabstop>
-  <tabstop>resetCurve_13</tabstop>
-  <tabstop>curveEdit_13</tabstop>
-  <tabstop>plotCB_13</tabstop>
-  <tabstop>resetCurve_14</tabstop>
-  <tabstop>curveEdit_14</tabstop>
-  <tabstop>plotCB_14</tabstop>
-  <tabstop>resetCurve_15</tabstop>
-  <tabstop>curveEdit_15</tabstop>
-  <tabstop>plotCB_15</tabstop>
-  <tabstop>resetCurve_16</tabstop>
-  <tabstop>curveEdit_16</tabstop>
-  <tabstop>plotCB_16</tabstop>
-  <tabstop>curvePreview</tabstop>
-  <tabstop>curvetype_CB</tabstop>
-  <tabstop>cswitchFunc_15</tabstop>
-  <tabstop>cswitchFunc_13</tabstop>
-  <tabstop>cswitchFunc_14</tabstop>
-  <tabstop>cswitchFunc_4</tabstop>
-  <tabstop>cswitchFunc_8</tabstop>
-  <tabstop>cswitchFunc_7</tabstop>
-  <tabstop>cswitchFunc_9</tabstop>
-  <tabstop>cswitchFunc_10</tabstop>
-  <tabstop>cswitchFunc_11</tabstop>
-  <tabstop>cswitchFunc_12</tabstop>
-  <tabstop>cswitchFunc_6</tabstop>
-  <tabstop>cswitchFunc_1</tabstop>
-  <tabstop>cswitchFunc_5</tabstop>
-  <tabstop>cswitchFunc_2</tabstop>
-  <tabstop>cswitchFunc_3</tabstop>
-  <tabstop>cswitchFunc_16</tabstop>
-  <tabstop>cswitchFunc_31</tabstop>
-  <tabstop>cswitchFunc_32</tabstop>
-  <tabstop>cswitchFunc_30</tabstop>
-  <tabstop>cswitchFunc_29</tabstop>
-  <tabstop>cswitchFunc_25</tabstop>
-  <tabstop>cswitchFunc_20</tabstop>
-  <tabstop>cswitchFunc_23</tabstop>
-  <tabstop>cswitchFunc_26</tabstop>
-  <tabstop>cswitchFunc_27</tabstop>
-  <tabstop>cswitchFunc_28</tabstop>
-  <tabstop>cswitchFunc_22</tabstop>
-  <tabstop>cswitchFunc_17</tabstop>
-  <tabstop>cswitchFunc_18</tabstop>
-  <tabstop>cswitchFunc_19</tabstop>
-  <tabstop>cswitchFunc_24</tabstop>
-  <tabstop>cswitchFunc_21</tabstop>
-  <tabstop>frskyUnitsCB</tabstop>
-  <tabstop>frskyCurrentCB</tabstop>
-  <tabstop>frskyProtoCB</tabstop>
-  <tabstop>frskyVoltCB</tabstop>
-  <tabstop>frskyBladesCB</tabstop>
-  <tabstop>varioSourceCB</tabstop>
-  <tabstop>varioLimitCenterMin_DSB</tabstop>
-  <tabstop>varioLimitCenterMax_DSB</tabstop>
-  <tabstop>varioLimitMax_DSB</tabstop>
-  <tabstop>varioLimitMin_DSB</tabstop>
-  <tabstop>varioLimitMinOff_ChkB</tabstop>
-  <tabstop>a2UnitCB</tabstop>
-  <tabstop>rssiAlarm1CB</tabstop>
-  <tabstop>rssiAlarm1SB</tabstop>
-  <tabstop>tabCsView</tabstop>
-  <tabstop>telemetryCSType1</tabstop>
-  <tabstop>telemetryCS1F1_CB</tabstop>
-  <tabstop>telemetryCS1F3_CB</tabstop>
-  <tabstop>telBarCS1B1_CB</tabstop>
-  <tabstop>telMinCS1SB1</tabstop>
-  <tabstop>telMaxCS1SB1</tabstop>
-  <tabstop>telBarCS1B2_CB</tabstop>
-  <tabstop>telMinCS1SB2</tabstop>
-  <tabstop>telMaxCS1SB2</tabstop>
-  <tabstop>telBarCS1B3_CB</tabstop>
-  <tabstop>telMinCS1SB3</tabstop>
-  <tabstop>telMaxCS1SB3</tabstop>
-  <tabstop>telBarCS1B4_CB</tabstop>
-  <tabstop>telMinCS1SB4</tabstop>
-  <tabstop>telMaxCS1SB4</tabstop>
-  <tabstop>telemetryCS2F1_CB</tabstop>
-  <tabstop>telemetryCS2F3_CB</tabstop>
-  <tabstop>telBarCS2B1_CB</tabstop>
-  <tabstop>telMinCS2SB1</tabstop>
-  <tabstop>telMaxCS2SB1</tabstop>
-  <tabstop>telBarCS2B2_CB</tabstop>
-  <tabstop>telMinCS2SB2</tabstop>
-  <tabstop>telMaxCS2SB2</tabstop>
-  <tabstop>telBarCS2B3_CB</tabstop>
-  <tabstop>telMinCS2SB3</tabstop>
-  <tabstop>telMaxCS2SB3</tabstop>
-  <tabstop>telBarCS2B4_CB</tabstop>
-  <tabstop>telMinCS2SB4</tabstop>
-  <tabstop>telMaxCS2SB4</tabstop>
-  <tabstop>telemetryCS3F1_CB</tabstop>
-  <tabstop>telemetryCS3F3_CB</tabstop>
-  <tabstop>telBarCS3B1_CB</tabstop>
-  <tabstop>telMinCS3SB1</tabstop>
-  <tabstop>telMaxCS3SB1</tabstop>
-  <tabstop>telBarCS3B2_CB</tabstop>
-  <tabstop>telMinCS3SB2</tabstop>
-  <tabstop>telMaxCS3SB2</tabstop>
-  <tabstop>telBarCS3B3_CB</tabstop>
-  <tabstop>telMinCS3SB3</tabstop>
-  <tabstop>telMaxCS3SB3</tabstop>
-  <tabstop>telBarCS3B4_CB</tabstop>
-  <tabstop>telMinCS3SB4</tabstop>
-  <tabstop>telMaxCS3SB4</tabstop>
- </tabstops>
- <resources>
-  <include location="companion9x.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/companion/src/modeledit/CMakeLists.txt b/companion/src/modeledit/CMakeLists.txt
new file mode 100644
index 000000000..28c752d64
--- /dev/null
+++ b/companion/src/modeledit/CMakeLists.txt
@@ -0,0 +1,56 @@
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
+set(modeledit_NAMES
+  modeledit
+  setup
+  heli
+  curves
+  telemetry
+  expodialog
+  mixerdialog
+)
+
+set(modeledit_SRCS
+  modelpanel.cpp
+  flightmodes.cpp
+  inputs.cpp
+  mixes.cpp
+  channels.cpp
+  customswitches.cpp
+  customfunctions.cpp
+  # templates.cpp
+  mixerslist.cpp
+  node.cpp
+  edge.cpp
+)
+
+set(modeledit_HDRS
+  modelpanel.h
+  flightmodes.h
+  inputs.h
+  mixes.h
+  channels.h
+  customswitches.h
+  customfunctions.h
+  # templates.h
+  mixerslist.h
+  node.h
+)
+
+set(modeledit_UIS
+  setup_timer.ui
+  setup_module.ui
+  flightmode.ui
+  telemetry_analog.ui
+)
+
+foreach(name ${modeledit_NAMES})
+  set(modeledit_SRCS ${modeledit_SRCS} ${name}.cpp)
+  set(modeledit_HDRS ${modeledit_HDRS} ${name}.h)
+  set(modeledit_UIS  ${modeledit_UIS}  ${name}.ui)
+endforeach()
+ 
+qt4_wrap_ui(modeledit_SRCS ${modeledit_UIS})
+qt4_wrap_cpp(modeledit_SRCS ${modeledit_HDRS})
+
+add_library(modeledit ${modeledit_SRCS})
\ No newline at end of file
diff --git a/companion/src/modeledit/channels.cpp b/companion/src/modeledit/channels.cpp
new file mode 100644
index 000000000..09b6a367b
--- /dev/null
+++ b/companion/src/modeledit/channels.cpp
@@ -0,0 +1,179 @@
+#include "channels.h"
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+
+Channels::Channels(QWidget * parent, ModelData & model):
+  ModelPanel(parent, model)
+{
+  QGridLayout * gridLayout = new QGridLayout(this);
+
+  int col = 1;
+  if (GetEepromInterface()->getCapability(ChannelsName))
+    addLabel(gridLayout, tr("Name"), col++);
+  addLabel(gridLayout, tr("Offset"), col++);
+  addLabel(gridLayout, tr("Min"), col++);
+  addLabel(gridLayout, tr("Max"), col++);
+  addLabel(gridLayout, tr("Invert"), col++);
+  if (GetEepromInterface()->getCapability(PPMCenter))
+    addLabel(gridLayout, tr("Center"), col++);
+  if (GetEepromInterface()->getCapability(SYMLimits))
+    addLabel(gridLayout, tr("Sym"), col++);
+
+  for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+    col = 0;
+
+    // Channel label
+    QLabel *label = new QLabel(this);
+    label->setText(tr("Channel %1").arg(i+1));
+    gridLayout->addWidget(label, i+1, col++, 1, 1);
+
+    // Channel name
+    int nameLen = GetEepromInterface()->getCapability(ChannelsName);
+    if (nameLen > 0) {
+      QLineEdit * name = new QLineEdit(this);
+      name->setProperty("index", i);
+      name->setMaxLength(nameLen);
+      QRegExp rx(CHAR_FOR_NAMES_REGEX);
+      name->setValidator(new QRegExpValidator(rx, this));
+      name->setText(model.limitData[i].name);
+      connect(name, SIGNAL(editingFinished()), this, SLOT(nameEdited()));
+      gridLayout->addWidget(name, i+1, col++, 1, 1);
+    }
+
+    // Channel offset
+    QDoubleSpinBox * offset = new QDoubleSpinBox(this);
+    offset->setProperty("index", i);
+    offset->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    offset->setAccelerated(true);
+    offset->setDecimals(1);
+    offset->setMinimum(-100);
+    offset->setSingleStep(0.1);
+    offset->setValue(float(model.limitData[i].offset) / 10);
+    connect(offset, SIGNAL(editingFinished()), this, SLOT(offsetEdited()));
+    gridLayout->addWidget(offset, i+1, col++, 1, 1);
+
+    // Channel min
+    QSpinBox * minSB = new QSpinBox(this);
+    minSB->setProperty("index", i);
+    minSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    minSB->setAccelerated(true);
+    minSB->setMinimum(model.extendedLimits ? -125 : -100);
+    minSB->setMaximum(0);
+    minSB->setValue(model.limitData[i].min);
+    connect(minSB, SIGNAL(editingFinished()), this, SLOT(minEdited()));
+    gridLayout->addWidget(minSB, i+1, col++, 1, 1);
+
+    // Channel max
+    QSpinBox * maxSB = new QSpinBox(this);
+    maxSB->setProperty("index", i);
+    maxSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    maxSB->setAccelerated(true);
+    maxSB->setMinimum(0);
+    maxSB->setMaximum(model.extendedLimits ? 125 : 100);
+    maxSB->setValue(model.limitData[i].max);
+    connect(maxSB, SIGNAL(editingFinished()), this, SLOT(maxEdited()));
+    gridLayout->addWidget(maxSB, i+1, col++, 1, 1);
+
+    // Channel inversion
+    QComboBox * invCB = new QComboBox(this);
+    invCB->insertItems(0, QStringList() << tr("---") << tr("INV"));
+    invCB->setProperty("index", i);
+    invCB->setCurrentIndex((model.limitData[i].revert) ? 1 : 0);
+    connect(invCB, SIGNAL(currentIndexChanged(int)), this, SLOT(invEdited()));
+    gridLayout->addWidget(invCB, i+1, col++, 1, 1);
+
+    // PPM center
+    if (GetEepromInterface()->getCapability(PPMCenter)) {
+      QSpinBox * center = new QSpinBox(this);
+      center->setProperty("index", i);
+      center->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+      center->setMinimum(1375);
+      center->setMaximum(1625);
+      center->setValue(1500);
+      center->setValue(model.limitData[i].ppmCenter + 1500);
+      connect(center, SIGNAL(editingFinished()), this, SLOT(ppmcenterEdited()));
+      gridLayout->addWidget(center, i+1, col++, 1, 1);
+    }
+
+    // Symetrical limits
+    if (GetEepromInterface()->getCapability(SYMLimits)) {
+      QCheckBox * symlimits = new QCheckBox(this);
+      symlimits->setProperty("index", i);
+      symlimits->setChecked(model.limitData[i].symetrical);
+      connect(symlimits, SIGNAL(toggled(bool)), this, SLOT(symlimitsEdited()));
+      gridLayout->addWidget(symlimits, i+1, col++, 1, 1);
+    }
+  }
+
+  // setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  // setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+}
+
+Channels::~Channels()
+{
+}
+
+void Channels::symlimitsEdited()
+{
+  QCheckBox * ckb = qobject_cast<QCheckBox*>(sender());
+  int index = ckb->property("index").toInt();
+  model.limitData[index].symetrical = (ckb->checkState() ? 1 : 0);
+  emit modified();
+}
+
+void Channels::nameEdited()
+{
+  if (!lock) {
+    lock = true;
+    QLineEdit *le = qobject_cast<QLineEdit*>(sender());
+    int index = le->property("index").toInt();
+    strcpy(model.limitData[index].name, le->text().toAscii());
+    lock = false;
+    emit modified();
+  }
+}
+
+void Channels::offsetEdited()
+{
+  QDoubleSpinBox *dsb = qobject_cast<QDoubleSpinBox*>(sender());
+  int index = dsb->property("index").toInt();
+  model.limitData[index].offset = round(dsb->value()*10);
+  emit modified();
+}
+
+void Channels::minEdited()
+{
+  QSpinBox *sb = qobject_cast<QSpinBox*>(sender());
+  int index = sb->property("index").toInt();
+  model.limitData[index].min = sb->value();
+  emit modified();
+}
+
+void Channels::maxEdited()
+{
+  QSpinBox *sb = qobject_cast<QSpinBox*>(sender());
+  int index = sb->property("index").toInt();
+  model.limitData[index].max = sb->value();
+  emit modified();
+}
+
+void Channels::invEdited()
+{
+  QComboBox *cb = qobject_cast<QComboBox*>(sender());
+  int index = cb->property("index").toInt();
+  model.limitData[index].revert = cb->currentIndex();
+  emit modified();
+}
+
+void Channels::ppmcenterEdited()
+{
+  QSpinBox *sb = qobject_cast<QSpinBox*>(sender());
+  int index = sb->property("index").toInt();
+  model.limitData[index].ppmCenter = sb->value() - 1500;
+  emit modified();
+}
+
diff --git a/companion/src/modeledit/channels.h b/companion/src/modeledit/channels.h
new file mode 100644
index 000000000..ee372ecd7
--- /dev/null
+++ b/companion/src/modeledit/channels.h
@@ -0,0 +1,25 @@
+#ifndef CHANNELS_H
+#define CHANNELS_H
+
+#include "modelpanel.h"
+
+class Channels : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    Channels(QWidget *parent, ModelData & model);
+    ~Channels();
+
+  private slots:
+    void symlimitsEdited();
+    void nameEdited();
+    void offsetEdited();
+    void minEdited();
+    void maxEdited();
+    void invEdited();
+    void ppmcenterEdited();
+
+};
+
+#endif // CHANNELS_H
diff --git a/companion/src/modeledit/curvedialog.ui b/companion/src/modeledit/curvedialog.ui
new file mode 100644
index 000000000..f8ccccba3
--- /dev/null
+++ b/companion/src/modeledit/curvedialog.ui
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="0" column="0">
+      <widget class="QLabel" name="ca_ctype_label_2">
+       <property name="text">
+        <string>Curve type</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="ca_coeff_SB_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>-100</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="ca_coeff_label_2">
+       <property name="text">
+        <string>Coefficient</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QComboBox" name="ca_side_CB_2">
+       <item>
+        <property name="text">
+         <string>Both</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>x&gt;0</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>x&lt;0</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="ca_ymid_label_2">
+       <property name="text">
+        <string>Y at X=0</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QSpinBox" name="ca_ymax_SB_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>-100</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QSpinBox" name="ca_ymid_SB_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>-100</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="ca_side_label_2">
+       <property name="text">
+        <string>Side</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="ca_ymin_label_2">
+       <property name="text">
+        <string>Y at X=-100</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QSpinBox" name="ca_ymin_SB_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimum">
+        <number>-100</number>
+       </property>
+       <property name="maximum">
+        <number>100</number>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="ca_ymax_label_2">
+       <property name="text">
+        <string>Y at X=100</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="ca_ctype_CB_2">
+       <item>
+        <property name="text">
+         <string>Linear</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Single Expo</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Symmetrical f(x)=-f(-x)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Symmetrical f(x)=f(-x)</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/companion/src/modeledit/curves.cpp b/companion/src/modeledit/curves.cpp
new file mode 100644
index 000000000..2e52c54ea
--- /dev/null
+++ b/companion/src/modeledit/curves.cpp
@@ -0,0 +1,673 @@
+#include "curves.h"
+#include "ui_curves.h"
+#include "node.h"
+#include "edge.h"
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QMessageBox>
+
+// TODO Capability CustomCurves to be removed
+
+#define GFX_MARGIN 16
+
+static const QColor colors[C9X_MAX_CURVES] = {
+  QColor(0,0,127),
+  QColor(0,127,0),
+  QColor(127,0,0),
+  QColor(0,127,127),
+  QColor(127,0,127),
+  QColor(127,127,0),
+  QColor(127,127,127),
+  QColor(0,0,255),
+  QColor(0,127,255),
+  QColor(127,0,255),
+  QColor(0,255,0),
+  QColor(0,255,127),
+  QColor(127,255,0),
+  QColor(255,0,0),
+  QColor(255,0,127),
+  QColor(255,127,0),
+};
+
+#if 0
+#ifdef __APPLE__
+    ui->curveEdit_1->setStyleSheet("color: #00007f;");
+    ui->curveEdit_2->setStyleSheet("color: #007f00;");
+    ui->curveEdit_3->setStyleSheet("color: #7f0000;");
+    ui->curveEdit_4->setStyleSheet("color: #007f7f;");
+    ui->curveEdit_5->setStyleSheet("color: #7f007f;");
+    ui->curveEdit_6->setStyleSheet("color: #7f7f00;");
+    ui->curveEdit_7->setStyleSheet("color: #7f7f7f;");
+    ui->curveEdit_8->setStyleSheet("color: #0000ff;");
+    ui->curveEdit_9->setStyleSheet("color: #007fff;");
+    ui->curveEdit_10->setStyleSheet("color: #7f00ff;");
+    ui->curveEdit_11->setStyleSheet("color: #00ff00;");
+    ui->curveEdit_12->setStyleSheet("color: #00ff7f;");
+    ui->curveEdit_13->setStyleSheet("color: #7fff00;");
+    ui->curveEdit_14->setStyleSheet("color: #ff0000;");
+    ui->curveEdit_15->setStyleSheet("color: #ff007f;");
+    ui->curveEdit_16->setStyleSheet("color: #ff7f00;");
+#else
+    ui->curveEdit_1->setStyleSheet("background-color: #00007f; color: white;");
+    ui->curveEdit_2->setStyleSheet("background-color: #007f00; color: white;");
+    ui->curveEdit_3->setStyleSheet("background-color: #7f0000; color: white;");
+    ui->curveEdit_4->setStyleSheet("background-color: #007f7f; color: white;");
+    ui->curveEdit_5->setStyleSheet("background-color: #7f007f; color: white;");
+    ui->curveEdit_6->setStyleSheet("background-color: #7f7f00; color: white;");
+    ui->curveEdit_7->setStyleSheet("background-color: #7f7f7f; color: white;");
+    ui->curveEdit_8->setStyleSheet("background-color: #0000ff; color: white;");
+    ui->curveEdit_9->setStyleSheet("background-color: #007fff; color: white;");
+    ui->curveEdit_10->setStyleSheet("background-color: #7f00ff; color: white;");
+    ui->curveEdit_11->setStyleSheet("background-color: #00ff00; color: white;");
+    ui->curveEdit_12->setStyleSheet("background-color: #00ff7f; color: white;");
+    ui->curveEdit_13->setStyleSheet("background-color: #7fff00; color: white;");
+    ui->curveEdit_14->setStyleSheet("background-color: #ff0000; color: white;");
+    ui->curveEdit_15->setStyleSheet("background-color: #ff007f; color: white;");
+    ui->curveEdit_16->setStyleSheet("background-color: #ff7f00; color: white;");
+#endif
+#endif
+
+Curves::Curves(QWidget * parent, ModelData & model):
+  ModelPanel(parent, model),
+  ui(new Ui::Curves),
+  currentCurve(0)
+{
+  ui->setupUi(this);
+
+  if (!GetEepromInterface()->getCapability(HasCvNames)) {
+    ui->cname_LE->hide();
+    ui->cname_label->hide();
+  }
+
+  QGraphicsScene *scene = new QGraphicsScene(ui->curvePreview);
+  scene->setItemIndexMethod(QGraphicsScene::NoIndex);
+  ui->curvePreview->setScene(scene);
+
+  QIcon clearIcon;
+  clearIcon.addFile(":/images/clear.png", QSize(), QIcon::Normal, QIcon::Off);
+
+  for (int i=0; i<GetEepromInterface()->getCapability(NumCurves); i++) {
+    visibleCurves[i] = false;
+
+    // The reset curve button
+    QPushButton * reset = new QPushButton(this);
+    reset->setProperty("index", i);
+    reset->setMinimumSize(QSize(0, 0));
+    reset->setIcon(clearIcon);
+    reset->setIconSize(QSize(14, 14));
+    connect(reset, SIGNAL(clicked()), this, SLOT(resetCurve()));
+    ui->curvesLayout->addWidget(reset, i, 0, 1, 1);
+
+    // The edit curve button
+    QPushButton * edit = new QPushButton(this);
+    edit->setProperty("index", i);
+    QPalette palette;
+    palette.setBrush(QPalette::Active, QPalette::Button, QBrush(colors[i]));
+    palette.setBrush(QPalette::Active, QPalette::ButtonText, QBrush(Qt::white));
+    edit->setPalette(palette);
+    edit->setText(tr("Curve %1").arg(i+1));
+    connect(edit, SIGNAL(clicked()), this, SLOT(editCurve()));
+    ui->curvesLayout->addWidget(edit, i, 1, 1, 1);
+
+    // The curve plot checkbox
+    QCheckBox * plot = new QCheckBox(this);
+    plot->setProperty("index", i);
+    plot->setPalette(palette);
+    connect(plot, SIGNAL(toggled(bool)), this, SLOT(plotCurve(bool)));
+    ui->curvesLayout->addWidget(plot, i, 2, 1, 1);
+  }
+
+  for (int i=0; i<C9X_MAX_POINTS; i++) {
+    spny[i] = new QSpinBox(this);
+    spny[i]->setProperty("index", i);
+    spny[i]->setMinimum(-100);
+    spny[i]->setMaximum(+100);
+    spny[i]->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    spny[i]->setAccelerated(true);
+    connect(spny[i], SIGNAL(valueChanged(int)), this, SLOT(onPointEdited()));
+    ui->pointsLayout->addWidget(spny[i], i, 0, 1, 1);
+
+    spnx[i] = new QSpinBox(this);
+    spnx[i]->setProperty("index", i);
+    spnx[i]->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    spnx[i]->setAccelerated(true);
+    connect(spnx[i], SIGNAL(valueChanged(int)), this, SLOT(onPointEdited()));
+    ui->pointsLayout->addWidget(spnx[i], i, 1, 1, 1);
+  }
+}
+
+Curves::~Curves()
+{
+  delete ui;
+}
+
+void Curves::editCurve()
+{
+  QPushButton *button = (QPushButton *)sender();
+  int index = button->property("index").toInt();
+  setCurrentCurve(index);
+  update();
+}
+
+void Curves::resetCurve()
+{
+  QPushButton *button = (QPushButton *)sender();
+  int index = button->property("index").toInt();
+  int res = QMessageBox::question(this, "companion9x", tr("Are you sure you want to reset curve %1 ?").arg(index+1), QMessageBox::Yes | QMessageBox::No);
+  if (res == QMessageBox::Yes) {
+    model.curves[index].clear(5);
+    update();
+    emit modified();
+  }
+}
+
+void Curves::plotCurve(bool checked)
+{
+  QCheckBox *chk = (QCheckBox *)sender();
+  int index = chk->property("index").toInt();
+  visibleCurves[index] = checked;
+  updateCurve();
+}
+
+void Curves::update()
+{
+  lock = true;
+
+  if (GetEepromInterface()->getCapability(HasCvNames)) {
+    ui->cname_LE->setText(model.curves[currentCurve].name);
+  }
+
+  int count = model.curves[currentCurve].count;
+  for (int i=0; i<count; i++) {
+    spny[i]->show();
+    spny[i]->setValue(model.curves[currentCurve].points[i].y);
+    if (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM) {
+      spnx[i]->show();
+      if (i==0 || i==model.curves[currentCurve].count-1) {
+        spnx[i]->setDisabled(true);
+        spnx[i]->setMaximum(+100);
+        spnx[i]->setMinimum(-100);
+      }
+      else {
+        spnx[i]->setMaximum(model.curves[currentCurve].points[i+1].x);
+        spnx[i]->setMinimum(model.curves[currentCurve].points[i-1].x);
+      }
+      spnx[i]->setValue(model.curves[currentCurve].points[i].x);
+    }
+    else {
+      spnx[i]->hide();
+    }
+  }
+  for (int i=count; i<C9X_MAX_POINTS; i++) {
+    spny[i]->hide();
+    spnx[i]->hide();
+  }
+
+  updateCurveType();
+  updateCurve();
+
+  lock = false;
+}
+
+void Curves::setCurrentCurve(int index)
+{
+    currentCurve = index;
+}
+
+void Curves::updateCurveType()
+{
+  int index = (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM ? 1 : 0);
+  if (model.curves[currentCurve].count==5)
+    index += 2;
+  else if (model.curves[currentCurve].count==9)
+    index += 4;
+  else if (model.curves[currentCurve].count==17)
+    index += 6;
+  ui->curvetype_CB->setCurrentIndex(index);
+}
+
+void Curves::updateCurve()
+{
+  Node * nodel = 0;
+  Node * nodex = 0;
+  QColor color;
+
+  QGraphicsScene *scene = ui->curvePreview->scene();
+  scene->clear();
+
+  qreal width  = scene->sceneRect().width();
+  qreal height = scene->sceneRect().height();
+
+  qreal centerX = scene->sceneRect().left() + width/2; //center X
+  qreal centerY = scene->sceneRect().top() + height/2; //center Y
+
+  QGraphicsSimpleTextItem *ti = scene->addSimpleText(tr("Editing curve %1").arg(currentCurve+1));
+  ti->setPos(3, 3);
+
+  scene->addLine(centerX, GFX_MARGIN, centerX, height+GFX_MARGIN);
+  scene->addLine(GFX_MARGIN, centerY, width+GFX_MARGIN, centerY);
+
+  QPen pen;
+  pen.setWidth(1);
+  pen.setStyle(Qt::SolidLine);
+
+  int numcurves = GetEepromInterface()->getCapability(NumCurves);
+  for (int k=0; k<numcurves; k++) {
+    pen.setColor(colors[k]);
+    if (currentCurve!=k && visibleCurves[k]) {
+      int numpoints = model.curves[k].count;
+      for (int i=0; i<numpoints-1; i++) {
+        if (model.curves[k].type == CurveData::CURVE_TYPE_CUSTOM)
+          scene->addLine(centerX + (qreal)model.curves[k].points[i].x*width/200,centerY - (qreal)model.curves[k].points[i].y*height/200,centerX + (qreal)model.curves[k].points[i+1].x*width/200,centerY - (qreal)model.curves[k].points[i+1].y*height/200, pen);
+        else
+          scene->addLine(GFX_MARGIN + i*width/(numpoints-1),centerY - (qreal)model.curves[k].points[i].y*height/200,GFX_MARGIN + (i+1)*width/(numpoints-1),centerY - (qreal)model.curves[k].points[i+1].y*height/200, pen);
+      }
+    }
+  }
+
+  int numpoints = model.curves[currentCurve].count;
+  for (int i=0; i<numpoints; i++) {
+    nodel = nodex;
+    nodex = new Node();
+    nodex->setProperty("index", i);
+    nodex->setColor(colors[currentCurve]);
+    if (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM) {
+      if (i>0 && i<numpoints-1) {
+        nodex->setFixedX(false);
+        nodex->setMinX(model.curves[currentCurve].points[i-1].x);
+        nodex->setMaxX(model.curves[currentCurve].points[i+1].x);
+      }
+      else {
+        nodex->setFixedX(true);
+      }
+      nodex->setPos(centerX + (qreal)model.curves[currentCurve].points[i].x*width/200,centerY - (qreal)model.curves[currentCurve].points[i].y*height/200);
+    }
+    else {
+      nodex->setFixedX(true);
+      nodex->setPos(GFX_MARGIN + i*width/(numpoints-1), centerY - (qreal)model.curves[currentCurve].points[i].y*height/200);
+    }
+    connect(nodex, SIGNAL(moved(int, int)), this, SLOT(onNodeMoved(int, int)));
+    connect(nodex, SIGNAL(focus()), this, SLOT(onNodeFocus()));
+    connect(nodex, SIGNAL(unfocus()), this, SLOT(onNodeUnfocus()));
+    scene->addItem(nodex);
+    if (i>0) scene->addItem(new Edge(nodel, nodex));
+  }
+}
+
+void Curves::onPointEdited()
+{
+  if (!lock) {
+    lock = true;
+    int index = sender()->property("index").toInt();
+    model.curves[currentCurve].points[index].x = spnx[index]->value();
+    model.curves[currentCurve].points[index].y = spny[index]->value();
+    updateCurve();
+    emit modified();
+    lock = false;
+  }
+}
+
+void Curves::onNodeMoved(int x, int y)
+{
+  if (!lock) {
+    lock = true;
+    int index = sender()->property("index").toInt();
+    model.curves[currentCurve].points[index].x = x;
+    model.curves[currentCurve].points[index].y = y;
+    spnx[index]->setValue(x);
+    spny[index]->setValue(y);
+    emit modified();
+    lock = false;
+  }
+}
+
+void Curves::onNodeFocus()
+{
+  int index = sender()->property("index").toInt();
+  spny[index]->setFocus();
+}
+
+void Curves::onNodeUnfocus()
+{
+  int index = sender()->property("index").toInt();
+  spny[index]->clearFocus();
+  updateCurve();
+}
+
+void Curves::on_curvetype_CB_currentIndexChanged(int index)
+{
+  static const int numpoint[] = {3,3,5,5,9,9,17,17};
+  static const CurveData::CurveType types[] = {CurveData::CURVE_TYPE_STANDARD, CurveData::CURVE_TYPE_CUSTOM, CurveData::CURVE_TYPE_STANDARD, CurveData::CURVE_TYPE_CUSTOM, CurveData::CURVE_TYPE_STANDARD, CurveData::CURVE_TYPE_CUSTOM, CurveData::CURVE_TYPE_STANDARD, CurveData::CURVE_TYPE_CUSTOM};
+
+  if (!lock) {
+    lock = true;
+
+    int numcurves = GetEepromInterface()->getCapability(NumCurves);
+    // int currpoints = model.curves[currentCurve].count;
+    // bool currcustom = model.curves[currentCurve].custom;
+
+    int totalpoints=0;
+    for (int i=0; i<numcurves; i++) {
+      if (i!=currentCurve) {
+        totalpoints += model.curves[i].count;
+        if (model.curves[i].type == CurveData::CURVE_TYPE_CUSTOM) {
+          totalpoints += model.curves[i].count-2;
+        }
+      }
+    }
+    totalpoints += numpoint[index];
+    if (types[index] == CurveData::CURVE_TYPE_CUSTOM) {
+      totalpoints += numpoint[index]-2;
+    }
+
+    int fwpoints = GetEepromInterface()->getCapability(NumCurvePoints);
+    if (fwpoints!=0) {
+      if (fwpoints < totalpoints) {
+        QMessageBox::warning(this, "companion9x", tr("Not enough free points in EEPROM to store the curve."));
+        updateCurveType();
+        lock = false;
+        return;
+      }
+    }
+
+    model.curves[currentCurve].count = numpoint[index];
+    model.curves[currentCurve].type = types[index];
+
+    // TODO something better!
+    for (int i=0; i<C9X_MAX_POINTS; i++) {
+      model.curves[currentCurve].points[i].x = (i >= model.curves[currentCurve].count-1 ? +100 : -100 + (200*i)/(numpoint[index]-1));
+      model.curves[currentCurve].points[i].y = 0;
+    }
+
+    update();
+    emit modified();
+    lock = false;
+  }
+}
+
+void Curves::on_cname_LE_editingFinished()
+{
+  memset(model.curves[currentCurve].name, 0, sizeof(model.curves[currentCurve].name));
+  strcpy(model.curves[currentCurve].name, ui->cname_LE->text().toAscii());
+  emit modified();
+}
+
+void Curves::resizeEvent(QResizeEvent *event)
+{
+  QRect qr = ui->curvePreview->contentsRect();
+  ui->curvePreview->scene()->setSceneRect(GFX_MARGIN, GFX_MARGIN, qr.width()-GFX_MARGIN*2, qr.height()-GFX_MARGIN*2);
+  updateCurve();
+
+  ModelPanel::resizeEvent(event);
+}
+
+#if 0
+void ModelEdit::on_ca_ctype_CB_currentIndexChanged()
+{
+    int index=ui->ca_ctype_CB->currentIndex();
+    switch (index) {
+      case 0:
+        ui->ca_coeff_SB->hide();
+        ui->ca_coeff_label->hide();
+        ui->ca_ymid_SB->hide();
+        ui->ca_ymid_label->hide();
+        ui->ca_ymin_SB->show();
+        ui->ca_ymin_label->show();
+        ui->ca_ymin_SB->setValue(-100);
+        ui->ca_ymax_SB->setValue(100);
+        break;
+      case 1:
+        ui->ca_coeff_SB->show();
+        ui->ca_coeff_label->show();
+        ui->ca_ymid_SB->hide();
+        ui->ca_ymid_label->hide();
+        ui->ca_ymin_SB->show();
+        ui->ca_ymin_label->show();
+        ui->ca_ymin_SB->setValue(-100);
+        ui->ca_ymax_SB->setValue(100);
+        break;
+      case 2:
+        ui->ca_coeff_SB->show();
+        ui->ca_coeff_label->show();
+        ui->ca_ymid_SB->hide();
+        ui->ca_ymid_label->hide();
+        ui->ca_ymin_SB->hide();
+        ui->ca_ymin_label->hide();
+        ui->ca_ymax_SB->setValue(100);
+        break;
+      case 3:
+        ui->ca_coeff_SB->show();
+        ui->ca_coeff_label->show();
+        ui->ca_ymid_SB->show();
+        ui->ca_ymid_label->show();
+        ui->ca_ymin_SB->hide();
+        ui->ca_ymin_label->hide();
+        ui->ca_ymid_SB->setValue(0);
+        ui->ca_ymax_SB->setValue(100);
+        break;
+    }
+}
+
+void ModelEdit::on_ca_apply_PB_clicked()
+{
+    int index=ui->ca_ctype_CB->currentIndex();
+    float x;
+    int y;
+    int invert=0;
+    float a;
+    if (index==0) {
+      a=(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/200.0;
+      int numpoints=model.curves[currentCurve].count;
+      for (int i=0; i<numpoints; i++) {
+        if (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM) {
+          x=(model.curves[currentCurve].points[i].x+100);
+        } else {
+          x=(200.0/(numpoints-1))*i;
+        }
+        y=ui->ca_ymin_SB->value()+a*x;
+        switch (ui->ca_side_CB->currentIndex()) {
+          case 0:
+            model.curves[currentCurve].points[i].y=y;
+            break;
+          case 1:
+            if (x>=100) {
+              model.curves[currentCurve].points[i].y=y;
+            }
+            break;
+          case 2:
+            if (x<100) {
+              model.curves[currentCurve].points[i].y=y;
+            }
+            break;
+        }
+      }
+    } else if (index==1) {
+      int numpoints=model.curves[currentCurve].count;
+      for (int i=0; i<numpoints; i++) {
+        if (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM) {
+          x=((model.curves[currentCurve].points[i].x)+100)/2.0;
+        } else {
+          x=(100.0/(numpoints-1))*i;
+        }
+        a=ui->ca_coeff_SB->value();
+        if (a>=0) {
+          y=round(c9xexpou(x,a)*(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/100.0+ui->ca_ymin_SB->value());
+        } else {
+          a=-a;
+          x=100-x;
+          y=round((100.0-c9xexpou(x,a))*(ui->ca_ymax_SB->value()-ui->ca_ymin_SB->value())/100.0+ui->ca_ymin_SB->value());
+        }
+        switch (ui->ca_side_CB->currentIndex()) {
+          case 0:
+            model.curves[currentCurve].points[i].y=y;
+            break;
+          case 1:
+            if (x>=50) {
+              model.curves[currentCurve].points[i].y=y;
+            }
+            break;
+          case 2:
+            if (x<50) {
+              model.curves[currentCurve].points[i].y=y;
+            }
+            break;
+        }
+      }
+    } else if (index==2) {
+      int numpoints=model.curves[currentCurve].count;
+      for (int i=0; i<numpoints; i++) {
+        if (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM) {
+          x=(model.curves[currentCurve].points[i].x);
+        } else {
+          x=-100.0+(200.0/(numpoints-1))*i;
+        }
+        a=ui->ca_coeff_SB->value();
+        if (x<0) {
+          x=-x;
+          invert=1;
+        } else {
+          invert=0;
+        }
+        if (a>=0) {
+          y=round(c9xexpou(x,a)*(ui->ca_ymax_SB->value()/100.0));
+        } else {
+          a=-a;
+          x=100-x;
+          y=round((100.0-c9xexpou(x,a))*(ui->ca_ymax_SB->value()/100.0));
+        }
+        switch (ui->ca_side_CB->currentIndex()) {
+          case 0:
+            if (invert==1) {
+              model.curves[currentCurve].points[i].y=-y;
+            } else {
+              model.curves[currentCurve].points[i].y=y;
+            }
+            break;
+          case 1:
+            if (invert==0) {
+              model.curves[currentCurve].points[i].y=y;
+            }
+            break;
+          case 2:
+            if (invert==1) {
+              model.curves[currentCurve].points[i].y=-y;
+            }
+            break;
+        }
+      }
+    } else if (index==3) {
+      int numpoints=model.curves[currentCurve].count;
+      for (int i=0; i<numpoints; i++) {
+        if (model.curves[currentCurve].type == CurveData::CURVE_TYPE_CUSTOM) {
+          x=(model.curves[currentCurve].points[i].x);
+        } else {
+          x=-100.0+(200.0/(numpoints-1))*i;
+        }
+        int pos=(x>=0);
+        a=ui->ca_coeff_SB->value();
+        if (x<0) {
+          x=-x;
+        }
+        if (a>=0) {
+          y=round(c9xexpou(x,a)*((ui->ca_ymax_SB->value()-ui->ca_ymid_SB->value())/100.0)+ui->ca_ymid_SB->value());
+        } else {
+          a=-a;
+          x=100-x;
+          y=round((100.0-c9xexpou(x,a))*((ui->ca_ymax_SB->value()-ui->ca_ymid_SB->value())/100.0)+ui->ca_ymid_SB->value());
+        }
+        switch (ui->ca_side_CB->currentIndex()) {
+          case 0:
+            model.curves[currentCurve].points[i].y=y;
+            break;
+          case 1:
+            if (pos) {
+              model.curves[currentCurve].points[i].y=y;
+            }
+            break;
+          case 2:
+            if (!pos) {
+              model.curves[currentCurve].points[i].y=y;
+            }
+            break;
+        }
+      }
+    }
+    updateSettings();
+    setCurrentCurve(currentCurve);
+    drawCurve();
+}
+
+void ModelEdit::clearCurves(bool ask)
+{
+    if(ask) {
+      int res = QMessageBox::question(this,tr("Clear Curves?"),tr("Really clear all the curves?"),QMessageBox::Yes | QMessageBox::No);
+      if(res!=QMessageBox::Yes) return;
+    }
+    curvesLock=true;
+    for (int j=0; j<16; j++) {
+      model.curves[j].count = 5;
+      model.curves[j].custom = false;
+      memset(model.curves[j].name, 0, sizeof(model.curves[j].name));
+      for (int i=0; i<17; i++) {
+        model.curves[j].points[i].x = 0;
+        model.curves[j].points[i].y = 0;
+      }
+    }
+    for (int i=0; i<17; i++) {
+      spnx[i]->setMinimum(-100);
+      spnx[i]->setMaximum(100);
+      spnx[i]->setValue(0);
+      spny[i]->setValue(0);
+    }
+    currentCurve=0;
+    curvesLock=false;
+    ui->curvetype_CB->setCurrentIndex(2);
+    ui->cname_LE->clear();
+    updateSettings();
+    drawCurve();
+}
+
+void ModelEdit::setCurve(uint8_t c, int8_t ar[])
+{
+    int len=sizeof(ar)/sizeof(int8_t);
+    if (GetEepromInterface()->getCapability(CustomCurves)) {
+      if (GetEepromInterface()->getCapability(NumCurves)>c) {
+        if (len<9) {
+          model.curves[c].count=5;
+          model.curves[c].custom=false;
+          for (int i=0; i< 5; i++) {
+            model.curves[c].points[i].y=ar[i];
+          }
+        } else {
+          model.curves[c].count=5;
+          model.curves[c].custom=false;
+          for (int i=0; i< 5; i++) {
+            model.curves[c].points[i].y=ar[i];
+          }
+        }
+      }
+    } else {
+      if (len<9) {
+        model.curves[c].count=5;
+        model.curves[c].custom=false;
+        for (int i=0; i< 5; i++) {
+          model.curves[c].points[i].y=ar[i];
+        }
+      } else {
+        model.curves[c+8].count=5;
+        model.curves[c+8].custom=false;
+        for (int i=0; i< 5; i++) {
+          model.curves[c+8].points[i].y=ar[i];
+        }
+      }
+    }
+}
+
+void ModelEdit::ControlCurveSignal(bool flag)
+{
+    foreach(QSpinBox *sb, findChildren<QSpinBox *>(QRegExp("curvePt[0-9]+"))) {
+      sb->blockSignals(flag);
+    }
+}
+#endif
diff --git a/companion/src/modeledit/curves.h b/companion/src/modeledit/curves.h
new file mode 100644
index 000000000..a1086dde0
--- /dev/null
+++ b/companion/src/modeledit/curves.h
@@ -0,0 +1,47 @@
+#ifndef CURVES_H
+#define CURVES_H
+
+#include "modelpanel.h"
+#include <QSpinBox>
+
+namespace Ui {
+  class Curves;
+}
+
+class Curves : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    Curves(QWidget *parent, ModelData & model);
+    virtual ~Curves();
+
+    virtual void update();
+
+  private slots:
+    void resetCurve();
+    void editCurve();
+    void plotCurve(bool checked);
+    void on_cname_LE_editingFinished();
+    void on_curvetype_CB_currentIndexChanged(int index);
+    void onPointEdited();
+    void onNodeMoved(int x, int y);
+    void onNodeFocus();
+    void onNodeUnfocus();
+
+  protected:
+    virtual void resizeEvent(QResizeEvent *event);
+
+  private:
+    Ui::Curves *ui;
+    int currentCurve;
+    bool visibleCurves[C9X_MAX_CURVES];
+    QSpinBox * spnx[C9X_MAX_POINTS];
+    QSpinBox * spny[C9X_MAX_POINTS];
+    void setCurrentCurve(int index);
+    void updateCurve();
+    void updateCurveType();
+
+};
+
+#endif // CURVES_H
diff --git a/companion/src/modeledit/curves.ui b/companion/src/modeledit/curves.ui
new file mode 100644
index 000000000..17ad1d39a
--- /dev/null
+++ b/companion/src/modeledit/curves.ui
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Curves</class>
+ <widget class="QWidget" name="Curves">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>638</width>
+    <height>587</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="gridLayout_80" columnstretch="0,0,0,0,0">
+     <item row="0" column="0" rowspan="3">
+      <layout class="QGridLayout" name="curvesLayout"/>
+     </item>
+     <item row="0" column="1" rowspan="3">
+      <layout class="QGridLayout" name="gridLayout_8" rowstretch="0,0,0" columnstretch="1,1">
+       <item row="1" column="0">
+        <widget class="QLabel" name="curvetype_label">
+         <property name="text">
+          <string>Curve type</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QComboBox" name="curvetype_CB">
+         <item>
+          <property name="text">
+           <string>3 points</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>3 points custom</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>5 points</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>5 points custom</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>9 points</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>9 points custom</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>17 points</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>17 points custom</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="cname_label">
+         <property name="text">
+          <string>Curve name</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="cname_LE">
+         <property name="maxLength">
+          <number>6</number>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="2">
+        <widget class="QGraphicsView" name="curvePreview">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>400</width>
+           <height>400</height>
+          </size>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="2" rowspan="3" colspan="2">
+      <layout class="QGridLayout" name="pointsLayout">
+       <property name="horizontalSpacing">
+        <number>0</number>
+       </property>
+       <property name="verticalSpacing">
+        <number>2</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+      </layout>
+     </item>
+     <item row="4" column="0" colspan="5">
+      <spacer name="verticalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="4" rowspan="3">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp
new file mode 100644
index 000000000..e6c883ee6
--- /dev/null
+++ b/companion/src/modeledit/customfunctions.cpp
@@ -0,0 +1,474 @@
+#include "customfunctions.h"
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include "helpers.h"
+
+CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
+  ModelPanel(parent, model),
+  generalSettings(generalSettings),
+  phononLock(false)
+{
+  QGridLayout * gridLayout = new QGridLayout(this);
+
+  int col = 1;
+  addLabel(gridLayout, tr("Switch"), col++);
+  addLabel(gridLayout, tr("Function"), col++);
+  addLabel(gridLayout, tr("Parameters"), col++);
+  addLabel(gridLayout, tr("Enable"), col++);
+
+  lock = true;
+  int num_fsw = GetEepromInterface()->getCapability(CustomFunctions);
+
+  QStringList paramarmList;
+  if (!GetEepromInterface()->getCapability(VoicesAsNumbers)) {
+    for (int i=0; i<num_fsw; i++) {
+      if (model.funcSw[i].func==FuncPlayPrompt || model.funcSw[i].func==FuncBackgroundMusic) {
+        QString temp = model.funcSw[i].paramarm;
+        if (!temp.isEmpty()) {
+          if (!paramarmList.contains(temp)) {
+            paramarmList.append(temp);
+          }
+        }
+      }
+    }
+
+    QSettings settings("companion9x", "companion9x");
+    QString path = settings.value("sdPath", ".").toString();
+    path.append("/SOUNDS/");
+    QString lang = generalSettings.ttsLanguage;
+    if (lang.isEmpty())
+      lang="en";
+    path.append(lang);
+    QDir qd(path);
+    int vml= GetEepromInterface()->getCapability(VoicesMaxLength)+4;
+    if (qd.exists()) {
+      QStringList filters;
+      filters << "*.wav" << "*.WAV";
+      foreach ( QString file, qd.entryList(filters, QDir::Files) ) {
+        QFileInfo fi(file);
+        QString temp=fi.completeBaseName();
+        if (!paramarmList.contains(temp) && temp.length()<=vml) {
+          paramarmList.append(temp);
+        }
+      }
+    }
+  }
+
+  for (int i=0; i<num_fsw; i++) {
+    AssignFunc func = model.funcSw[i].func;
+
+    // The label
+    QLabel * label = new QLabel(this);
+    label->setContextMenuPolicy(Qt::CustomContextMenu);
+    label->setMouseTracking(true);
+    label->setProperty("index", i);
+    label->setText(tr("CF%1").arg(i+1));
+    gridLayout->addWidget(label, i+1, 0);
+    connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint)));
+
+    // The switch
+    fswtchSwtch[i] = new QComboBox(this);
+    fswtchSwtch[i]->setProperty("index", i);
+    connect(fswtchSwtch[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
+    gridLayout->addWidget(fswtchSwtch[i], i+1, 1);
+    populateSwitchCB(fswtchSwtch[i], model.funcSw[i].swtch, POPULATE_MSWITCHES|POPULATE_ONOFF);
+
+    // The function
+    fswtchFunc[i] = new QComboBox(this);
+    fswtchFunc[i]->setProperty("index", i);
+    connect(fswtchFunc[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
+    gridLayout->addWidget(fswtchFunc[i], i+1, 2);
+    populateFuncCB(fswtchFunc[i], model.funcSw[i].func);
+
+    QHBoxLayout *paramLayout = new QHBoxLayout();
+    gridLayout->addLayout(paramLayout, i+1, 3);
+
+    fswtchGVmode[i] = new QComboBox(this);
+    fswtchGVmode[i]->setProperty("index", i);
+    connect(fswtchGVmode[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
+    paramLayout->addWidget(fswtchGVmode[i]);
+    populateGVmodeCB(fswtchGVmode[i], model.funcSw[i].adjustMode);
+
+    fswtchParamGV[i] = new QCheckBox(this);
+    fswtchParamGV[i]->setProperty("index", i);
+    fswtchParamGV[i]->setText("GV");
+    fswtchParamGV[i]->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
+    connect(fswtchParamGV[i], SIGNAL(stateChanged(int)), this, SLOT(customFunctionEdited()));
+    paramLayout->addWidget(fswtchParamGV[i]);
+
+    fswtchParam[i] = new QDoubleSpinBox(this);
+    fswtchParam[i]->setProperty("index", i);
+    fswtchParam[i]->setAccelerated(true);
+    fswtchParam[i]->setDecimals(0);
+    connect(fswtchParam[i], SIGNAL(editingFinished()), this, SLOT(customFunctionEdited()));
+    paramLayout->addWidget(fswtchParam[i]);
+
+    fswtchParamT[i] = new QComboBox(this);
+    fswtchParamT[i]->setProperty("index", i);
+    paramLayout->addWidget(fswtchParamT[i]);
+    populateFuncParamCB(fswtchParamT[i], func, model.funcSw[i].param, model.funcSw[i].adjustMode);
+    connect(fswtchParamT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
+
+    fswtchParamArmT[i] = new QComboBox(this);
+    fswtchParamArmT[i]->setProperty("index", i);
+    populateFuncParamArmTCB(fswtchParamArmT[i],&model, model.funcSw[i].paramarm, paramarmList);
+    fswtchParamArmT[i]->setEditable(true);
+    paramLayout->addWidget(fswtchParamArmT[i]);
+
+    connect(fswtchParamArmT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
+    connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited()));
+
+#ifdef PHONON
+    playBT[i] = new QPushButton(this);
+    playBT[i]->setObjectName(QString("play_%1").arg(i));
+    playBT[i]->setIcon(QIcon(":/images/play.png"));
+    paramLayout->addWidget(playBT[i]);
+    connect(playBT[i], SIGNAL(pressed()), this, SLOT(playMusic()));
+#endif
+
+    QHBoxLayout *repeatLayout = new QHBoxLayout();
+    gridLayout->addLayout(repeatLayout, i+1, 4);
+
+    fswtchRepeat[i] = new QComboBox(this);
+    fswtchRepeat[i]->setProperty("index", i);
+    connect(fswtchRepeat[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
+    repeatLayout->addWidget(fswtchRepeat[i], i+1);
+    populateRepeatCB(fswtchRepeat[i], model.funcSw[i].repeatParam);
+
+    fswtchEnable[i] = new QCheckBox(this);
+    fswtchEnable[i]->setProperty("index", i);
+    fswtchEnable[i]->setText(tr("ON"));
+    repeatLayout->addWidget(fswtchEnable[i], i+1);
+    fswtchEnable[i]->setChecked(model.funcSw[i].enabled);
+    connect(fswtchEnable[i], SIGNAL(stateChanged(int)), this, SLOT(customFunctionEdited()));
+  }
+
+  lock = false;
+}
+
+CustomFunctionsPanel::~CustomFunctionsPanel()
+{
+}
+
+#ifdef PHONON
+
+void CustomFunctionsPanel::mediaPlayer_state(Phonon::State newState, Phonon::State oldState)
+{
+    if (phononLock)
+      return;
+    phononLock=true;
+    if ((newState==Phonon::StoppedState || newState==Phonon::PausedState)  && oldState==Phonon::PlayingState) {
+      clickObject->stop();
+      clickObject->clearQueue();
+      clickObject->clear();
+      for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
+        playBT[i]->setObjectName(QString("play_%1").arg(i));
+        playBT[i]->setIcon(QIcon(":/images/play.png"));
+      }
+    }
+    if (newState==Phonon::ErrorState) {
+      clickObject->stop();
+      clickObject->clearQueue();
+      clickObject->clear();
+      for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
+        playBT[i]->setObjectName(QString("play_%1").arg(i));
+        playBT[i]->setIcon(QIcon(":/images/play.png"));
+      }
+    }
+
+    phononLock=false;
+}
+#endif
+
+void CustomFunctionsPanel::playMusic()
+{
+    QPushButton *playButton = qobject_cast<QPushButton*>(sender());
+    int index=playButton->objectName().mid(5,2).toInt();
+    QString function=playButton->objectName().left(4);
+    QSettings settings("companion9x", "companion9x");
+    QString path=settings.value("sdPath", ".").toString();
+    QDir qd(path);
+    QString track;
+    if (qd.exists()) {
+      if (GetEepromInterface()->getCapability(VoicesAsNumbers)) {
+        track=path+QString("/%1.wav").arg(int(fswtchParam[index]->value()),4,10,(const QChar)'0');
+      } else {
+        path.append("/SOUNDS/");
+        QString lang = generalSettings.ttsLanguage;
+        if (lang.isEmpty())
+          lang="en";
+        path.append(lang);
+        if (fswtchParamArmT[index]->currentText()!="----") {
+          track=path+"/"+fswtchParamArmT[index]->currentText()+".wav";
+        }
+      }
+      QFile file(track);
+      if (!file.exists()) {
+        QMessageBox::critical(this, tr("Error"), tr("Unable to find sound file %1!").arg(track));
+        track.clear();
+      }
+#ifdef PHONON
+      if (function=="play" && !track.isEmpty()) {
+        clickObject->clear();
+        clickObject->setCurrentSource(Phonon::MediaSource(track));
+        clickObject->play();
+        playBT[index]->setObjectName(QString("stop_%1").arg(index));
+        playBT[index]->setIcon(QIcon(":/images/stop.png"));
+      } else {
+        clickObject->stop();
+        clickObject->clear();
+        playBT[index]->setObjectName(QString("play_%1").arg(index));
+        playBT[index]->setIcon(QIcon(":/images/play.png"));
+      }
+#endif
+    }
+}
+
+#define CUSTOM_FUNCTION_NUMERIC_PARAM  (1<<0)
+#define CUSTOM_FUNCTION_SOURCE_PARAM   (1<<1)
+#define CUSTOM_FUNCTION_FILE_PARAM     (1<<2)
+#define CUSTOM_FUNCTION_GV_MODE        (1<<3)
+#define CUSTOM_FUNCTION_GV_TOOGLE      (1<<4)
+#define CUSTOM_FUNCTION_ENABLE         (1<<5)
+#define CUSTOM_FUNCTION_REPEAT         (1<<6)
+#define CUSTOM_FUNCTION_PLAY           (1<<7)
+
+void CustomFunctionsPanel::customFunctionEdited()
+{
+  if (!lock) {
+    lock = true;
+
+    int index = sender()->property("index").toInt();
+    refreshCustomFunction(index, true);
+
+    emit modified();
+    lock = false;
+  }
+}
+
+void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
+{
+    unsigned int widgetsMask = 0;
+    if (modified) {
+      model.funcSw[i].swtch = RawSwitch(fswtchSwtch[i]->itemData(fswtchSwtch[i]->currentIndex()).toInt());
+      model.funcSw[i].func = (AssignFunc)fswtchFunc[i]->currentIndex();
+      model.funcSw[i].enabled =fswtchEnable[i]->isChecked();
+      model.funcSw[i].repeatParam = (AssignFunc)fswtchRepeat[i]->currentIndex();
+      model.funcSw[i].adjustMode = (AssignFunc)fswtchGVmode[i]->currentIndex();
+    }
+
+    int index = fswtchFunc[i]->currentIndex();
+
+    if (index>=FuncSafetyCh1 && index<=FuncSafetyCh16) {
+      fswtchParam[i]->setDecimals(0);
+      fswtchParam[i]->setSingleStep(1);
+      fswtchParam[i]->setMinimum(-125);
+      fswtchParam[i]->setMaximum(125);
+      if (modified) {
+        model.funcSw[i].param = fswtchParam[i]->value();
+      }
+      fswtchParam[i]->setValue(model.funcSw[i].param);
+      widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_ENABLE;
+    } else if (index==FuncLogs) {
+      fswtchParam[i]->setDecimals(1);
+      fswtchParam[i]->setMinimum(0);
+      fswtchParam[i]->setMaximum(25.5);
+      fswtchParam[i]->setSingleStep(0.1);
+      if (modified) model.funcSw[i].param = fswtchParam[i]->value()*10.0;
+      fswtchParam[i]->setValue(model.funcSw[i].param/10.0);
+      widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_ENABLE;
+    }
+    else if (index>=FuncAdjustGV1 && index<=FuncAdjustGVLast) {
+      if (modified) model.funcSw[i].adjustMode = fswtchGVmode[i]->currentIndex();
+      widgetsMask |= CUSTOM_FUNCTION_GV_MODE + CUSTOM_FUNCTION_ENABLE;
+      if (model.funcSw[i].adjustMode==0) {
+        if (modified) model.funcSw[i].param = fswtchParam[i]->value();
+        fswtchParam[i]->setDecimals(0);
+        fswtchParam[i]->setSingleStep(1);
+        fswtchParam[i]->setMinimum(-125);
+        fswtchParam[i]->setMaximum(125);
+        fswtchParam[i]->setValue(model.funcSw[i].param);
+        widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM;
+      } else {
+        if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
+        populateFuncParamCB(fswtchParamT[i], index, model.funcSw[i].param, model.funcSw[i].adjustMode);
+        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
+      }
+    } else if (index==FuncReset) {
+      if (modified) model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
+      populateFuncParamCB(fswtchParamT[i], index, model.funcSw[i].param);
+      widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
+    } else if (index==FuncVolume) {
+      if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
+      populateFuncParamCB(fswtchParamT[i], index, model.funcSw[i].param);
+      widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_ENABLE;
+    } else if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) {
+      if (modified) model.funcSw[i].repeatParam = fswtchRepeat[i]->itemData(fswtchRepeat[i]->currentIndex()).toInt();
+      if (index != FuncBackgroundMusic) {
+        if (GetEepromInterface()->getCapability(HasFuncRepeat)) {
+          widgetsMask |= CUSTOM_FUNCTION_REPEAT;
+        }
+      }
+      if (index==FuncPlayValue) {
+        if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
+        populateFuncParamCB(fswtchParamT[i], index, model.funcSw[i].param);
+        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_REPEAT;
+      } else if (index==FuncPlayPrompt || index==FuncPlayBoth) {
+        if (GetEepromInterface()->getCapability(VoicesAsNumbers)) {
+          fswtchParam[i]->setDecimals(0);
+          fswtchParam[i]->setSingleStep(1);
+          fswtchParam[i]->setMinimum(0);
+          if (index==FuncPlayPrompt) {
+            widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_REPEAT + CUSTOM_FUNCTION_GV_TOOGLE;
+          } else {
+            widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_REPEAT;
+            fswtchParamGV[i]->setChecked(false);
+          }
+          fswtchParam[i]->setMaximum(index==FuncPlayBoth ? 254 : 255);
+          if (modified) {
+            if (fswtchParamGV[i]->isChecked()) {
+              fswtchParam[i]->setMinimum(1);
+              model.funcSw[i].param = std::min(fswtchParam[i]->value(),5.0)+(fswtchParamGV[i]->isChecked() ? 250 : 0);
+            } else {
+              model.funcSw[i].param = fswtchParam[i]->value();
+            }
+          }
+          if (model.funcSw[i].param>250 && (index!=FuncPlayBoth)) {
+            fswtchParamGV[i]->setChecked(true);
+            fswtchParam[i]->setValue(model.funcSw[i].param-250);
+            fswtchParam[i]->setMaximum(5);
+          } else {
+            fswtchParamGV[i]->setChecked(false);
+            fswtchParam[i]->setValue(model.funcSw[i].param);
+          }
+          if (model.funcSw[i].param < 251)
+            widgetsMask |= CUSTOM_FUNCTION_PLAY;
+        } else {
+          widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
+          if (modified) {
+            memset(model.funcSw[i].paramarm, 0, sizeof(model.funcSw[i].paramarm));
+            int vml=GetEepromInterface()->getCapability(VoicesMaxLength);
+            if (fswtchParamArmT[i]->currentText() != "----") {
+              widgetsMask |= CUSTOM_FUNCTION_PLAY;
+              for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(),vml); j++) {
+                model.funcSw[i].paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
+              }
+            }
+          }
+        }
+      } else if (index==FuncBackgroundMusic) {
+        widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
+        if (modified) {
+          memset(model.funcSw[i].paramarm, 0, sizeof(model.funcSw[i].paramarm));
+          int vml=GetEepromInterface()->getCapability(VoicesMaxLength);
+          if (fswtchParamArmT[i]->currentText() != "----") {
+            widgetsMask |= CUSTOM_FUNCTION_PLAY;
+            for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(),vml); j++) {
+              model.funcSw[i].paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
+            }
+          }
+        }
+      } else if (index==FuncPlaySound) {
+        if (modified) model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
+        populateFuncParamCB(fswtchParamT[i], index, model.funcSw[i].param);
+        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
+      } else if (index==FuncPlayHaptic) {
+        if (modified) model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
+        populateFuncParamCB(fswtchParamT[i], index, model.funcSw[i].param);
+        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
+      }
+   } else if (model.funcSw[i].swtch.type!=SWITCH_TYPE_NONE) {
+      if (modified) model.funcSw[i].param = fswtchParam[i]->value();
+      fswtchParam[i]->setDecimals(0);
+      fswtchParam[i]->setSingleStep(1);
+      fswtchParam[i]->setValue(model.funcSw[i].param);
+      if (index<=FuncInstantTrim) {
+        widgetsMask |= CUSTOM_FUNCTION_ENABLE;
+      }
+    }
+
+    fswtchParam[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_NUMERIC_PARAM);
+    fswtchParamGV[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_TOOGLE);
+    fswtchParamT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_SOURCE_PARAM);
+    fswtchParamArmT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_FILE_PARAM);
+    fswtchEnable[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_ENABLE);
+    if (!(widgetsMask & CUSTOM_FUNCTION_ENABLE)) fswtchEnable[i]->setChecked(false);
+    fswtchRepeat[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_REPEAT);
+    fswtchGVmode[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_MODE);
+#ifdef PHONON
+    playBT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_PLAY);
+#endif
+}
+
+void CustomFunctionsPanel::update()
+{
+  for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
+    refreshCustomFunction(i);
+  }
+}
+
+void CustomFunctionsPanel::fswPaste()
+{
+  const QClipboard *clipboard = QApplication::clipboard();
+  const QMimeData *mimeData = clipboard->mimeData();
+  if (mimeData->hasFormat("application/x-companion9x-fsw")) {
+    QByteArray fswData = mimeData->data("application/x-companion9x-fsw");
+
+    FuncSwData *fsw = &model.funcSw[selectedFunction];
+    memcpy(fsw, fswData.mid(0, sizeof(FuncSwData)).constData(), sizeof(FuncSwData));
+    // TODO update switch and func
+    populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, POPULATE_MSWITCHES|POPULATE_ONOFF);
+    populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func);
+    refreshCustomFunction(selectedFunction);
+    emit modified();
+  }
+}
+
+void CustomFunctionsPanel::fswDelete()
+{
+  model.funcSw[selectedFunction].clear();
+  // TODO update switch and func
+  populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, POPULATE_MSWITCHES|POPULATE_ONOFF);
+  populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func);
+  refreshCustomFunction(selectedFunction);
+  emit modified();
+}
+
+void CustomFunctionsPanel::fswCopy()
+{
+    QByteArray fswData;
+    fswData.append((char*)&model.funcSw[selectedFunction],sizeof(FuncSwData));
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("application/x-companion9x-fsw", fswData);
+    QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
+}
+
+void CustomFunctionsPanel::fswCut()
+{
+    fswCopy();
+    fswDelete();
+}
+
+void CustomFunctionsPanel::fsw_customContextMenuRequested(QPoint pos)
+{
+    QLabel *label = (QLabel *)sender();
+    selectedFunction = label->property("index").toInt();
+
+    QPoint globalPos = label->mapToGlobal(pos);
+
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+    bool hasData = mimeData->hasFormat("application/x-companion9x-fsw");
+
+    QMenu contextMenu;
+    contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(fswDelete()),tr("Delete"));
+    contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(fswCopy()),tr("Ctrl+C"));
+    contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(fswCut()),tr("Ctrl+X"));
+    contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(fswPaste()),tr("Ctrl+V"))->setEnabled(hasData);
+
+    contextMenu.exec(globalPos);
+}
diff --git a/companion/src/modeledit/customfunctions.h b/companion/src/modeledit/customfunctions.h
new file mode 100644
index 000000000..e6729da6a
--- /dev/null
+++ b/companion/src/modeledit/customfunctions.h
@@ -0,0 +1,61 @@
+#ifndef CUSTOMFUNCTIONS_H
+#define CUSTOMFUNCTIONS_H
+
+#include "modelpanel.h"
+#include <QLabel>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDoubleSpinBox>
+#include <QPushButton>
+#ifdef PHONON
+#include <phonon/audiooutput.h>
+#include <phonon/mediaobject.h>
+#include <phonon/mediasource.h>
+#endif
+
+class CustomFunctionsPanel : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    CustomFunctionsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    ~CustomFunctionsPanel();
+
+    virtual void update();
+
+  private slots:
+    void customFunctionEdited();
+    void fsw_customContextMenuRequested(QPoint pos);
+    void refreshCustomFunction(int index, bool modified=false);
+    void playMusic();
+#ifdef PHONON
+    void mediaPlayer_state(Phonon::State newState, Phonon::State oldState);
+#endif
+    void fswDelete();
+    void fswCopy();
+    void fswPaste();
+    void fswCut();
+
+  private:
+    GeneralSettings & generalSettings;
+    bool phononLock;
+    QComboBox * fswtchSwtch[C9X_MAX_CUSTOM_FUNCTIONS];
+    QComboBox * fswtchFunc[C9X_MAX_CUSTOM_FUNCTIONS];
+    QCheckBox * fswtchParamGV[C9X_MAX_CUSTOM_FUNCTIONS];
+    QDoubleSpinBox * fswtchParam[C9X_MAX_CUSTOM_FUNCTIONS];
+    QPushButton * playBT[C9X_MAX_CUSTOM_FUNCTIONS];
+    QComboBox * fswtchParamT[C9X_MAX_CUSTOM_FUNCTIONS];
+    QComboBox * fswtchParamArmT[C9X_MAX_CUSTOM_FUNCTIONS];
+    QCheckBox * fswtchEnable[C9X_MAX_CUSTOM_FUNCTIONS];
+    QComboBox * fswtchRepeat[C9X_MAX_CUSTOM_FUNCTIONS];
+    QComboBox * fswtchGVmode[C9X_MAX_CUSTOM_FUNCTIONS];
+#ifdef PHONON
+    Phonon::MediaObject *clickObject;
+    Phonon::AudioOutput *clickOutput;
+#endif
+
+    int selectedFunction;
+
+};
+
+#endif // CUSTOMFUNCTIONS_H
diff --git a/companion/src/modeledit/customswitches.cpp b/companion/src/modeledit/customswitches.cpp
new file mode 100644
index 000000000..b20cd1f68
--- /dev/null
+++ b/companion/src/modeledit/customswitches.cpp
@@ -0,0 +1,399 @@
+#include "customswitches.h"
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include "helpers.h"
+
+CustomSwitchesPanel::CustomSwitchesPanel(QWidget * parent, ModelData & model):
+  ModelPanel(parent, model),
+  selectedSwitch(0)
+{
+  QGridLayout * gridLayout = new QGridLayout(this);
+
+  int col = 1;
+  addLabel(gridLayout, tr("Function"), col++);
+  addLabel(gridLayout, tr("V1"), col++);
+  addLabel(gridLayout, tr("V2"), col++);
+  addLabel(gridLayout, tr("AND"), col++);
+  if (GetEepromInterface()->getCapability(CustomSwitchesExt)) {
+    addLabel(gridLayout, tr("Duration"), col++);
+    addLabel(gridLayout, tr("Delay"), col++);
+  }
+
+  lock = true;
+  for (int i=0; i<GetEepromInterface()->getCapability(CustomSwitches); i++) {
+    // The label
+    QLabel * label = new QLabel(this);
+    label->setProperty("index", i);
+    if (i < 9)
+      label->setText(tr("CS%1").arg(i+1));
+    else
+      label->setText(tr("CS%1").arg(QChar('A'+i-9)));
+    label->setContextMenuPolicy(Qt::CustomContextMenu);
+    label->setMouseTracking(true);
+    connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(csw_customContextMenuRequested(QPoint)));
+    gridLayout->addWidget(label, i+1, 0);
+
+    // The function
+    csw[i] = new QComboBox(this);
+    csw[i]->setProperty("index", i);
+    connect(csw[i], SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
+    gridLayout->addWidget(csw[i], i+1, 1);
+
+    // V1
+    cswitchSource1[i] = new QComboBox(this);
+    cswitchSource1[i]->setProperty("index",i);
+    connect(cswitchSource1[i], SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
+    gridLayout->addWidget(cswitchSource1[i], i+1, 2);
+    cswitchSource1[i]->setVisible(false);
+    cswitchValue[i] = new QDoubleSpinBox(this);
+    cswitchValue[i]->setMaximum(125);
+    cswitchValue[i]->setMinimum(-125);
+    cswitchValue[i]->setAccelerated(true);
+    cswitchValue[i]->setDecimals(0);
+    cswitchValue[i]->setProperty("index", i);
+    connect(cswitchValue[i], SIGNAL(editingFinished()), this, SLOT(edited()));
+    gridLayout->addWidget(cswitchValue[i], i+1, 2);
+    cswitchValue[i]->setVisible(false);
+
+    // V2
+    cswitchSource2[i] = new QComboBox(this);
+    cswitchSource2[i]->setProperty("index", i);
+    connect(cswitchSource2[i], SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
+    gridLayout->addWidget(cswitchSource2[i], i+1, 3);
+    cswitchSource2[i]->setVisible(false);
+    cswitchOffset[i] = new QDoubleSpinBox(this);
+    cswitchOffset[i]->setProperty("index",i);
+    cswitchOffset[i]->setMaximum(125);
+    cswitchOffset[i]->setMinimum(-125);
+    cswitchOffset[i]->setAccelerated(true);
+    cswitchOffset[i]->setDecimals(0);
+    connect(cswitchOffset[i], SIGNAL(editingFinished()), this, SLOT(edited()));
+    gridLayout->addWidget(cswitchOffset[i], i+1, 3);
+    cswitchOffset[i]->setVisible(false);
+
+    // AND
+    cswitchAnd[i] = new QComboBox(this);
+    cswitchAnd[i]->setProperty("index", i);
+    connect(cswitchAnd[i], SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
+    gridLayout->addWidget(cswitchAnd[i], i+1, 4);
+    cswitchAnd[i]->setVisible(false);
+
+    if (GetEepromInterface()->getCapability(CustomSwitchesExt)) {
+      // Duration
+      cswitchDuration[i] = new QDoubleSpinBox(this);
+      cswitchDuration[i]->setProperty("index", i);
+      cswitchDuration[i]->setSingleStep(0.5);
+      cswitchDuration[i]->setMaximum(50);
+      cswitchDuration[i]->setMinimum(0);
+      cswitchDuration[i]->setAccelerated(true);
+      cswitchDuration[i]->setDecimals(1);
+      connect(cswitchDuration[i],SIGNAL(editingFinished()), this, SLOT(edited()));
+      gridLayout->addWidget(cswitchDuration[i], i+1, 5);
+      cswitchDuration[i]->setVisible(false);
+
+      // Delay
+      cswitchDelay[i] = new QDoubleSpinBox(this);
+      cswitchDelay[i]->setProperty("index", i);
+      cswitchDelay[i]->setSingleStep(0.5);
+      cswitchDelay[i]->setMaximum(50);
+      cswitchDelay[i]->setMinimum(0);
+      cswitchDelay[i]->setAccelerated(true);
+      cswitchDelay[i]->setDecimals(1);
+      connect(cswitchDelay[i], SIGNAL(editingFinished()), this, SLOT(edited()));
+      gridLayout->addWidget(cswitchDelay[i], i+1, 6);
+      cswitchDelay[i]->setVisible(false);
+    }
+  }
+
+  lock = false;
+}
+
+CustomSwitchesPanel::~CustomSwitchesPanel()
+{
+}
+
+void CustomSwitchesPanel::edited()
+{
+  if (!lock) {
+    lock = true;
+    int i = sender()->property("index").toInt();
+    bool chAr;
+    float value, step;
+    int newval;
+    chAr = (getCSFunctionFamily(model.customSw[i].func) != getCSFunctionFamily(csw[i]->itemData(csw[i]->currentIndex()).toInt()));
+    model.customSw[i].func = csw[i]->itemData(csw[i]->currentIndex()).toInt();
+    if(chAr) {
+      if (getCSFunctionFamily(model.customSw[i].func)==CS_FAMILY_TIMERS) {
+        model.customSw[i].val1 = -119;
+        model.customSw[i].val2 = -119;
+      } else {
+        model.customSw[i].val1 = 0;
+        model.customSw[i].val2 = 0;
+      }
+      model.customSw[i].andsw = 0;
+      setSwitchWidgetVisibility(i);
+    }
+    if (GetEepromInterface()->getCapability(CustomSwitchesExt)) {
+      model.customSw[i].duration= (uint8_t)round(cswitchDuration[i]->value()*2);
+      model.customSw[i].delay= (uint8_t)round(cswitchDelay[i]->value()*2);
+    }
+    RawSource source;
+    switch (getCSFunctionFamily(model.customSw[i].func))
+    {
+      case (CS_FAMILY_VOFS):
+        if (model.customSw[i].val1 != cswitchSource1[i]->itemData(cswitchSource1[i]->currentIndex()).toInt()) {
+          source=RawSource(model.customSw[i].val1);
+          model.customSw[i].val1 = cswitchSource1[i]->itemData(cswitchSource1[i]->currentIndex()).toInt();
+          RawSource newSource = RawSource(model.customSw[i].val1);
+          if (newSource.type == SOURCE_TYPE_TELEMETRY) {
+            if (model.customSw[i].func>CS_FN_ELESS && model.customSw[i].func<CS_FN_VEQUAL) {
+              model.customSw[i].val2 = 0;
+            } else {
+              model.customSw[i].val2 = -128;
+            }
+          } else {
+            if (model.customSw[i].func>CS_FN_ELESS && model.customSw[i].func<CS_FN_VEQUAL) {
+              model.customSw[i].val2 = (cswitchOffset[i]->value()/source.getStep(model));
+            } else {
+              model.customSw[i].val2 = ((cswitchOffset[i]->value()-source.getOffset(model))/source.getStep(model))-source.getRawOffset(model);
+            }
+          }
+          setSwitchWidgetVisibility(i);
+       } else {
+          source=RawSource(model.customSw[i].val1);
+          if (model.customSw[i].func>CS_FN_ELESS && model.customSw[i].func<CS_FN_VEQUAL) {
+            model.customSw[i].val2 = (cswitchOffset[i]->value()/source.getStep(model));
+            cswitchOffset[i]->setValue(model.customSw[i].val2*source.getStep(model));
+          } else {
+            model.customSw[i].val2 = ((cswitchOffset[i]->value()-source.getOffset(model))/source.getStep(model))-source.getRawOffset(model);
+            cswitchOffset[i]->setValue((model.customSw[i].val2 +source.getRawOffset(model))*source.getStep(model)+source.getOffset(model));
+          }
+        }
+        break;
+      case (CS_FAMILY_TIMERS): {
+        value=cswitchOffset[i]->value();
+        newval=TimToVal(value);
+        if (newval>model.customSw[i].val2) {
+          if (value >=60) {
+            value=round(value);
+            step=1;
+          } else if (value>=2) {
+            value=(round(value*2.0)/2);
+            step=0.5;
+          } else {
+            step=0.1;
+          }
+        } else {
+          if (value <=2) {
+            step=0.1;
+          } else if (value<=60) {
+            value=(round(value*2.0)/2);
+            step=0.5;
+          } else {
+            value=round(value);
+            step=1;
+          }
+        }
+        model.customSw[i].val2=TimToVal(value);
+        value=ValToTim(model.customSw[i].val2);
+        cswitchOffset[i]->setValue(value);
+        cswitchOffset[i]->setSingleStep(step);
+
+        value=cswitchValue[i]->value();
+        newval=TimToVal(value);
+        if (newval>model.customSw[i].val1) {
+          if (value >=60) {
+            value=round(value);
+            step=1;
+          } else if (value>=2) {
+            value=(round(value*2.0)/2);
+            step=0.5;
+          } else {
+            step=0.1;
+          }
+        } else {
+          if (value <=2) {
+            step=0.1;
+          } else if (value<=60) {
+            value=(round(value*2.0)/2);
+            step=0.5;
+          } else {
+            value=round(value);
+            step=1;
+          }
+        }
+        model.customSw[i].val1=TimToVal(value);
+        value=ValToTim(model.customSw[i].val1);
+        cswitchValue[i]->setValue(value);
+        cswitchValue[i]->setSingleStep(step);
+        break;
+        }
+      case (CS_FAMILY_VBOOL):
+      case (CS_FAMILY_VCOMP):
+        model.customSw[i].val1 = cswitchSource1[i]->itemData(cswitchSource1[i]->currentIndex()).toInt();
+        model.customSw[i].val2 = cswitchSource2[i]->itemData(cswitchSource2[i]->currentIndex()).toInt();
+        break;
+    }
+    model.customSw[i].andsw = cswitchAnd[i]->itemData(cswitchAnd[i]->currentIndex()).toInt();
+    emit modified();
+    lock = false;
+  }
+}
+
+void CustomSwitchesPanel::setSwitchWidgetVisibility(int i)
+{
+    RawSource source = RawSource(model.customSw[i].val1);
+    switch (getCSFunctionFamily(model.customSw[i].func))
+    {
+      case CS_FAMILY_VOFS:
+        cswitchSource1[i]->setVisible(true);
+        cswitchSource2[i]->setVisible(false);
+        cswitchValue[i]->setVisible(false);
+        cswitchOffset[i]->setVisible(true);
+        populateSourceCB(cswitchSource1[i], source, POPULATE_SOURCES | (GetEepromInterface()->getCapability(ExtraTrims) ? POPULATE_TRIMS : 0) | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+        cswitchOffset[i]->setDecimals(source.getDecimals(model));
+        cswitchOffset[i]->setSingleStep(source.getStep(model));
+        if (model.customSw[i].func>CS_FN_ELESS && model.customSw[i].func<CS_FN_VEQUAL) {
+          cswitchOffset[i]->setMinimum(source.getStep(model)*-127);
+          cswitchOffset[i]->setMaximum(source.getStep(model)*127);
+          cswitchOffset[i]->setValue(source.getStep(model)*model.customSw[i].val2);
+        } else {
+          cswitchOffset[i]->setMinimum(source.getMin(model));
+          cswitchOffset[i]->setMaximum(source.getMax(model));
+          cswitchOffset[i]->setValue(source.getStep(model)*(model.customSw[i].val2+source.getRawOffset(model))+source.getOffset(model));
+        }
+        break;
+      case CS_FAMILY_VBOOL:
+        cswitchSource1[i]->setVisible(true);
+        cswitchSource2[i]->setVisible(true);
+        cswitchValue[i]->setVisible(false);
+        cswitchOffset[i]->setVisible(false);
+        populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1));
+        populateSwitchCB(cswitchSource2[i], RawSwitch(model.customSw[i].val2));
+        break;
+      case CS_FAMILY_VCOMP:
+        cswitchSource1[i]->setVisible(true);
+        cswitchSource2[i]->setVisible(true);
+        cswitchValue[i]->setVisible(false);
+        cswitchOffset[i]->setVisible(false);
+        populateSourceCB(cswitchSource1[i], RawSource(model.customSw[i].val1), POPULATE_SOURCES | (GetEepromInterface()->getCapability(ExtraTrims) ? POPULATE_TRIMS : 0) | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+        populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), POPULATE_SOURCES | (GetEepromInterface()->getCapability(ExtraTrims) ? POPULATE_TRIMS : 0) | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+        break;
+      case CS_FAMILY_TIMERS:
+        cswitchSource1[i]->setVisible(false);
+        cswitchSource2[i]->setVisible(false);
+        cswitchValue[i]->setVisible(true);
+        cswitchOffset[i]->setVisible(true);
+        cswitchOffset[i]->setDecimals(1);
+        cswitchOffset[i]->setMinimum(0.1);
+        cswitchOffset[i]->setMaximum(175);
+        float value=ValToTim(model.customSw[i].val2);
+        cswitchOffset[i]->setSingleStep(0.1);
+        if (value>60) {
+           cswitchOffset[i]->setSingleStep(1);
+        } else if (value>2) {
+          cswitchOffset[i]->setSingleStep(0.5);
+        }
+        cswitchOffset[i]->setValue(value);
+
+        cswitchValue[i]->setDecimals(1);
+        cswitchValue[i]->setMinimum(0.1);
+        cswitchValue[i]->setMaximum(175);
+        value=ValToTim(model.customSw[i].val1);
+        cswitchValue[i]->setSingleStep(0.1);
+        if (value>60) {
+           cswitchValue[i]->setSingleStep(1);
+        } else if (value>2) {
+          cswitchValue[i]->setSingleStep(0.5);
+        }
+        cswitchValue[i]->setValue(value);
+        break;
+    }
+    cswitchAnd[i]->setVisible(true);
+    populateSwitchCB(cswitchAnd[i], RawSwitch(model.customSw[i].andsw), POPULATE_AND_SWITCHES);
+    if (GetEepromInterface()->getCapability(CustomSwitchesExt)) {
+      cswitchDuration[i]->setVisible(true);
+      cswitchDuration[i]->setValue(model.customSw[i].duration/2.0);
+      cswitchDelay[i]->setVisible(true);
+      cswitchDelay[i]->setValue(model.customSw[i].delay/2.0);
+    }
+}
+
+void CustomSwitchesPanel::update()
+{
+  lock = true;
+  for (int i=0; i<GetEepromInterface()->getCapability(CustomSwitches); i++) {
+    populateCSWCB(csw[i], model.customSw[i].func);
+    setSwitchWidgetVisibility(i);
+  }
+  lock = false;
+}
+
+void CustomSwitchesPanel::cswPaste()
+{
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+    if (mimeData->hasFormat("application/x-companion9x-csw")) {
+      QByteArray cswData = mimeData->data("application/x-companion9x-csw");
+
+      CustomSwData *csw = &model.customSw[selectedSwitch];
+      memcpy(csw, cswData.mid(0, sizeof(CustomSwData)).constData(), sizeof(CustomSwData));
+      emit modified();
+      updateSelectedSwitch();
+    }
+}
+
+void CustomSwitchesPanel::cswDelete()
+{
+    model.customSw[selectedSwitch].clear();
+    emit modified();
+    updateSelectedSwitch();
+}
+
+void CustomSwitchesPanel::cswCopy()
+{
+    QByteArray cswData;
+    cswData.append((char*)&model.customSw[selectedSwitch],sizeof(CustomSwData));
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("application/x-companion9x-csw", cswData);
+    QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
+}
+
+void CustomSwitchesPanel::updateSelectedSwitch()
+{
+    lock = true;
+    populateCSWCB(csw[selectedSwitch], model.customSw[selectedSwitch].func);
+    setSwitchWidgetVisibility(selectedSwitch);
+    lock = false;
+}
+
+void CustomSwitchesPanel::cswCut()
+{
+  cswCopy();
+  cswDelete();
+}
+
+// TODO make something generic here!
+void CustomSwitchesPanel::csw_customContextMenuRequested(QPoint pos)
+{
+    QLabel *label = (QLabel *)sender();
+    selectedSwitch = label->property("index").toInt();
+
+    QPoint globalPos = label->mapToGlobal(pos);
+
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+    bool hasData = mimeData->hasFormat("application/x-companion9x-csw");
+
+    QMenu contextMenu;
+    contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(cswDelete()),tr("Delete"));
+    contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(cswCopy()),tr("Ctrl+C"));
+    contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(cswCut()),tr("Ctrl+X"));
+    contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(cswPaste()),tr("Ctrl+V"))->setEnabled(hasData);
+
+    contextMenu.exec(globalPos);
+}
diff --git a/companion/src/modeledit/customswitches.h b/companion/src/modeledit/customswitches.h
new file mode 100644
index 000000000..c00ad60b6
--- /dev/null
+++ b/companion/src/modeledit/customswitches.h
@@ -0,0 +1,42 @@
+#ifndef CUSTOMSWITCHES_H
+#define CUSTOMSWITCHES_H
+
+#include "modelpanel.h"
+#include <QComboBox>
+#include <QDoubleSpinBox>
+
+class CustomSwitchesPanel : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    CustomSwitchesPanel(QWidget *parent, ModelData & model);
+    virtual ~CustomSwitchesPanel();
+
+    virtual void update();
+
+  private slots:
+    void edited();
+    void csw_customContextMenuRequested(QPoint pos);
+    void cswDelete();
+    void cswCopy();
+    void cswPaste();
+    void cswCut();
+
+  private:
+    QComboBox * csw[C9X_NUM_CSW];
+    QDoubleSpinBox  * cswitchValue[C9X_NUM_CSW];
+    QDoubleSpinBox  * cswitchOffset[C9X_NUM_CSW];
+    QComboBox * cswitchAnd[C9X_NUM_CSW];
+    QDoubleSpinBox  * cswitchDuration[C9X_NUM_CSW];
+    QDoubleSpinBox  * cswitchDelay[C9X_NUM_CSW];
+    QComboBox * cswitchSource1[C9X_NUM_CSW];
+    QComboBox * cswitchSource2[C9X_NUM_CSW];
+    void setSwitchWidgetVisibility(int i);
+    int selectedSwitch;
+
+    void updateSelectedSwitch();
+
+};
+
+#endif // CUSTOMSWITCHES_H
diff --git a/companion/src/edge.cpp b/companion/src/modeledit/edge.cpp
similarity index 100%
rename from companion/src/edge.cpp
rename to companion/src/modeledit/edge.cpp
diff --git a/companion/src/edge.h b/companion/src/modeledit/edge.h
similarity index 100%
rename from companion/src/edge.h
rename to companion/src/modeledit/edge.h
diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp
new file mode 100644
index 000000000..bb2df0c65
--- /dev/null
+++ b/companion/src/modeledit/expodialog.cpp
@@ -0,0 +1,235 @@
+#include "expodialog.h"
+#include "ui_expodialog.h"
+#include "eeprominterface.h"
+#include "helpers.h"
+
+ExpoDialog::ExpoDialog(QWidget *parent, ExpoData *expoData, int stickMode) :
+    QDialog(parent),
+    ui(new Ui::ExpoDialog),
+    ed(expoData)
+{
+    ui->setupUi(this);
+    QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
+    QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
+
+    setWindowTitle(tr("DEST -> %1").arg(getStickStr(ed->chn)));
+    QRegExp rx(CHAR_FOR_NAMES_REGEX);
+    
+    int gvars=0;
+    if (GetEepromInterface()->getCapability(HasVariants)) {
+      if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
+        gvars=1;
+      }
+    } else {
+      gvars=1;
+    }
+
+    if (gvars==0) {
+      ui->weightGV->setDisabled(true);
+      ui->curveGVarCB->hide();
+      if ((ed->curve.type == CurveReference::CURVE_REF_EXPO || ed->curve.type == CurveReference::CURVE_REF_DIFF) && ed->curve.value > 100) {
+        ed->curve.value = 0;
+      }
+      if (ed->weight>100 || ed->weight<-100) {
+        ed->weight = 100;
+      }
+    }
+
+    populateGVCB(ui->weightCB, ed->weight);
+
+    ui->weightSB->setMinimum(0);
+    ui->weightSB->setMaximum(100);
+    if (ed->weight>100 || ed->weight<0) {
+      ui->weightGV->setChecked(true);
+      ui->weightSB->hide();
+      ui->weightCB->show();
+    } else {
+      ui->weightGV->setChecked(false);
+      ui->weightSB->setValue(ed->weight);
+      ui->weightSB->show();
+      ui->weightCB->hide();
+    }
+
+    populateSwitchCB(ui->switchesCB,ed->swtch);
+
+    // TODO keep this group, same in MixerDialog
+    CurveGroup * curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve);
+
+    ui->sideCB->setCurrentIndex(ed->mode-1);
+
+    if (!GetEepromInterface()->getCapability(FlightPhases)) {
+      ui->label_phases->hide();
+      for (int i=0; i<9; i++) {
+        lb_fp[i]->hide();
+        cb_fp[i]->hide();
+      }
+    } else {
+      int mask=1;
+      for (int i=0; i<9 ; i++) {
+        if ((ed->phases & mask)==0) {
+          cb_fp[i]->setChecked(true);
+        }
+        mask <<= 1;
+      }
+      for (int i=GetEepromInterface()->getCapability(FlightPhases); i<9;i++) {
+        lb_fp[i]->hide();
+        cb_fp[i]->hide();
+      }      
+    }
+
+    if (GetEepromInterface()->getCapability(VirtualInputs)) {
+      ui->sideLabel->hide();
+      ui->sideCB->hide();
+    }
+    else {
+      ui->sourceLabel->hide();
+      ui->sourceCB->hide();
+      ui->scaleLabel->hide();
+      ui->scaleSB->hide();
+      ui->trimLabel->hide();
+      ui->trimCB->hide();
+    }
+
+    int expolength=GetEepromInterface()->getCapability(HasExpoNames);
+    if (!expolength) {
+      ui->label_name->hide();
+      ui->expoName->hide();
+    } else {
+      ui->expoName->setMaxLength(expolength);
+    }
+
+    ui->expoName->setValidator(new QRegExpValidator(rx, this));
+    ui->expoName->setText(ed->name);
+    valuesChanged();
+
+    connect(ui->expoName,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
+
+    connect(ui->curveTypeCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+    connect(ui->curveGVarCB,SIGNAL(stateChanged(int)),this,SLOT(valuesChanged()));
+    connect(ui->curveValueCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+    connect(ui->curveValueSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
+
+    connect(ui->weightCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+    connect(ui->weightSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
+    connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+    connect(ui->sideCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+    connect(ui->weightGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
+    for (int i=0; i<9; i++) {
+      connect(cb_fp[i],SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
+    }
+    QTimer::singleShot(0, this, SLOT(shrink()));
+}
+
+ExpoDialog::~ExpoDialog()
+{
+    delete ui;
+}
+
+void ExpoDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+void ExpoDialog::widgetChanged()
+{
+  // TODO so many times duplicated :(
+  int gvars=0;
+  if (GetEepromInterface()->getCapability(HasVariants)) {
+    if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
+      gvars=1;
+    }
+  } else {
+    gvars=1;
+  }
+
+  /* TODO if (gvars==1) {
+    if (ui->expoCurveGV->isChecked()) {
+      ui->expoCurveCB->show();
+      ui->expoCurveSB->hide();
+    } else {
+      ui->expoCurveCB->hide();
+      ui->expoCurveSB->show();
+    }
+    if (ui->weightGV->isChecked()) {
+      ui->weightCB->show();
+      ui->weightSB->hide();
+    } else {
+      ui->weightCB->hide();
+      ui->weightSB->show();
+    }
+  } */
+  valuesChanged();
+  QTimer::singleShot(0, this, SLOT(shrink()));
+}
+
+void ExpoDialog::valuesChanged()
+{
+    QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
+
+    if (ui->weightGV->isChecked()) {
+      ed->weight = ui->weightCB->itemData(ui->weightCB->currentIndex()).toInt();
+    } else {
+      ed->weight = ui->weightSB->value();
+    }
+    ed->swtch  = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
+    ed->mode   = ui->sideCB->currentIndex() + 1;
+    int i=0;
+    for (i=0; i<ui->expoName->text().toAscii().length(); i++) {
+      ed->name[i]=ui->expoName->text().toAscii().at(i);
+    }
+    ed->name[i]=0;
+    ed->phases=0;
+    for (int i=8; i>=0 ; i--) {
+      if (!cb_fp[i]->checkState()) {
+        ed->phases+=1;
+      }
+      ed->phases<<=1;
+    }
+    ed->phases>>=1;
+    if (GetEepromInterface()->getCapability(FlightPhases)) {
+      int zeros=0;
+      int ones=0;
+      int phtemp=ed->phases;
+      for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+        if (phtemp & 1) {
+          ones++;
+        }
+        else {
+          zeros++;
+        }
+        phtemp >>=1;
+      }
+      if (zeros==1) {
+        phtemp=ed->phases;
+        for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+          if ((phtemp & 1)==0) {
+            break;
+          }
+          phtemp >>=1;
+        }
+      }
+      else if (ones==1) {
+        phtemp=ed->phases;
+        for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+          if (phtemp & 1) {
+            break;
+          }
+          phtemp >>=1;
+        }
+      }
+    } else {
+      ed->phases=0;
+    }  
+}
+
+void ExpoDialog::shrink()
+{
+    resize(0,0);
+}
diff --git a/companion/src/expodialog.h b/companion/src/modeledit/expodialog.h
similarity index 100%
rename from companion/src/expodialog.h
rename to companion/src/modeledit/expodialog.h
diff --git a/companion/src/expodialog.ui b/companion/src/modeledit/expodialog.ui
similarity index 72%
rename from companion/src/expodialog.ui
rename to companion/src/modeledit/expodialog.ui
index d3acba4e6..baf7c6b14 100644
--- a/companion/src/expodialog.ui
+++ b/companion/src/modeledit/expodialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>370</width>
-    <height>289</height>
+    <height>331</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -26,7 +26,7 @@
    <string/>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset>
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -44,14 +44,14 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Weight</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="4" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,1,0">
      <item>
       <widget class="QCheckBox" name="weightGV">
@@ -85,55 +85,14 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_expo">
-     <property name="text">
-      <string>Expo</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0,1,0">
-     <item>
-      <widget class="QCheckBox" name="expoGV">
-       <property name="text">
-        <string>GV</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="expoSB"/>
-     </item>
-     <item>
-      <widget class="QComboBox" name="expoCB">
-       <property name="whatsThis">
-        <string>Phase used by the expo.</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="label_phases">
      <property name="text">
       <string>Flight modes</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="6" column="1">
     <layout class="QGridLayout" name="gridLayout_4">
      <item row="0" column="0">
       <widget class="QLabel" name="lb_FP0">
@@ -290,14 +249,14 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>Switch</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="7" column="1">
     <widget class="QComboBox" name="switchesCB">
      <property name="whatsThis">
       <string>Switch used by the expo.
@@ -305,53 +264,15 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_curves">
-     <property name="text">
-      <string>Curve/Exponential</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0,1">
-     <item>
-      <widget class="QComboBox" name="curvesCB">
-       <property name="toolTip">
-        <string/>
-       </property>
-       <property name="whatsThis">
-        <string>The curve used by the expo</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="expoCurveGV">
-       <property name="text">
-        <string>GV</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="expoCurveSB"/>
-     </item>
-     <item>
-      <widget class="QComboBox" name="expoCurveCB">
-       <property name="whatsThis">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_9">
+   <item row="9" column="0">
+    <widget class="QLabel" name="sideLabel">
      <property name="text">
       <string>Stick Side</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
-    <widget class="QComboBox" name="modeCB">
+   <item row="9" column="1">
+    <widget class="QComboBox" name="sideCB">
      <item>
       <property name="text">
        <string>NEG</string>
@@ -369,7 +290,7 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      </item>
     </widget>
    </item>
-   <item row="8" column="0" colspan="2">
+   <item row="11" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="minimumSize">
       <size>
@@ -388,7 +309,7 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="10" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -396,11 +317,114 @@ If blank then the expo is considered to be &quot;ON&quot; all the time.</string>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>30</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="sourceCB">
+     <property name="whatsThis">
+      <string>The source for the mixer</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDoubleSpinBox" name="scaleSB">
+     <property name="whatsThis">
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If Slow is not zero then the speed of the mix will be set by the value specified -&amp;gt; the value states the number of seconds it takes to transit from -100 to 100.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="decimals">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="scaleLabel">
+     <property name="text">
+      <string>Scale</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="trimLabel">
+     <property name="text">
+      <string>Include Trim</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="sourceLabel">
+     <property name="text">
+      <string>Source</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QComboBox" name="trimCB">
+     <item>
+      <property name="text">
+       <string>No</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Yes</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_curves">
+     <property name="text">
+      <string>Curve</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,1,0">
+     <item>
+      <widget class="QComboBox" name="curveTypeCB">
+       <property name="toolTip">
+        <string/>
+       </property>
+       <property name="whatsThis">
+        <string>The curve used by the expo</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="curveGVarCB">
+       <property name="text">
+        <string>GV</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="curveValueCB">
+       <property name="whatsThis">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="curveValueSB"/>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources>
diff --git a/companion/src/modeledit/flightmode.ui b/companion/src/modeledit/flightmode.ui
new file mode 100644
index 000000000..6ed3d8769
--- /dev/null
+++ b/companion/src/modeledit/flightmode.ui
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FlightMode</class>
+ <widget class="QWidget" name="FlightMode">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>610</width>
+    <height>499</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="paramsLayout">
+     <item row="0" column="2">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Fade In</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QDoubleSpinBox" name="fadeIn">
+       <property name="decimals">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QDoubleSpinBox" name="fadeOut">
+       <property name="decimals">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Fade Out</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="name">
+       <property name="maxLength">
+        <number>6</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Name</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4" rowspan="2">
+      <spacer name="spacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Switch</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="swtch"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="trimsLayout">
+     <item row="2" column="1">
+      <widget class="QSlider" name="trim1Slider">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::TicksBothSides</enum>
+       </property>
+       <property name="tickInterval">
+        <number>25</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QSlider" name="trim2Slider">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::TicksBothSides</enum>
+       </property>
+       <property name="tickInterval">
+        <number>25</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QSlider" name="trim3Slider">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="invertedAppearance">
+        <bool>false</bool>
+       </property>
+       <property name="invertedControls">
+        <bool>false</bool>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::TicksBothSides</enum>
+       </property>
+       <property name="tickInterval">
+        <number>25</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QSlider" name="trim4Slider">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::TicksBothSides</enum>
+       </property>
+       <property name="tickInterval">
+        <number>25</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QFrame" name="frame">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <layout class="QGridLayout" name="leftTrims_3" columnstretch="0,1" columnminimumwidth="80,0">
+          <item row="1" column="0">
+           <widget class="QLabel" name="trim1Label">
+            <property name="text">
+             <string>trim1</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QVBoxLayout" name="verticalLayout_5c_3">
+            <item>
+             <spacer name="verticalSpacer_3c_3">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QComboBox" name="trim2Use"/>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="trim2Value">
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+              <property name="accelerated">
+               <bool>true</bool>
+              </property>
+              <property name="minimum">
+               <number>-896</number>
+              </property>
+              <property name="maximum">
+               <number>896</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_4a_3">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="1">
+           <layout class="QVBoxLayout" name="verticalLayout_6b_3">
+            <item>
+             <spacer name="verticalSpacer_5b_3">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QComboBox" name="trim1Use"/>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="trim1Value">
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+              <property name="accelerated">
+               <bool>true</bool>
+              </property>
+              <property name="minimum">
+               <number>-896</number>
+              </property>
+              <property name="maximum">
+               <number>896</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_6b_3">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="trim2Label">
+            <property name="text">
+             <string>trim2</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QFrame" name="frame_2">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <layout class="QGridLayout" name="righTrims_2" columnstretch="0,1" columnminimumwidth="80,0">
+          <item row="1" column="0">
+           <widget class="QLabel" name="trim4Label">
+            <property name="text">
+             <string>trim4</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="trim3Label">
+            <property name="text">
+             <string>trim3</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QVBoxLayout" name="verticalLayout_7b_2">
+            <item>
+             <spacer name="verticalSpacer_7b_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QComboBox" name="trim3Use"/>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="trim3Value">
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+              <property name="accelerated">
+               <bool>true</bool>
+              </property>
+              <property name="minimum">
+               <number>-896</number>
+              </property>
+              <property name="maximum">
+               <number>896</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_8d_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="1">
+           <layout class="QVBoxLayout" name="verticalLayout_8d_2">
+            <item>
+             <spacer name="verticalSpacer_9d_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QComboBox" name="trim4Use"/>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="trim4Value">
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+              <property name="accelerated">
+               <bool>true</bool>
+              </property>
+              <property name="minimum">
+               <number>-896</number>
+              </property>
+              <property name="maximum">
+               <number>896</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_10c_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gvNreLayout" columnstretch="1,1">
+     <item row="0" column="0">
+      <widget class="QGroupBox" name="gvGB"/>
+     </item>
+     <item row="0" column="1">
+      <widget class="QGroupBox" name="reGB"/>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/flightmodes.cpp b/companion/src/modeledit/flightmodes.cpp
new file mode 100644
index 000000000..4a4e5e651
--- /dev/null
+++ b/companion/src/modeledit/flightmodes.cpp
@@ -0,0 +1,484 @@
+#include "flightmodes.h"
+#include "ui_flightmode.h"
+// #include "firmwares/opentx/opentxeeprom.h" // TODO shouldn't be there
+#include "helpers.h"
+#include <QComboBox>
+#include <QGridLayout>
+
+FlightMode::FlightMode(QWidget * parent, ModelData & model, int phaseIdx, GeneralSettings & generalSettings):
+  ModelPanel(parent, model),
+  ui(new Ui::FlightMode),
+  generalSettings(generalSettings),
+  phaseIdx(phaseIdx),
+  phase(model.phaseData[phaseIdx]),
+  reCount(GetEepromInterface()->getCapability(RotaryEncoders)),
+  gvCount(((!GetEepromInterface()->getCapability(HasVariants)) || (GetCurrentFirmwareVariant() & GVARS_VARIANT)) ?
+      GetEepromInterface()->getCapability(Gvars) : 0)
+{
+  ui->setupUi(this);
+
+  // Phase name
+  QRegExp rx(CHAR_FOR_NAMES_REGEX);
+  if (GetEepromInterface()->getCapability(FlightPhases)) {
+    ui->name->setValidator(new QRegExpValidator(rx, this));
+    ui->name->setMaxLength(GetEepromInterface()->getCapability(FlightModesName));
+    connect(ui->name, SIGNAL(editingFinished()), this, SLOT(phaseName_editingFinished()));
+  }
+  else {
+    ui->name->setDisabled(true);
+  }
+
+  // Phase switch
+  if (phaseIdx > 0) {
+    populateSwitchCB(ui->swtch, phase.swtch);
+    connect(ui->swtch, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseSwitch_currentIndexChanged(int)));
+  }
+  else {
+    ui->swtch->hide();
+  }
+
+  // FadeIn / FadeOut
+  if (GetEepromInterface()->getCapability(FlightPhasesHaveFades)) {
+    int scale = GetEepromInterface()->getCapability(SlowScale);
+    int range = GetEepromInterface()->getCapability(SlowRange);
+    ui->fadeIn->setMaximum(float(range)/scale);
+    ui->fadeIn->setSingleStep(1.0/scale);
+    ui->fadeIn->setDecimals((scale==1 ? 0 :1) );
+    connect(ui->fadeIn, SIGNAL(editingFinished()), this, SLOT(phaseFadeIn_editingFinished()));
+    ui->fadeOut->setMaximum(float(range)/scale);
+    ui->fadeOut->setSingleStep(1.0/scale);
+    ui->fadeOut->setDecimals((scale==1 ? 0 :1));
+    connect(ui->fadeOut, SIGNAL(editingFinished()), this, SLOT(phaseFadeOut_editingFinished()));
+  }
+  else {
+    ui->fadeIn->setDisabled(true);
+    ui->fadeOut->setDisabled(true);
+  }
+    
+  // The trims
+  QString labels[] = { tr("Rud"), tr("Ele"), tr("Thr"), tr("Ail") }; // TODO is elsewhere for sure
+
+  trimsLabel << ui->trim1Label << ui->trim2Label << ui->trim3Label << ui->trim4Label;
+  trimsUse << ui->trim1Use << ui->trim2Use << ui->trim3Use << ui->trim4Use;
+  trimsValue << ui->trim1Value << ui->trim2Value << ui->trim3Value << ui->trim4Value;
+  trimsSlider << ui->trim1Slider << ui->trim2Slider << ui->trim3Slider << ui->trim4Slider;
+
+  for (int i=0; i<4; i++) {
+    trimsLabel[i]->setText(labels[CONVERT_MODE(i+1)-1]);
+
+    if (phaseIdx > 0) {
+      trimsUse[i]->setProperty("index", i);
+      populateTrimUseCB(trimsUse[i], phaseIdx);
+      connect(trimsUse[i], SIGNAL(currentIndexChanged(int)), this, SLOT(phaseTrimUse_currentIndexChanged(int)));
+    }
+    else {
+      trimsUse[i]->hide();
+    }
+
+    trimsValue[i]->setProperty("index", i);
+    connect(trimsValue[i], SIGNAL(valueChanged(int)), this, SLOT(phaseTrim_valueChanged()));
+
+    trimsSlider[i]->setProperty("index", i);
+    connect(trimsSlider[i], SIGNAL(valueChanged(int)), this, SLOT(phaseTrimSlider_valueChanged()));
+  }
+
+  // Rotary encoders
+  if (reCount > 0) {
+    QGridLayout *reLayout = new QGridLayout(ui->reGB);
+    for (int i=0; i<reCount; i++) {
+      // RE label
+      QLabel *label = new QLabel(ui->reGB);
+      label->setText(tr("Rotary Encoder %1").arg(i+1));
+      reLayout->addWidget(label, i, 0, 1, 1);
+      if (phaseIdx > 0) {
+        // RE link to another RE
+        QComboBox *link = new QComboBox(ui->gvGB);
+        link->setProperty("index", i);
+        populateGvarUseCB(link, phaseIdx);
+        connect(link, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseREUse_currentIndexChanged(int)));
+        if (phase.rotaryEncoders[i] > 1024) {
+          link->setCurrentIndex(phase.rotaryEncoders[i] - 1024);
+        }
+        reLayout->addWidget(link, i, 1, 1, 1);
+      }
+      // RE value
+      reValues[i] = new QSpinBox(ui->reGB);
+      reValues[i]->setProperty("index", i);
+      reValues[i]->setMinimum(-1024);
+      reValues[i]->setMaximum(1024);
+      connect(reValues[i], SIGNAL(editingFinished()), this, SLOT(phaseREValue_editingFinished()));
+      reLayout->addWidget(reValues[i], i, 2, 1, 1);
+    }
+  }
+  else {
+    ui->reGB->hide();
+  }
+
+  // GVars
+  if (gvCount > 0) {
+    QGridLayout *gvLayout = new QGridLayout(ui->gvGB);
+    for (int i=0; i<gvCount; i++) {
+      int col = 0;
+      // GVar label
+      QLabel *label = new QLabel(ui->gvGB);
+      label->setText(tr("GVAR%1").arg(i+1));
+      gvLayout->addWidget(label, i, col++, 1, 1);
+#if 0
+      // TODO remove this capability?
+      // GVar source (er9x/ersky9x)
+      if (GetEepromInterface()->getCapability(GvarsHaveSources)) {
+        QComboBox *source = new QComboBox(ui->gvGB);
+        source->setProperty("index", i);
+        populateGvSourceCB(source, model.gvsource[i]);
+        // connect(source, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseGVSource_currentIndexChanged(int)));
+        gvLayout->addWidget(source, i, col++, 1, 1);
+      }
+#endif
+      // GVar name
+      int nameLen = GetEepromInterface()->getCapability(GvarsName);
+      if (nameLen > 0) {
+        gvNames[i] = new QLineEdit(ui->gvGB);
+        gvNames[i]->setProperty("index", i);
+        gvNames[i]->setMaxLength(nameLen);
+        connect(gvNames[i], SIGNAL(editingFinished()), this, SLOT(GVName_editingFinished()));
+        gvLayout->addWidget(gvNames[i], i, col++, 1, 1);
+      }
+      if (phaseIdx > 0) {
+        // GVar link to another GVar
+        QComboBox *link = new QComboBox(ui->gvGB);
+        link->setProperty("index", i);
+        populateGvarUseCB(link, phaseIdx);
+        if (phase.gvars[i] > 1024) {
+          link->setCurrentIndex(phase.gvars[i] - 1024);
+        }
+        connect(link, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseGVUse_currentIndexChanged(int)));
+        gvLayout->addWidget(link, i, col++, 1, 1);
+      }
+      // GVar value
+      gvValues[i] = new QSpinBox(ui->gvGB);
+      gvValues[i]->setProperty("index", i);
+      connect(gvValues[i], SIGNAL(editingFinished()), this, SLOT(phaseGVValue_editingFinished()));
+      gvValues[i]->setMinimum(-1024);
+      gvValues[i]->setMaximum(1024);
+      gvLayout->addWidget(gvValues[i], i, col++, 1, 1);
+    }
+  }
+  else {
+    ui->gvGB->hide();
+  }
+
+  update();
+}
+
+FlightMode::~FlightMode()
+{
+  delete ui;
+}
+
+void FlightMode::update()
+{
+  ui->name->setText(phase.name);
+
+  int scale = GetEepromInterface()->getCapability(SlowScale);
+  ui->fadeIn->setValue(float(phase.fadeIn)/scale);
+  ui->fadeOut->setValue(float(phase.fadeOut)/scale);
+
+  for (int i=0; i<4; i++) {
+    int trimsMax = GetEepromInterface()->getCapability(ExtendedTrims);
+    if (trimsMax == 0 || !model.extendedTrims) {
+      trimsMax = 125;
+    }
+    trimsSlider[i]->setRange(-trimsMax, +trimsMax);
+    trimsValue[i]->setRange(-trimsMax, +trimsMax);
+    int chn = CONVERT_MODE(i+1)-1;
+    if (chn == 2/*TODO constant*/ && model.throttleReversed)
+      trimsSlider[i]->setInvertedAppearance(true);
+
+    trimUpdate(i);
+  }
+
+  for (int i=0; i<gvCount; i++) {
+    gvNames[i]->setText(model.gvars_names[i]);
+    if (phase.gvars[i] < 1024) {
+      gvValues[i]->setValue(phase.gvars[i]);
+      gvValues[i]->setDisabled(false);
+    }
+    else {
+      int idx = phase.gvars[i] - 1025;
+      if (idx >= i) idx++;
+      // TODO no!!!!
+      PhaseData *phasegvar = &model.phaseData[idx];
+      gvValues[i]->setValue(phasegvar->gvars[i]);
+      gvValues[i]->setDisabled(true);
+    }
+  }
+
+  for (int i=0; i<reCount; i++) {
+    if (phase.rotaryEncoders[i] < 1024) {
+      reValues[i]->setValue(phase.rotaryEncoders[i]);
+      reValues[i]->setDisabled(false);
+    }
+    else {
+      int idx = phase.rotaryEncoders[i] - 1025;
+      if (idx >= i) idx++;
+      // TODO no!!!!
+      PhaseData *phasere = &model.phaseData[idx];
+      reValues[i]->setValue(phasere->rotaryEncoders[i]);
+      reValues[i]->setDisabled(true);
+    }
+  }
+}
+
+void FlightMode::phaseName_editingFinished()
+{
+    QLineEdit *lineEdit = qobject_cast<QLineEdit*>(sender());
+    strcpy(phase.name, lineEdit->text().toAscii());
+    emit modified();
+    emit nameModified();
+}
+
+void FlightMode::phaseSwitch_currentIndexChanged(int index)
+{
+    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
+    phase.swtch = RawSwitch(comboBox->itemData(index).toInt());
+    emit modified();
+}
+
+void FlightMode::phaseFadeIn_editingFinished()
+{
+    QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
+    int scale = GetEepromInterface()->getCapability(SlowScale);
+    phase.fadeIn = round(spinBox->value()*scale);
+    emit modified();
+}
+
+void FlightMode::phaseFadeOut_editingFinished()
+{
+    QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
+    int scale = GetEepromInterface()->getCapability(SlowScale);
+    phase.fadeOut = round(spinBox->value()*scale);
+    emit modified();
+}
+
+void FlightMode::trimUpdate(unsigned int trim)
+{
+    lock = true;
+    int chn = CONVERT_MODE(trim+1)-1;
+    int value = phase.trim[chn];
+    if (phaseIdx > 0 && phase.trimRef[chn] >= 0) {
+      trimsUse[trim]->setCurrentIndex(1 + phase.trimRef[chn] - (phase.trimRef[chn] >= phaseIdx ? 1 : 0));
+      value = model.phaseData[model.getTrimFlightPhase(chn, phaseIdx)].trim[chn];
+      trimsValue[trim]->setEnabled(false);
+      trimsSlider[trim]->setEnabled(false);
+    }
+    else {
+      if (phaseIdx > 0) trimsUse[trim]->setCurrentIndex(0);
+      trimsValue[trim]->setEnabled(true);
+      trimsSlider[trim]->setEnabled(true);
+    }
+    trimsSlider[trim]->setValue(value);
+    trimsValue[trim]->setValue(value);
+    lock = false;
+}
+
+void FlightMode::phaseGVValue_editingFinished()
+{
+  if (!lock) {
+    QSpinBox *spinBox = qobject_cast<QSpinBox*>(sender());
+    int gvar = spinBox->property("index").toInt();
+    phase.gvars[gvar] = spinBox->value();
+    emit modified();
+  }
+}
+
+void FlightMode::GVName_editingFinished()
+{
+  if (!lock) {
+    QLineEdit *lineedit = qobject_cast<QLineEdit*>(sender());
+    int gvar = lineedit->property("index").toInt();
+    memset(&model.gvars_names[gvar], 0, sizeof(model.gvars_names[gvar]));
+    strcpy(model.gvars_names[gvar], lineedit->text().toAscii());
+    emit modified();
+  }
+}
+
+void FlightMode::GVSource_currentIndexChanged(int index)
+{
+  QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
+  int gvar = comboBox->property("index").toInt();
+  model.gvsource[gvar] = index;
+  emit modified();
+}
+
+void FlightMode::phaseGVUse_currentIndexChanged(int index)
+{
+  if (!lock) {
+    lock = true;
+    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
+    int gvar = comboBox->property("index").toInt();
+    if (index == 0) {
+      int value = phase.gvars[gvar];
+      if (value>1024) {
+        value=0;
+      }
+      gvValues[gvar]->setValue(value);
+      gvValues[gvar]->setEnabled(true);
+      phase.gvars[gvar]=value;
+    }
+    else {
+      phase.gvars[gvar] = 1024+index;
+      // TOTO it's wrong!!!
+      int value = model.phaseData[index + (index>phaseIdx ? 0 :-1)].gvars[gvar];
+      gvValues[gvar]->setValue(value);
+      gvValues[gvar]->setDisabled(true);
+    }
+    emit modified();
+    lock = false;
+  }
+}
+
+void FlightMode::phaseREValue_editingFinished()
+{
+  if (!lock) {
+    QSpinBox *spinBox = qobject_cast<QSpinBox*>(sender());
+    int gvar = spinBox->property("index").toInt();
+    phase.rotaryEncoders[gvar] = spinBox->value();
+    emit modified();
+  }
+}
+
+void FlightMode::phaseREUse_currentIndexChanged(int index)
+{
+  if (!lock) {
+    lock = true;
+    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
+    int re = comboBox->property("index").toInt();
+    if (index == 0) {
+      // TODO no!!!
+      int value = phase.rotaryEncoders[re];
+      if (value > 1024) {
+        value = 0;
+      }
+      reValues[re]->setValue(value);
+      reValues[re]->setEnabled(true);
+      phase.rotaryEncoders[re] = value;
+    }
+    else {
+      phase.rotaryEncoders[re] = 1024 + index;
+      int value = model.phaseData[index + (index>phaseIdx ? 0 :-1)].rotaryEncoders[re];
+      reValues[re]->setValue(value);
+      reValues[re]->setDisabled(true)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ;
+    }
+    lock = false;
+    emit modified();
+  }
+}
+
+void FlightMode::phaseTrimUse_currentIndexChanged(int index)
+{
+  if (!lock) {
+    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
+    int trim = comboBox->property("index").toInt();
+    int chn = CONVERT_MODE(trim+1)-1;
+    if (index == 0) {
+      phase.trim[chn] = model.phaseData[model.getTrimFlightPhase(chn, phaseIdx)].trim[chn];
+      phase.trimRef[chn] = -1;
+    }
+    else {
+      phase.trim[chn] = 0;
+      phase.trimRef[chn] = index - 1 + (index > (int)phaseIdx ? 1 : 0);
+    }
+
+    trimUpdate(trim);
+    emit modified();
+  }
+}
+
+void FlightMode::phaseTrim_valueChanged()
+{
+  if (!lock) {
+    QSpinBox *spinBox = qobject_cast<QSpinBox*>(sender());
+    int trim = spinBox->property("index").toInt();
+    int chn = CONVERT_MODE(trim+1)-1;
+    int value = spinBox->value();
+    phase.trim[chn] = value;
+    lock = true;
+    trimsSlider[trim]->setValue(value);
+    lock = false;
+    emit modified();
+  }
+}
+
+void FlightMode::phaseTrimSlider_valueChanged()
+{
+  if (!lock) {
+    QSlider *slider = qobject_cast<QSlider*>(sender());
+    int trim = slider->property("index").toInt();
+    int chn = CONVERT_MODE(trim+1)-1;
+    int value = slider->value();
+    phase.trim[chn] = value;
+    lock = true;
+    trimsValue[trim]->setValue(value);
+    lock = false;
+    emit modified();
+  }
+}
+
+/**********************************************************/
+
+FlightModes::FlightModes(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
+  ModelPanel(parent, model),
+  modesCount(GetEepromInterface()->getCapability(FlightPhases))
+{
+  QGridLayout * gridLayout = new QGridLayout(this);
+  tabWidget = new QTabWidget(this);
+  for (int i=0; i<modesCount; i++) {
+    FlightMode *tab = new FlightMode(tabWidget, model, i, generalSettings);
+    tab->setProperty("index", i);
+    panels << tab;
+    connect(tab, SIGNAL(modified()), this, SLOT(onPhaseModified()));
+    connect(tab, SIGNAL(nameModified()), this, SLOT(onPhaseNameChanged()));
+    tabWidget->addTab(tab, getTabName(i));
+  }
+  gridLayout->addWidget(tabWidget, 0, 0, 1, 1);
+  connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(on_tabWidget_currentChanged(int)));
+}
+
+FlightModes::~FlightModes()
+{
+}
+
+void FlightModes::onPhaseModified()
+{
+  emit modified();
+}
+
+QString FlightModes::getTabName(int index)
+{
+  QString result = tr("Flight Mode %1").arg(index);
+  const char *name = model.phaseData[index].name;
+  if (GetEepromInterface()->getCapability(FlightModesName) && strlen(name) > 0) {
+    result += tr(" (%1)").arg(name);
+  }
+  else if (index == 0) {
+    result += tr(" (default)");
+  }
+
+  return result;
+}
+
+void FlightModes::onPhaseNameChanged()
+{
+  int index = sender()->property("index").toInt();
+  tabWidget->setTabText(index, getTabName(index));
+}
+
+void FlightModes::update()
+{
+  on_tabWidget_currentChanged(tabWidget->currentIndex());
+}
+
+void FlightModes::on_tabWidget_currentChanged(int index)
+{
+  panels[index]->update();
+}
diff --git a/companion/src/modeledit/flightmodes.h b/companion/src/modeledit/flightmodes.h
new file mode 100644
index 000000000..0a09f279b
--- /dev/null
+++ b/companion/src/modeledit/flightmodes.h
@@ -0,0 +1,86 @@
+#ifndef FLIGHTMODES_H
+#define FLIGHTMODES_H
+
+#include "modelpanel.h"
+#include <QVector>
+#include <QLabel>
+#include <QTabWidget>
+#include <QSpinBox>
+#include <QComboBox>
+
+namespace Ui {
+  class FlightMode;
+}
+
+class FlightMode : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    FlightMode(QWidget *parent, ModelData &model, int modeIdx, GeneralSettings & generalSettings);
+    virtual ~FlightMode();
+
+    virtual void update();
+
+  signals:
+    void nameModified();
+
+  private slots:
+    void phaseName_editingFinished();
+    void phaseSwitch_currentIndexChanged(int index);
+    void phaseFadeIn_editingFinished();
+    void phaseFadeOut_editingFinished();
+    void phaseTrimUse_currentIndexChanged(int index);
+    void phaseTrim_valueChanged();
+    void phaseTrimSlider_valueChanged();
+    void GVName_editingFinished();
+    void GVSource_currentIndexChanged(int index);
+    void phaseGVValue_editingFinished();
+    void phaseGVUse_currentIndexChanged(int index);
+    void phaseREValue_editingFinished();
+    void phaseREUse_currentIndexChanged(int index);
+
+  private:
+    Ui::FlightMode *ui;
+    GeneralSettings & generalSettings;
+    int phaseIdx;
+    PhaseData & phase;
+    int reCount;
+    int gvCount;
+    QVector<QLabel *> trimsLabel;
+    QLineEdit * gvNames[C9X_MAX_GVARS];
+    QSpinBox * gvValues[C9X_MAX_GVARS];
+    QSpinBox * reValues[C9X_MAX_ENCODERS];
+    QVector<QComboBox *> trimsUse;
+    QVector<QSpinBox *> trimsValue;
+    QVector<QSlider *> trimsSlider;
+
+    void trimUpdate(unsigned int trim);
+
+};
+
+class FlightModes : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    FlightModes(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    virtual ~FlightModes();
+
+    virtual void update();
+
+  private slots:
+    void onPhaseModified();
+    void onPhaseNameChanged();
+    void on_tabWidget_currentChanged(int index);
+
+  private:
+    int modesCount;
+    QTabWidget *tabWidget;
+    QString getTabName(int index);
+    QVector<FlightMode *> panels;
+
+};
+
+#endif // FLIGHTMODES_H
+
diff --git a/companion/src/modeledit/heli.cpp b/companion/src/modeledit/heli.cpp
new file mode 100644
index 000000000..6c584658a
--- /dev/null
+++ b/companion/src/modeledit/heli.cpp
@@ -0,0 +1,49 @@
+#include "heli.h"
+#include "ui_heli.h"
+#include "helpers.h"
+
+HeliPanel::HeliPanel(QWidget *parent, ModelData & model):
+  ModelPanel(parent, model),
+  ui(new Ui::Heli)
+{
+  ui->setupUi(this);
+
+  connect(ui->swashTypeCB, SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
+  connect(ui->swashCollectiveCB, SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
+  connect(ui->swashRingValSB, SIGNAL(editingFinished()), this, SLOT(edited()));
+  connect(ui->swashInvertELE, SIGNAL(stateChanged(int)), this, SLOT(edited()));
+  connect(ui->swashInvertAIL, SIGNAL(stateChanged(int)), this, SLOT(edited()));
+  connect(ui->swashInvertCOL, SIGNAL(stateChanged(int)), this, SLOT(edited()));
+}
+
+HeliPanel::~HeliPanel()
+{
+  delete ui;
+}
+
+void HeliPanel::update()
+{
+  lock = true;
+
+  ui->swashTypeCB->setCurrentIndex(model.swashRingData.type);
+  populateSourceCB(ui->swashCollectiveCB, model.swashRingData.collectiveSource, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS);
+  ui->swashRingValSB->setValue(model.swashRingData.value);
+  ui->swashInvertELE->setChecked(model.swashRingData.invertELE);
+  ui->swashInvertAIL->setChecked(model.swashRingData.invertAIL);
+  ui->swashInvertCOL->setChecked(model.swashRingData.invertCOL);
+
+  lock = false;
+}
+
+void HeliPanel::edited()
+{
+  if (!lock) {
+    model.swashRingData.type  = ui->swashTypeCB->currentIndex();
+    model.swashRingData.collectiveSource = ui->swashCollectiveCB->itemData(ui->swashCollectiveCB->currentIndex()).toInt();
+    model.swashRingData.value = ui->swashRingValSB->value();
+    model.swashRingData.invertELE = ui->swashInvertELE->isChecked();
+    model.swashRingData.invertAIL = ui->swashInvertAIL->isChecked();
+    model.swashRingData.invertCOL = ui->swashInvertCOL->isChecked();
+    emit modified();
+  }
+}
diff --git a/companion/src/modeledit/heli.h b/companion/src/modeledit/heli.h
new file mode 100644
index 000000000..7b5e3a73d
--- /dev/null
+++ b/companion/src/modeledit/heli.h
@@ -0,0 +1,26 @@
+#ifndef HELI_H
+#define HELI_H
+
+#include "modelpanel.h"
+
+namespace Ui {
+  class Heli;
+}
+
+class HeliPanel : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    HeliPanel(QWidget *parent, ModelData & model);
+    ~HeliPanel();
+    void update();
+
+  private slots:
+    void edited();
+
+  private:
+    Ui::Heli *ui;
+};
+
+#endif // HELI_H
diff --git a/companion/src/modeledit/heli.ui b/companion/src/modeledit/heli.ui
new file mode 100644
index 000000000..c9741fde9
--- /dev/null
+++ b/companion/src/modeledit/heli.ui
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Heli</class>
+ <widget class="QWidget" name="Heli">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>795</width>
+    <height>307</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" columnstretch="0,1" columnminimumwidth="100,0">
+   <property name="horizontalSpacing">
+    <number>6</number>
+   </property>
+   <item row="3" column="1">
+    <layout class="QGridLayout" name="gridLayout_21">
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="swashInvertELE">
+       <property name="text">
+        <string>Invert Elevator</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QCheckBox" name="swashInvertAIL">
+       <property name="text">
+        <string>Invert Aileron</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QCheckBox" name="swashInvertCOL">
+       <property name="text">
+        <string>Invert Collective</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_108">
+     <property name="text">
+      <string>Invert</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="swashTypeCB">
+     <item>
+      <property name="text">
+       <string>Off</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>120</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>120X</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>140</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>90</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_106">
+     <property name="text">
+      <string>Collective</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="swashCollectiveCB"/>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_103">
+     <property name="text">
+      <string>Swash Type</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QSpinBox" name="swashRingValSB">
+     <property name="suffix">
+      <string/>
+     </property>
+     <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="singleStep">
+      <number>1</number>
+     </property>
+     <property name="value">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_107">
+     <property name="text">
+      <string>Swash Ring</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <spacer name="verticalSpacer_21">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
new file mode 100644
index 000000000..d8882f01b
--- /dev/null
+++ b/companion/src/modeledit/inputs.cpp
@@ -0,0 +1,450 @@
+#include "inputs.h"
+#include <QMessageBox>
+#include "expodialog.h"
+#include "helpers.h"
+
+InputsPanel::InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
+  ModelPanel(parent, model),
+  generalSettings(generalSettings),
+  expoInserted(false)
+{
+  QGridLayout * exposLayout = new QGridLayout(this);
+
+  ExposlistWidget = new MixersList(this, true);
+  QPushButton * qbUp = new QPushButton(this);
+  QPushButton * qbDown = new QPushButton(this);
+  QPushButton * qbClear = new QPushButton(this);
+
+  qbUp->setText(tr("Move Up"));
+  qbUp->setIcon(QIcon(":/images/moveup.png"));
+  qbUp->setShortcut(QKeySequence(tr("Ctrl+Up")));
+  qbDown->setText(tr("Move Down"));
+  qbDown->setIcon(QIcon(":/images/movedown.png"));
+  qbDown->setShortcut(QKeySequence(tr("Ctrl+Down")));
+  qbClear->setText(tr("Clear Expo Settings"));
+  qbClear->setIcon(QIcon(":/images/clear.png"));
+
+  exposLayout->addWidget(ExposlistWidget,1,1,1,3);
+  exposLayout->addWidget(qbUp,2,1);
+  exposLayout->addWidget(qbClear,2,2);
+  exposLayout->addWidget(qbDown,2,3);
+
+  connect(ExposlistWidget, SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(expolistWidget_customContextMenuRequested(QPoint)));
+  connect(ExposlistWidget, SIGNAL(doubleClicked(QModelIndex)),this,SLOT(expolistWidget_doubleClicked(QModelIndex)));
+  connect(ExposlistWidget, SIGNAL(mimeDropped(int,const QMimeData*,Qt::DropAction)),this,SLOT(mimeExpoDropped(int,const QMimeData*,Qt::DropAction)));
+
+  connect(qbUp, SIGNAL(pressed()),SLOT(moveExpoUp()));
+  connect(qbDown, SIGNAL(pressed()),SLOT(moveExpoDown()));
+  connect(qbClear, SIGNAL(pressed()),SLOT(clearExpos()));
+
+  connect(ExposlistWidget, SIGNAL(keyWasPressed(QKeyEvent*)), this, SLOT(expolistWidget_KeyPress(QKeyEvent*)));
+}
+
+InputsPanel::~InputsPanel()
+{
+}
+
+void InputsPanel::update()
+{
+  lock = true;
+
+  // curDest -> destination channel
+  // i -> mixer number
+  QByteArray qba;
+  ExposlistWidget->clear();
+  int curDest = -1;
+
+  for(int i=0; i<C9X_MAX_EXPOS; i++) {
+    ExpoData *md = &model.expoData[i];
+
+    if (md->mode==0) break;
+    QString str = "";
+    while(curDest<(int)md->chn-1) {
+      curDest++;
+      str = getStickStr(curDest);
+      qba.clear();
+      qba.append((quint8)-curDest-1);
+      QListWidgetItem *itm = new QListWidgetItem(str);
+      itm->setData(Qt::UserRole,qba);
+      ExposlistWidget->addItem(itm);
+    }
+
+    if(curDest!=(int)md->chn) {
+      str = getStickStr(md->chn);
+      curDest = md->chn;
+    } else {
+      str = "   ";
+    }
+
+    if (!GetEepromInterface()->getCapability(VirtualInputs)) {
+      switch (md->mode) {
+        case (1): str += " <-"; break;
+        case (2): str += " ->"; break;
+        default:  str += "   "; break;
+      };
+    }
+
+    str += " " + tr("Weight(%1)").arg(getGVarString(md->weight));
+
+    if (md->curve.value) str += " " + md->curve.toString();
+
+    QString phasesStr = getPhasesStr(md->phases, model);
+    if (!phasesStr.isEmpty()) str += " " + phasesStr;
+
+    if (md->swtch.type != SWITCH_TYPE_NONE) str += " " + tr("Switch(%1)").arg(md->swtch.toString());
+
+    if (GetEepromInterface()->getCapability(HasExpoNames)) {
+      QString ExpoName;
+      ExpoName.append(md->name);
+      if (!ExpoName.isEmpty()) {
+        str+=QString("(%1)").arg(ExpoName);
+      }
+    }
+    qba.clear();
+    qba.append((quint8)i);
+    qba.append((const char*)md, sizeof(ExpoData));
+    QListWidgetItem *itm = new QListWidgetItem(str);
+    itm->setData(Qt::UserRole,qba);  // expo number
+    ExposlistWidget->addItem(itm);   //(str);
+  }
+
+  while(curDest<NUM_STICKS-1) {
+    curDest++;
+    QString str = getStickStr(curDest);
+    qba.clear();
+    qba.append((quint8)-curDest-1);
+    QListWidgetItem *itm = new QListWidgetItem(str);
+    itm->setData(Qt::UserRole,qba); // add new expo
+    ExposlistWidget->addItem(itm);
+  }
+
+  lock = false;
+}
+
+
+bool InputsPanel::gm_insertExpo(int idx)
+{
+    if (idx<0 || idx>=C9X_MAX_EXPOS || model.expoData[C9X_MAX_EXPOS-1].mode > 0) {
+      QMessageBox::information(this, "companion9x", tr("Not enough available expos!"));
+      return false;
+    }
+
+    int chn = model.expoData[idx].chn;
+    memmove(&model.expoData[idx+1],&model.expoData[idx],
+            (C9X_MAX_EXPOS-(idx+1))*sizeof(ExpoData) );
+    memset(&model.expoData[idx],0,sizeof(ExpoData));
+    model.expoData[idx].chn = chn;
+    model.expoData[idx].weight = 100;
+    model.expoData[idx].mode = 3 /* TODO enum */;
+    return true;
+}
+
+void InputsPanel::gm_deleteExpo(int index)
+{
+    memmove(&model.expoData[index],&model.expoData[index+1],
+              (C9X_MAX_EXPOS-(index+1))*sizeof(ExpoData));
+    memset(&model.expoData[C9X_MAX_EXPOS-1],0,sizeof(ExpoData));
+}
+
+void InputsPanel::gm_openExpo(int index)
+{
+    if(index<0 || index>=C9X_MAX_EXPOS) return;
+
+    ExpoData mixd(model.expoData[index]);
+    emit modified();
+    update();
+
+    ExpoDialog *g = new ExpoDialog(this, &mixd, generalSettings.stickMode);
+    if(g->exec())  {
+      model.expoData[index] = mixd;
+      emit modified();
+      update();
+    } else {
+      if (expoInserted) {
+        gm_deleteExpo(index);
+      }
+      expoInserted=false;
+      emit modified();
+      update();
+    }
+}
+
+int InputsPanel::getExpoIndex(unsigned int dch)
+{
+    unsigned int i = 0;
+    while (model.expoData[i].chn<=dch && model.expoData[i].mode && i<C9X_MAX_EXPOS) i++;
+    if(i==C9X_MAX_EXPOS) return -1;
+    return i;
+}
+
+
+QList<int> InputsPanel::createExpoListFromSelected()
+{
+    QList<int> list;
+    foreach(QListWidgetItem *item, ExposlistWidget->selectedItems()) {
+      int idx= item->data(Qt::UserRole).toByteArray().at(0);
+      if(idx>=0 && idx<C9X_MAX_EXPOS) list << idx;
+    }
+    return list;
+}
+
+
+void InputsPanel::setSelectedByExpoList(QList<int> list)
+{
+    for(int i=0; i<ExposlistWidget->count(); i++) {
+      int t = ExposlistWidget->item(i)->data(Qt::UserRole).toByteArray().at(0);
+      if(list.contains(t))
+        ExposlistWidget->item(i)->setSelected(true);
+    }
+}
+
+void InputsPanel::exposDelete(bool ask)
+{
+    QMessageBox::StandardButton ret = QMessageBox::No;
+
+    if(ask)
+      ret = QMessageBox::warning(this, "companion9x",
+               tr("Delete Selected Expos?"),
+               QMessageBox::Yes | QMessageBox::No);
+
+
+    if ((ret == QMessageBox::Yes) || (!ask)) {
+        exposDeleteList(createExpoListFromSelected());
+        emit modified();
+        update();
+    }
+}
+
+void InputsPanel::exposCut()
+{
+    exposCopy();
+    exposDelete(false);
+}
+
+void InputsPanel::exposCopy()
+{
+    QList<int> list = createExpoListFromSelected();
+
+    QByteArray mxData;
+    foreach(int idx, list) {
+      mxData.append((char*)&model.expoData[idx],sizeof(ExpoData));
+    }
+
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("application/x-companion9x-expo", mxData);
+    QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
+}
+
+void InputsPanel::mimeExpoDropped(int index, const QMimeData *data, Qt::DropAction /*action*/)
+{
+    int idx = ExposlistWidget->item(index > 0 ? index-1 : 0)->data(Qt::UserRole).toByteArray().at(0);
+    pasteExpoMimeData(data, idx);
+}
+
+#include <iostream>
+#include <QtGui/qwidget.h>
+void InputsPanel::pasteExpoMimeData(const QMimeData * mimeData, int destIdx)
+{
+  if (mimeData->hasFormat("application/x-companion9x-expo")) {
+    int idx; // mixer index
+    int dch;
+
+    if (destIdx < 0) {
+      dch = -destIdx - 1;
+      idx = getExpoIndex(dch) - 1; //get expo index to insert
+    } else {
+      idx = destIdx;
+      dch = model.expoData[idx].chn;
+    }
+
+    QByteArray mxData = mimeData->data("application/x-companion9x-expo");
+
+    int i = 0;
+    while (i < mxData.size()) {
+      idx++;
+      if (!gm_insertExpo(idx))
+        break;
+      ExpoData *md = &model.expoData[idx];
+      memcpy(md, mxData.mid(i, sizeof(ExpoData)).constData(), sizeof(ExpoData));
+      md->chn = dch;
+      i += sizeof(ExpoData);
+    }
+
+    emit modified();
+    update();
+  }
+}
+
+
+void InputsPanel::exposPaste()
+{
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+    QListWidgetItem *item = ExposlistWidget->currentItem();
+    if (item)
+      pasteExpoMimeData(mimeData, item->data(Qt::UserRole).toByteArray().at(0));
+}
+
+void InputsPanel::exposDuplicate()
+{
+    exposCopy();
+    exposPaste();
+}
+
+
+void InputsPanel::expoOpen(QListWidgetItem *item)
+{
+    if (!item)
+      item = ExposlistWidget->currentItem();
+
+    int idx = item->data(Qt::UserRole).toByteArray().at(0);
+    if (idx<0) {
+      int ch = -idx-1;
+      idx = getExpoIndex(ch); // get expo index to insert
+      if (!gm_insertExpo(idx))
+        return;
+      model.expoData[idx].chn = ch;
+      expoInserted=true;
+    } else {
+        expoInserted=false;
+    }
+    gm_openExpo(idx);
+}
+
+void InputsPanel::expoAdd()
+{
+    int index = ExposlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
+
+    if(index<0) {  // if empty then return relevant index
+      expoOpen();
+    }  else {
+      index++;
+      if (!gm_insertExpo(index))
+        return;
+      model.expoData[index].chn = model.expoData[index-1].chn;
+    }
+    gm_openExpo(index);
+}
+
+
+void InputsPanel::expolistWidget_customContextMenuRequested(QPoint pos)
+{
+    QPoint globalPos = ExposlistWidget->mapToGlobal(pos);
+
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+    bool hasData = mimeData->hasFormat("application/x-companion9x-expo");
+
+    QMenu contextMenu;
+    contextMenu.addAction(QIcon(":/images/add.png"), tr("&Add"),this,SLOT(expoAdd()),tr("Ctrl+A"));
+    contextMenu.addAction(QIcon(":/images/edit.png"), tr("&Edit"),this,SLOT(expoOpen()),tr("Enter"));
+    contextMenu.addSeparator();
+    contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(exposDelete()),tr("Delete"));
+    contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(exposCopy()),tr("Ctrl+C"));
+    contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(exposCut()),tr("Ctrl+X"));
+    contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(exposPaste()),tr("Ctrl+V"))->setEnabled(hasData);
+    contextMenu.addAction(QIcon(":/images/duplicate.png"), tr("Du&plicate"),this,SLOT(exposDuplicate()),tr("Ctrl+U"));
+    contextMenu.addSeparator();
+    contextMenu.addAction(QIcon(":/images/moveup.png"), tr("Move Up"),this,SLOT(moveExpoUp()),tr("Ctrl+Up"));
+    contextMenu.addAction(QIcon(":/images/movedown.png"), tr("Move Down"),this,SLOT(moveExpoDown()),tr("Ctrl+Down"));
+
+    contextMenu.exec(globalPos);
+}
+
+
+void InputsPanel::expolistWidget_KeyPress(QKeyEvent *event)
+{
+    if(event->matches(QKeySequence::SelectAll)) expoAdd();  //Ctrl A
+    if(event->matches(QKeySequence::Delete))    exposDelete();
+    if(event->matches(QKeySequence::Copy))      exposCopy();
+    if(event->matches(QKeySequence::Cut))       exposCut();
+    if(event->matches(QKeySequence::Paste))     exposPaste();
+    if(event->matches(QKeySequence::Underline)) exposDuplicate();
+
+    if(event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter) expoOpen();
+    if(event->matches(QKeySequence::MoveToNextLine))
+        ExposlistWidget->setCurrentRow(ExposlistWidget->currentRow()+1);
+    if(event->matches(QKeySequence::MoveToPreviousLine))
+        ExposlistWidget->setCurrentRow(ExposlistWidget->currentRow()-1);
+}
+
+
+int InputsPanel::gm_moveExpo(int idx, bool dir) //true=inc=down false=dec=up
+{
+    if(idx>C9X_MAX_EXPOS || (idx==C9X_MAX_EXPOS && dir)) return idx;
+
+    int tdx = dir ? idx+1 : idx-1;
+    ExpoData temp;
+    temp.clear();
+    ExpoData &src=model.expoData[idx];
+    ExpoData &tgt=model.expoData[tdx];
+    if (!dir && tdx<0 && src.chn>0) {
+      src.chn--;
+      return idx;
+    } else if (!dir && tdx<0) {
+      return idx;
+    }
+
+    if(memcmp(&src,&temp,sizeof(ExpoData))==0) return idx;
+    bool tgtempty=(memcmp(&tgt,&temp,sizeof(ExpoData))==0 ? 1:0);
+    if(tgt.chn!=src.chn || tgtempty) {
+        if ((dir)  && (src.chn<(NUM_STICKS-1))) src.chn++;
+        if ((!dir) && (src.chn>0)) src.chn--;
+        return idx;
+    }
+
+    //flip between idx and tgt
+    memcpy(&temp,&src,sizeof(ExpoData));
+    memcpy(&src,&tgt,sizeof(ExpoData));
+    memcpy(&tgt,&temp,sizeof(ExpoData));
+    return tdx;
+}
+
+void InputsPanel::moveExpoUp()
+{
+    QList<int> list = createExpoListFromSelected();
+    QList<int> highlightList;
+    foreach(int idx, list) {
+      highlightList << gm_moveExpo(idx, false);
+    }
+    emit modified();
+    update();
+    setSelectedByExpoList(highlightList);
+}
+
+void InputsPanel::moveExpoDown()
+{
+    QList<int> list = createExpoListFromSelected();
+    QList<int> highlightList;
+    foreach(int idx, list) {
+      highlightList << gm_moveExpo(idx, true);
+    }
+    emit modified();
+    update();
+    setSelectedByExpoList(highlightList);
+}
+
+void InputsPanel::expolistWidget_doubleClicked(QModelIndex index)
+{
+    expoOpen(ExposlistWidget->item(index.row()));
+}
+
+void InputsPanel::exposDeleteList(QList<int> list)
+{
+    qSort(list.begin(), list.end());
+
+    int iDec = 0;
+    foreach(int idx, list) {
+      gm_deleteExpo(idx-iDec);
+      iDec++;
+    }
+}
+
+void InputsPanel::clearExpos()
+{
+  if (QMessageBox::question(this, tr("Clear Expos?"), tr("Really clear all the expos?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    model.clearInputs();
+    emit modified();
+    update();
+  }
+}
diff --git a/companion/src/modeledit/inputs.h b/companion/src/modeledit/inputs.h
new file mode 100644
index 000000000..4164caac9
--- /dev/null
+++ b/companion/src/modeledit/inputs.h
@@ -0,0 +1,50 @@
+#ifndef INPUTS_H
+#define INPUTS_H
+
+#include "modelpanel.h"
+#include "mixerslist.h"
+
+class InputsPanel : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    virtual ~InputsPanel();
+
+    virtual void update();
+
+  private slots:
+    void clearExpos();
+    void moveExpoUp();
+    void moveExpoDown();
+    void mimeExpoDropped(int index, const QMimeData *data, Qt::DropAction action);
+    void expolistWidget_customContextMenuRequested(QPoint pos);
+    void expolistWidget_doubleClicked(QModelIndex index);
+    void expolistWidget_KeyPress(QKeyEvent *event);
+    void exposDelete(bool ask=true);
+    void exposCut();
+    void exposCopy();
+    void exposPaste();
+    void exposDuplicate();
+    void expoOpen(QListWidgetItem *item = NULL);
+    void expoAdd();
+
+  private:
+    GeneralSettings & generalSettings;
+    bool expoInserted;
+    MixersList *ExposlistWidget;
+
+    int getExpoIndex(unsigned int dch);
+    bool gm_insertExpo(int idx);
+    void gm_deleteExpo(int index);
+    void gm_openExpo(int index);
+    int gm_moveExpo(int idx, bool dir);
+    void exposDeleteList(QList<int> list);
+    QList<int> createExpoListFromSelected();
+    void setSelectedByExpoList(QList<int> list);
+    void pasteExpoMimeData(const QMimeData * mimeData, int destIdx);
+
+};
+
+#endif // INPUTS_H
diff --git a/companion/src/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
similarity index 55%
rename from companion/src/mixerdialog.cpp
rename to companion/src/modeledit/mixerdialog.cpp
index 92d7b809f..d0d4c3560 100644
--- a/companion/src/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -6,7 +6,8 @@
 MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
     QDialog(parent),
     ui(new Ui::MixerDialog),
-    md(mixdata)
+    md(mixdata),
+    lock(false)
 {
     ui->setupUi(this);
     QRegExp rx(CHAR_FOR_NAMES_REGEX);
@@ -17,109 +18,71 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
       this->setWindowTitle(tr("DEST -> X%1").arg(md->destCh-GetEepromInterface()->getCapability(Outputs)));
     else
       this->setWindowTitle(tr("DEST -> CH%1%2").arg(md->destCh/10).arg(md->destCh%10));
+
     populateSourceCB(ui->sourceCB, md->srcRaw, POPULATE_SOURCES | POPULATE_SWITCHES | (GetEepromInterface()->getCapability(ExtraTrims) ? POPULATE_TRIMS : 0) | (GetEepromInterface()->getCapability(GvarsAsSources) ? POPULATE_GVARS : 0));
+
     ui->sourceCB->removeItem(0);
     int limit=GetEepromInterface()->getCapability(OffsetWeight);
-    if (GetEepromInterface()->getCapability(GvarsAsWeight)) {
-      int gvars=0;
-      if (GetEepromInterface()->getCapability(HasVariants)) {
-        if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
-          gvars=1;
-        }
-      } else {
+    int gvars=0;
+    if (GetEepromInterface()->getCapability(HasVariants)) {
+      if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
         gvars=1;
       }
-      if (gvars==0) {
-        ui->offsetGV->setDisabled(true);
-        ui->weightGV->setDisabled(true);
-        ui->differentialGV->setDisabled(true);
-        if (md->weight>limit || md->weight<-limit) {
-          md->weight=100;
-        }
-        if (md->sOffset>limit || md->sOffset<-limit) {
-          md->sOffset=0;
-        }
-        if (md->differential>100 || md->weight<-100) {
-          md->differential=0;
-        }
-      }
-      populateGVCB(ui->offsetCB,md->sOffset);
-      populateGVCB(ui->weightCB,md->weight);
-      populateGVCB(ui->differentialCB,md->differential);
-      ui->weightSB->setMinimum(-limit);
-      ui->weightSB->setMaximum(limit);
-      if (md->weight>limit || md->weight<-limit) {
-        ui->weightGV->setChecked(true);
-        ui->weightSB->hide();
-        ui->weightCB->show();
-      } else {
-        ui->weightGV->setChecked(false);
-        ui->weightSB->setValue(md->weight);
-        ui->weightSB->show();
-        ui->weightCB->hide();
-      }
-
-      ui->offsetSB->setMinimum(-limit);
-      ui->offsetSB->setMaximum(limit);
-      if (md->sOffset>limit || md->sOffset<-limit) {
-        ui->offsetGV->setChecked(true);
-        ui->offsetSB->hide();
-        ui->offsetCB->show();
-      } else {
-        ui->offsetGV->setChecked(false);
-        ui->offsetSB->setValue(md->sOffset);
-        ui->offsetSB->show();
-        ui->offsetCB->hide();
-      }
-
-      ui->differentialSB->setMinimum(-100);
-      ui->differentialSB->setMaximum(100);
-      if (md->differential>100 || md->differential<-100) {
-        ui->differentialGV->setChecked(true);
-        ui->differentialSB->hide();
-        ui->differentialCB->show();
-      } else {
-        ui->differentialGV->setChecked(false);
-        ui->differentialSB->setValue(md->differential);
-        ui->differentialSB->show();
-        ui->differentialCB->hide();
-      }
     } else {
-      ui->offsetGV->hide();
-      ui->weightGV->hide();
-      ui->differentialGV->hide();
-      ui->offsetSB->setMinimum(-limit);
-      ui->offsetSB->setMaximum(limit);
-      ui->offsetSB->setValue(md->sOffset);
-      ui->differentialSB->setMinimum(-100);
-      ui->differentialSB->setMaximum(100);
-      ui->differentialSB->setValue(md->differential);
-      ui->weightSB->setMinimum(-limit);
-      ui->weightSB->setMaximum(limit);
-      ui->weightSB->setValue(md->weight);
+      gvars=1;
     }
-
-    ui->FixOffsetChkB->setChecked(md->lateOffset);
-    ui->MixDR_CB->setChecked(md->noExpo==0);
-    if (md->enableFmTrim==1) {
-      ui->label_4->setText(tr("FM Trim Value"));
+    if (gvars==0) {
+      ui->offsetGV->setDisabled(true);
+      ui->weightGV->setDisabled(true);
+      if (md->weight>limit || md->weight<-limit) {
+        md->weight=100;
+      }
+      if (md->sOffset>limit || md->sOffset<-limit) {
+        md->sOffset=0;
+      }
+    }
+    populateGVCB(ui->offsetCB,md->sOffset);
+    populateGVCB(ui->weightCB,md->weight);
+    ui->weightSB->setMinimum(-limit);
+    ui->weightSB->setMaximum(limit);
+    if (md->weight>limit || md->weight<-limit) {
+      ui->weightGV->setChecked(true);
+      ui->weightSB->hide();
+      ui->weightCB->show();
     }
     else {
-      ui->label_4->setText(tr("Offset"));
+      ui->weightGV->setChecked(false);
+      ui->weightSB->setValue(md->weight);
+      ui->weightSB->show();
+      ui->weightCB->hide();
     }
+
+    ui->offsetSB->setMinimum(-limit);
+    ui->offsetSB->setMaximum(limit);
+    if (md->sOffset>limit || md->sOffset<-limit) {
+      ui->offsetGV->setChecked(true);
+      ui->offsetSB->hide();
+      ui->offsetCB->show();
+    }
+    else {
+      ui->offsetGV->setChecked(false);
+      ui->offsetSB->setValue(md->sOffset);
+      ui->offsetSB->show();
+      ui->offsetCB->hide();
+    }
+
+    if (GetEepromInterface()->getCapability(VirtualInputs)) {
+      ui->trimLabel->hide();
+      ui->trimCB->hide();
+    }
+
+    CurveGroup * curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, md->curve);
+
+    ui->MixDR_CB->setChecked(md->noExpo==0);
     if (!GetEepromInterface()->getCapability(MixesWithoutExpo)) {
       ui->MixDR_CB->hide();
       ui->label_MixDR->hide();
     }
-    if (!GetEepromInterface()->getCapability(MixFmTrim)) {
-      ui->FMtrimChkB->hide();
-      ui->label_FMtrim->hide();
-      ui->label_4->setText(tr("Offset"));
-    }
-    if (!GetEepromInterface()->getCapability(HasFixOffset)) {
-      ui->FixOffsetChkB->hide();
-      ui->label_FixOffset->hide();
-    }
     if (GetEepromInterface()->getCapability(ExtraTrims)) {
       ui->trimCB->addItem(tr("Rud"),1);
       ui->trimCB->addItem(tr("Ele"),2);
@@ -127,12 +90,6 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
       ui->trimCB->addItem(tr("Ail"),4);      
     }
     ui->trimCB->setCurrentIndex((-md->carryTrim)+1);
-    if (!GetEepromInterface()->getCapability(DiffMixers)) {
-      ui->differentialGV->hide();
-      ui->differentialSB->hide();
-      ui->differentialCB->hide();
-      ui->label_curve->setText(tr("Curve"));
-    }
     int namelength=GetEepromInterface()->getCapability(HasMixerNames);
     if (!namelength) {
       ui->label_name->hide();
@@ -146,7 +103,8 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
         lb_fp[i]->hide();
         cb_fp[i]->hide();
       }
-    } else {
+    }
+    else {
       int mask=1;
       for (int i=0; i<9 ; i++) {
         if ((md->phases & mask)==0) {
@@ -159,9 +117,10 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
         cb_fp[i]->hide();
       }
     }
+
     ui->mixerName->setValidator(new QRegExpValidator(rx, this));
     ui->mixerName->setText(md->name);
-    populateCurvesCB(ui->curvesCB,md->curve);
+
     populateSwitchCB(ui->switchesCB,md->swtch);
     ui->warningCB->setCurrentIndex(md->mixWarn);
     ui->mltpxCB->setCurrentIndex(md->mltpx);
@@ -190,18 +149,12 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
     connect(ui->sourceCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->weightCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->offsetCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-    connect(ui->differentialCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->weightSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
     connect(ui->offsetSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
-    connect(ui->differentialSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
-    connect(ui->weightGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
+    connect(ui->weightGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged())); // TODO why the same slot?
     connect(ui->offsetGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
-    connect(ui->differentialGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
     connect(ui->trimCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->MixDR_CB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
-    connect(ui->FMtrimChkB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
-    connect(ui->FixOffsetChkB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
-    connect(ui->curvesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->warningCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
     connect(ui->mltpxCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
@@ -233,47 +186,43 @@ void MixerDialog::changeEvent(QEvent *e)
 
 void MixerDialog::widgetChanged()
 {
-    if (GetEepromInterface()->getCapability(GvarsAsWeight)) {
-      int gvars=0;
-      if (GetEepromInterface()->getCapability(HasVariants)) {
-        if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
-          gvars=1;
-        }
-      } else {
-        gvars=1;
-      }
-      if (gvars==1) {
-        if (!GetEepromInterface()->getCapability(DiffMixers)) {
-          if (ui->differentialGV->isChecked()) {
-            ui->differentialCB->show();
-            ui->differentialSB->hide();
-          } else {
-            ui->differentialCB->hide();
-            ui->differentialSB->show();
-          }
-        } 
-        if (ui->weightGV->isChecked()) {
-          ui->weightCB->show();
-          ui->weightSB->hide();
-        } else {
-          ui->weightCB->hide();
-          ui->weightSB->show();
-        }
-        if (ui->offsetGV->isChecked()) {
-          ui->offsetCB->show();
-          ui->offsetSB->hide();
-        } else {
-          ui->offsetCB->hide();
-          ui->offsetSB->show();
-        }
-      }
-      valuesChanged();
-      QTimer::singleShot(0, this, SLOT(shrink()));      
+  int gvars = 0;
+  if (GetEepromInterface()->getCapability(HasVariants)) {
+    if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
+      gvars = 1;
     }
+  }
+  else {
+    gvars = 1;
+  }
+
+  if (gvars == 1) {
+    if (ui->weightGV->isChecked()) {
+      ui->weightCB->show();
+      ui->weightSB->hide();
+    }
+    else {
+      ui->weightCB->hide();
+      ui->weightSB->show();
+    }
+    if (ui->offsetGV->isChecked()) {
+      ui->offsetCB->show();
+      ui->offsetSB->hide();
+    }
+    else {
+      ui->offsetCB->hide();
+      ui->offsetSB->show();
+    }
+  }
+
+  valuesChanged();
+  QTimer::singleShot(0, this, SLOT(shrink()));
 }
 
 void MixerDialog::valuesChanged()
 {
+  if (!lock) {
+    lock = true;
     QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
     md->srcRaw  = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt());
     if ((ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt()-65536)<4) {
@@ -300,29 +249,6 @@ void MixerDialog::valuesChanged()
     }
     md->carryTrim = -(ui->trimCB->currentIndex()-1);
     md->noExpo = ui->MixDR_CB->checkState() ? 0 : 1;
-    md->lateOffset = ui->FixOffsetChkB->checkState() ? 1 : 0;
-    md->enableFmTrim = ui->FMtrimChkB->checkState() ? 1 : 0;
-    int numcurves=GetEepromInterface()->getCapability(NumCurves);
-    if (numcurves==0) {
-      numcurves=16;
-    }
-    if (GetEepromInterface()->getCapability(DiffMixers) && (ui->curvesCB->currentIndex()-(numcurves)*GetEepromInterface()->getCapability(HasNegCurves))==0){
-      ui->differentialGV->show();
-       if (ui->differentialGV->isChecked()) {
-         ui->differentialSB->hide();
-         ui->differentialCB->show();
-       } else {
-         ui->differentialSB->show();
-         ui->differentialCB->hide();            
-       }
-    } else {
-      ui->differentialGV->hide();
-      ui->differentialGV->setChecked(false);
-      ui->differentialSB->hide();
-      ui->differentialSB->setValue(0);
-      ui->differentialCB->hide(); 
-    }
-    md->curve     = ui->curvesCB->currentIndex()-(numcurves)*GetEepromInterface()->getCapability(HasNegCurves);
     md->swtch     = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
     md->mixWarn   = ui->warningCB->currentIndex();
     md->mltpx     = (MltpxValue)ui->mltpxCB->currentIndex();
@@ -331,16 +257,7 @@ void MixerDialog::valuesChanged()
     md->delayUp   = round(ui->delayUpSB->value()*scale);
     md->speedDown = round(ui->slowDownSB->value()*scale);
     md->speedUp   = round(ui->slowUpSB->value()*scale);
-    if (ui->differentialGV->isChecked()) {
-      md->differential = ui->differentialCB->itemData(ui->differentialCB->currentIndex()).toInt();
-    } else {
-      md->differential = ui->differentialSB->value();
-    }
-    if (GetEepromInterface()->getCapability(MixFmTrim) && md->enableFmTrim==1) {
-        ui->label_4->setText(tr("FM Trim Value"));
-    } else {
-        ui->label_4->setText(tr("Offset"));
-    }
+
     int i=0;
     for (i=0; i<ui->mixerName->text().toAscii().length(); i++) {
       md->name[i]=ui->mixerName->text().toAscii().at(i);
@@ -354,6 +271,9 @@ void MixerDialog::valuesChanged()
       md->phases<<=1;
     }
     md->phases>>=1;
+
+    lock = false;
+  }
 }
 
 void MixerDialog::shrink() {
diff --git a/companion/src/mixerdialog.h b/companion/src/modeledit/mixerdialog.h
similarity index 97%
rename from companion/src/mixerdialog.h
rename to companion/src/modeledit/mixerdialog.h
index fcf8c5b2f..9435e1892 100644
--- a/companion/src/mixerdialog.h
+++ b/companion/src/modeledit/mixerdialog.h
@@ -26,6 +26,7 @@ private slots:
 private:
     Ui::MixerDialog *ui;
     MixData *md;
+    bool lock;
 };
 
 #endif // MIXERDIALOG_H
diff --git a/companion/src/mixerdialog.ui b/companion/src/modeledit/mixerdialog.ui
similarity index 94%
rename from companion/src/mixerdialog.ui
rename to companion/src/modeledit/mixerdialog.ui
index 594d26356..ed14a05b9 100644
--- a/companion/src/mixerdialog.ui
+++ b/companion/src/modeledit/mixerdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>367</width>
-    <height>475</height>
+    <width>342</width>
+    <height>434</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,7 +20,7 @@
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="companion9x.qrc">
+   <iconset resource="../companion9x.qrc">
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
@@ -178,42 +178,28 @@ p, li { white-space: pre-wrap; }
    </item>
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0">
-     <item row="12" column="1" colspan="2">
-      <widget class="QComboBox" name="mltpxCB">
-       <property name="whatsThis">
-        <string>Multiplexer
-
-This determines how mixer values are added.
-
-&quot;+&quot; means the value of the current mix is added to the previous mixes in the same channel.
-&quot;*&quot; means the value of the current mix is amultiplied with the previous mixes in the same channel.
-&quot;R&quot; means the value replaces the previous values.  If the switch is off the value will be ignored.</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>ADD</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>MULTIPLY</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>REPLACE</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="1" column="1" colspan="2">
-      <widget class="QComboBox" name="sourceCB">
-       <property name="whatsThis">
-        <string>The source for the mixer</string>
+     <item row="5" column="0">
+      <widget class="QLabel" name="trimLabel">
+       <property name="text">
+        <string>Include Trim</string>
        </property>
       </widget>
      </item>
-     <item row="9" column="1" colspan="2">
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Offset</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Weight</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1" colspan="2">
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="0" column="0">
         <widget class="QLabel" name="lb_FP0">
@@ -370,20 +356,6 @@ This determines how mixer values are added.
        </item>
       </layout>
      </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="label_8">
-       <property name="text">
-        <string>Warning</string>
-       </property>
-      </widget>
-     </item>
-     <item row="12" column="0">
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>Multiplex</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label_name">
        <property name="text">
@@ -398,52 +370,24 @@ This determines how mixer values are added.
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_3">
+     <item row="10" column="0">
+      <widget class="QLabel" name="label_9">
        <property name="text">
-        <string>Weight</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Offset</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_curve">
-       <property name="text">
-        <string>Curve/Differential</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Include Trim</string>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="label_FMtrim">
-       <property name="text">
-        <string>Enable FM Trim</string>
+        <string>Multiplex</string>
        </property>
       </widget>
      </item>
      <item row="9" column="0">
-      <widget class="QLabel" name="label_phases">
+      <widget class="QLabel" name="label_8">
        <property name="text">
-        <string>Flight modes</string>
+        <string>Warning</string>
        </property>
       </widget>
      </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>Switch</string>
+     <item row="4" column="1">
+      <widget class="QComboBox" name="curveTypeCB">
+       <property name="whatsThis">
+        <string>The curve used by the mix</string>
        </property>
       </widget>
      </item>
@@ -454,14 +398,28 @@ This determines how mixer values are added.
        </property>
       </widget>
      </item>
-     <item row="8" column="0">
-      <widget class="QLabel" name="label_FixOffset">
+     <item row="7" column="0">
+      <widget class="QLabel" name="label_phases">
        <property name="text">
-        <string>Fix Offset</string>
+        <string>Flight modes</string>
        </property>
       </widget>
      </item>
-     <item row="11" column="1" colspan="2">
+     <item row="8" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Switch</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QCheckBox" name="MixDR_CB">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="1" colspan="2">
       <widget class="QComboBox" name="warningCB">
        <property name="whatsThis">
         <string>Mixer warning.
@@ -489,38 +447,18 @@ Setting this value will cause a beep to be emmitted when this value is active.</
        </item>
       </widget>
      </item>
-     <item row="4" column="1">
-      <widget class="QComboBox" name="curvesCB">
-       <property name="whatsThis">
-        <string>The curve used by the mix</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="QCheckBox" name="MixDR_CB">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="1">
-      <widget class="QCheckBox" name="FixOffsetChkB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <widget class="QCheckBox" name="FMtrimChkB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
+     <item row="5" column="1">
+      <widget class="QComboBox" name="trimCB">
+       <item>
+        <property name="text">
+         <string>No</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Yes</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item row="3" column="1" colspan="2">
@@ -557,18 +495,46 @@ Setting this value will cause a beep to be emmitted when this value is active.</
        </item>
       </layout>
      </item>
-     <item row="5" column="1">
-      <widget class="QComboBox" name="trimCB">
+     <item row="10" column="1" colspan="2">
+      <widget class="QComboBox" name="mltpxCB">
+       <property name="whatsThis">
+        <string>Multiplexer
+
+This determines how mixer values are added.
+
+&quot;+&quot; means the value of the current mix is added to the previous mixes in the same channel.
+&quot;*&quot; means the value of the current mix is amultiplied with the previous mixes in the same channel.
+&quot;R&quot; means the value replaces the previous values.  If the switch is off the value will be ignored.</string>
+       </property>
        <item>
         <property name="text">
-         <string>No</string>
+         <string>ADD</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Yes</string>
+         <string>MULTIPLY</string>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>REPLACE</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="1" colspan="2">
+      <widget class="QComboBox" name="sourceCB">
+       <property name="whatsThis">
+        <string>The source for the mixer</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_curve">
+       <property name="text">
+        <string>Curve</string>
+       </property>
       </widget>
      </item>
      <item row="2" column="1" colspan="2">
@@ -605,7 +571,7 @@ Setting this value will cause a beep to be emmitted when this value is active.</
        </item>
       </layout>
      </item>
-     <item row="10" column="1" colspan="2">
+     <item row="8" column="1" colspan="2">
       <widget class="QComboBox" name="switchesCB">
        <property name="whatsThis">
         <string>Switch used by the mix.
@@ -623,21 +589,21 @@ If blank then the mix is considered to be &quot;ON&quot; all the time.</string>
      <item row="4" column="2">
       <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0,0">
        <item>
-        <widget class="QCheckBox" name="differentialGV">
+        <widget class="QCheckBox" name="curveGVarCB">
          <property name="text">
           <string>GV</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QComboBox" name="differentialCB">
+        <widget class="QComboBox" name="curveValueCB">
          <property name="whatsThis">
           <string>The source for the mixer</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QSpinBox" name="differentialSB"/>
+        <widget class="QSpinBox" name="curveValueSB"/>
        </item>
       </layout>
      </item>
@@ -646,7 +612,7 @@ If blank then the mix is considered to be &quot;ON&quot; all the time.</string>
   </layout>
  </widget>
  <resources>
-  <include location="companion9x.qrc"/>
+  <include location="../companion9x.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/companion/src/mixerslist.cpp b/companion/src/modeledit/mixerslist.cpp
similarity index 100%
rename from companion/src/mixerslist.cpp
rename to companion/src/modeledit/mixerslist.cpp
diff --git a/companion/src/mixerslist.h b/companion/src/modeledit/mixerslist.h
similarity index 100%
rename from companion/src/mixerslist.h
rename to companion/src/modeledit/mixerslist.h
diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp
new file mode 100644
index 000000000..63a4bcb9c
--- /dev/null
+++ b/companion/src/modeledit/mixes.cpp
@@ -0,0 +1,514 @@
+#include "mixes.h"
+#include "helpers.h"
+// #include <QMessageBox>
+// #include "expodialog.h"
+
+MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
+  ModelPanel(parent, model),
+  generalSettings(generalSettings),
+  mixInserted(false)
+{
+  QGridLayout * mixesLayout = new QGridLayout(this);
+
+  MixerlistWidget = new MixersList(this, false); // TODO enum
+  QPushButton * qbUp = new QPushButton(this);
+  QPushButton * qbDown = new QPushButton(this);
+  QPushButton * qbClear = new QPushButton(this);
+
+  qbUp->setText(tr("Move Up"));
+  qbUp->setIcon(QIcon(":/images/moveup.png"));
+  qbUp->setShortcut(QKeySequence(tr("Ctrl+Up")));
+  qbDown->setText(tr("Move Down"));
+  qbDown->setIcon(QIcon(":/images/movedown.png"));
+  qbDown->setShortcut(QKeySequence(tr("Ctrl+Down")));
+  qbClear->setText(tr("Clear Mixes"));
+  qbClear->setIcon(QIcon(":/images/clear.png"));
+
+  mixesLayout->addWidget(MixerlistWidget,1,1,1,3);
+  mixesLayout->addWidget(qbUp,2,1);
+  mixesLayout->addWidget(qbClear,2,2);
+  mixesLayout->addWidget(qbDown,2,3);
+
+  connect(MixerlistWidget,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(mixerlistWidget_customContextMenuRequested(QPoint)));
+  connect(MixerlistWidget,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(mixerlistWidget_doubleClicked(QModelIndex)));
+  connect(MixerlistWidget,SIGNAL(mimeDropped(int,const QMimeData*,Qt::DropAction)),this,SLOT(mimeMixerDropped(int,const QMimeData*,Qt::DropAction)));
+
+  connect(qbUp,SIGNAL(pressed()),SLOT(moveMixUp()));
+  connect(qbDown,SIGNAL(pressed()),SLOT(moveMixDown()));
+  connect(qbClear,SIGNAL(pressed()),SLOT(clearMixes()));
+
+  connect(MixerlistWidget,SIGNAL(keyWasPressed(QKeyEvent*)), this, SLOT(mixerlistWidget_KeyPress(QKeyEvent*)));
+}
+
+MixesPanel::~MixesPanel()
+{
+}
+
+void MixesPanel::update()
+{
+  // curDest -> destination channel4
+  // i -> mixer number
+  QByteArray qba;
+  MixerlistWidget->clear();
+  unsigned int curDest = 0;
+  int i;
+  unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
+  int showNames = false; // TODO in a menu ui->showNames_Ckb->isChecked();
+  for(i=0; i<GetEepromInterface()->getCapability(Mixes); i++) {
+    MixData *md = &model.mixData[i];
+    if ((md->destCh==0) || (md->destCh>outputs+(unsigned int)GetEepromInterface()->getCapability(ExtraChannels))) continue;
+    QString str = "";
+    while(curDest<(md->destCh-1)) {
+      curDest++;
+      if (curDest > outputs) {
+        str = tr("X%1  ").arg(curDest-outputs);
+      } else {
+        str = tr("CH%1%2").arg(curDest/10).arg(curDest%10);
+        if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
+          QString name=model.limitData[curDest-1].name;
+          if (!name.isEmpty()) {
+            name.append("     ");
+            str=name.left(6);
+          }
+        }
+      }
+      qba.clear();
+      qba.append((quint8)-curDest);
+      QListWidgetItem *itm = new QListWidgetItem(str);
+      itm->setData(Qt::UserRole,qba);
+      MixerlistWidget->addItem(itm);
+    }
+
+    if (md->destCh > outputs) {
+      str = tr("X%1  ").arg(md->destCh-outputs);
+    } else {
+      str = tr("CH%1%2").arg(md->destCh/10).arg(md->destCh%10);
+      str.append("  ");
+      if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
+        QString name=model.limitData[md->destCh-1].name;
+        if (!name.isEmpty()) {
+          name.append("     ");
+          str=name.left(6);
+        }
+      }
+    }
+    if (curDest != md->destCh) {
+      curDest = md->destCh;
+    } else {
+      str.fill(' ');
+    }
+
+    switch(md->mltpx) {
+      case (1): str += " *"; break;
+      case (2): str += " R"; break;
+      default:  str += "  "; break;
+    };
+
+    str += " " + md->srcRaw.toString();
+
+    str += " " + tr("Weight(%1)").arg(getGVarString(md->weight, true));
+
+    QString phasesStr = getPhasesStr(md->phases, model);
+    if (!phasesStr.isEmpty()) str += " " + phasesStr;
+
+    if (md->swtch.type != SWITCH_TYPE_NONE) str += " " + tr("Switch(%1)").arg(md->swtch.toString());
+
+    if (md->carryTrim>0) {
+      str += " " + tr("No Trim");
+    }
+    else if (md->carryTrim<0) {
+      str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+    }
+
+    if (md->noExpo)      str += " " + tr("No DR/Expo");
+    if (md->sOffset)     str += " " + tr("Offset(%1)").arg(getGVarString(md->sOffset));
+    if (md->curve.value) str += " " + md->curve.toString();
+
+    int scale=GetEepromInterface()->getCapability(SlowScale);
+    if (scale==0)
+      scale=1;
+    if (md->delayDown || md->delayUp)
+      str += tr(" Delay(u%1:d%2)").arg((double)md->delayUp/scale).arg((double)md->delayDown/scale);
+    if (md->speedDown || md->speedUp)
+      str += tr(" Slow(u%1:d%2)").arg((double)md->speedUp/scale).arg((double)md->speedDown/scale);
+    if (md->mixWarn)  str += tr(" Warn(%1)").arg(md->mixWarn);
+    if (GetEepromInterface()->getCapability(HasMixerNames)) {
+      QString MixerName;
+      MixerName.append(md->name);
+      if (!MixerName.isEmpty()) {
+        str += QString("(%1)").arg(MixerName);
+      }
+    }
+    qba.clear();
+    qba.append((quint8)i);
+    qba.append((const char*)md, sizeof(MixData));
+    QListWidgetItem *itm = new QListWidgetItem(str);
+    itm->setData(Qt::UserRole,qba);  // mix number
+    MixerlistWidget->addItem(itm);//(str);
+  }
+
+  while(curDest<outputs+GetEepromInterface()->getCapability(ExtraChannels)) {
+    curDest++;
+    QString str;
+
+    if (curDest > outputs) {
+      str = tr("X%1  ").arg(curDest-outputs);
+    }
+    else {
+      str = tr("CH%1%2").arg(curDest/10).arg(curDest%10);
+      if (GetEepromInterface()->getCapability(HasChNames) && showNames) {
+        QString name=model.limitData[curDest-1].name;
+        if (!name.isEmpty()) {
+          name.append("     ");
+          str=name.left(6);
+        }
+      }
+    }
+    qba.clear();
+    qba.append((quint8)-curDest);
+    QListWidgetItem *itm = new QListWidgetItem(str);
+    itm->setData(Qt::UserRole,qba); // add new mixer
+    MixerlistWidget->addItem(itm);
+  }
+}
+
+
+bool MixesPanel::gm_insertMix(int idx)
+{
+    if (idx<0 || idx>=GetEepromInterface()->getCapability(Mixes) || model.mixData[GetEepromInterface()->getCapability(Mixes)-1].destCh > 0) {
+      QMessageBox::information(this, "companion9x", tr("Not enough available mixers!"));
+      return false;
+    }
+
+    int i = model.mixData[idx].destCh;
+    memmove(&model.mixData[idx+1],&model.mixData[idx],
+        (GetEepromInterface()->getCapability(Mixes)-(idx+1))*sizeof(MixData) );
+    memset(&model.mixData[idx],0,sizeof(MixData));
+    model.mixData[idx].srcRaw = RawSource(SOURCE_TYPE_NONE);
+    model.mixData[idx].destCh = i;
+    model.mixData[idx].weight = 100;
+    return true;
+}
+
+void MixesPanel::gm_deleteMix(int index)
+{
+    memmove(&model.mixData[index],&model.mixData[index+1],
+            (GetEepromInterface()->getCapability(Mixes)-(index+1))*sizeof(MixData));
+    memset(&model.mixData[GetEepromInterface()->getCapability(Mixes)-1],0,sizeof(MixData));
+}
+
+void MixesPanel::gm_openMix(int index)
+{
+    if(index<0 || index>=GetEepromInterface()->getCapability(Mixes)) return;
+
+    MixData mixd(model.mixData[index]);
+    emit modified();
+    update();
+
+    MixerDialog *g = new MixerDialog(this, &mixd, generalSettings.stickMode);
+    if(g->exec()) {
+      model.mixData[index] = mixd;
+      emit modified();
+      update();
+    } else {
+      if (mixInserted) {
+        gm_deleteMix(index);
+      }
+      mixInserted=false;
+      emit modified();
+      update();
+    }
+}
+
+int MixesPanel::getMixerIndex(unsigned int dch)
+{
+    int i = 0;
+    while ((model.mixData[i].destCh<=dch) && (model.mixData[i].destCh) && (i<GetEepromInterface()->getCapability(Mixes))) i++;
+    if(i==GetEepromInterface()->getCapability(Mixes)) return -1;
+    return i;
+}
+
+void MixesPanel::mixerlistWidget_doubleClicked(QModelIndex index)
+{
+    int idx= MixerlistWidget->item(index.row())->data(Qt::UserRole).toByteArray().at(0);
+    if (idx<0) {
+        int i = -idx;
+        idx = getMixerIndex(i); //get mixer index to insert
+        if (!gm_insertMix(idx))
+          return;
+        model.mixData[idx].destCh = i;
+        mixInserted=true;
+    } else {
+      mixInserted=false;
+    }
+    gm_openMix(idx);
+}
+
+void MixesPanel::mixersDeleteList(QList<int> list)
+{
+    qSort(list.begin(), list.end());
+
+    int iDec = 0;
+    foreach(int idx, list) {
+      gm_deleteMix(idx-iDec);
+      iDec++;
+    }
+}
+
+QList<int> MixesPanel::createMixListFromSelected()
+{
+    QList<int> list;
+    foreach(QListWidgetItem *item, MixerlistWidget->selectedItems()) {
+      int idx= item->data(Qt::UserRole).toByteArray().at(0);
+      if(idx>=0 && idx<GetEepromInterface()->getCapability(Mixes)) list << idx;
+    }
+    return list;
+}
+
+// TODO duplicated code
+void MixesPanel::setSelectedByMixList(QList<int> list)
+{
+    for(int i=0; i<MixerlistWidget->count(); i++) {
+      int t = MixerlistWidget->item(i)->data(Qt::UserRole).toByteArray().at(0);
+      if(list.contains(t))
+          MixerlistWidget->item(i)->setSelected(true);
+    }
+}
+
+
+void MixesPanel::mixersDelete(bool ask)
+{
+    QMessageBox::StandardButton ret = QMessageBox::No;
+
+    if(ask)
+      ret = QMessageBox::warning(this, "companion9x",
+               tr("Delete Selected Mixes?"),
+               QMessageBox::Yes | QMessageBox::No);
+
+
+    if ((ret == QMessageBox::Yes) || (!ask)) {
+      mixersDeleteList(createMixListFromSelected());
+      emit modified();
+      update();
+    }
+}
+
+void MixesPanel::mixersCut()
+{
+    mixersCopy();
+    mixersDelete(false);
+}
+
+void MixesPanel::mixersCopy()
+{
+
+    QList<int> list = createMixListFromSelected();
+
+    QByteArray mxData;
+    foreach(int idx, list) {
+      mxData.append((char*)&model.mixData[idx],sizeof(MixData));
+    }
+
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("application/x-companion9x-mix", mxData);
+    QApplication::clipboard()->setMimeData(mimeData,QClipboard::Clipboard);
+}
+
+void MixesPanel::pasteMixerMimeData(const QMimeData * mimeData, int destIdx)
+{
+  if(mimeData->hasFormat("application/x-companion9x-mix")) {
+    int idx; // mixer index
+    int dch;
+
+    if(destIdx<0) {
+      dch = -destIdx;
+      idx = getMixerIndex(dch) - 1; //get mixer index to insert
+    } else {
+      idx = destIdx;
+      dch = model.mixData[idx].destCh;
+    }
+
+    QByteArray mxData = mimeData->data("application/x-companion9x-mix");
+
+    int i = 0;
+    while(i<mxData.size()) {
+      idx++;
+      if(idx==GetEepromInterface()->getCapability(Mixes)) break;
+
+      if (!gm_insertMix(idx))
+        break;
+      MixData *md = &model.mixData[idx];
+      memcpy(md,mxData.mid(i,sizeof(MixData)).constData(),sizeof(MixData));
+      md->destCh = dch;
+      i += sizeof(MixData);
+    }
+
+    emit modified();
+    update();
+  }
+}
+
+
+void MixesPanel::mixersPaste()
+{
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+    QListWidgetItem *item = MixerlistWidget->currentItem();
+    if (item)
+      pasteMixerMimeData(mimeData, item->data(Qt::UserRole).toByteArray().at(0));
+}
+
+void MixesPanel::mixersDuplicate()
+{
+    mixersCopy();
+    mixersPaste();
+}
+
+void MixesPanel::mixerOpen()
+{
+    int idx = MixerlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
+    if(idx<0) {
+      int i = -idx;
+      idx = getMixerIndex(i); //get mixer index to insert
+      if (!gm_insertMix(idx))
+        return;
+      model.mixData[idx].destCh = i;
+      mixInserted=true;
+    } else {
+      mixInserted=false;
+    }
+
+    gm_openMix(idx);
+}
+
+void MixesPanel::mixerAdd()
+{
+    if (!MixerlistWidget->currentItem())
+      return;
+    int index = MixerlistWidget->currentItem()->data(Qt::UserRole).toByteArray().at(0);
+
+    if(index<0) {  // if empty then return relavent index
+      int i = -index;
+      index = getMixerIndex(i); //get mixer index to insert
+      if (!gm_insertMix(index))
+        return;
+      model.mixData[index].destCh = i;
+      mixInserted=true;
+    } else {
+      index++;
+      if (!gm_insertMix(index))
+        return;
+      model.mixData[index].destCh = model.mixData[index-1].destCh;
+      mixInserted=true;
+    }
+    gm_openMix(index);
+}
+
+void MixesPanel::mixerlistWidget_customContextMenuRequested(QPoint pos)
+{
+    QPoint globalPos = MixerlistWidget->mapToGlobal(pos);
+
+    const QClipboard *clipboard = QApplication::clipboard();
+    const QMimeData *mimeData = clipboard->mimeData();
+    bool hasData = mimeData->hasFormat("application/x-companion9x-mix");
+
+    QMenu contextMenu;
+    contextMenu.addAction(QIcon(":/images/add.png"), tr("&Add"),this,SLOT(mixerAdd()),tr("Ctrl+A"));
+    contextMenu.addAction(QIcon(":/images/edit.png"), tr("&Edit"),this,SLOT(mixerOpen()),tr("Enter"));
+    contextMenu.addSeparator();
+    contextMenu.addAction(QIcon(":/images/clear.png"), tr("&Delete"),this,SLOT(mixersDelete()),tr("Delete"));
+    contextMenu.addAction(QIcon(":/images/copy.png"), tr("&Copy"),this,SLOT(mixersCopy()),tr("Ctrl+C"));
+    contextMenu.addAction(QIcon(":/images/cut.png"), tr("&Cut"),this,SLOT(mixersCut()),tr("Ctrl+X"));
+    contextMenu.addAction(QIcon(":/images/paste.png"), tr("&Paste"),this,SLOT(mixersPaste()),tr("Ctrl+V"))->setEnabled(hasData);
+    contextMenu.addAction(QIcon(":/images/duplicate.png"), tr("Du&plicate"),this,SLOT(mixersDuplicate()),tr("Ctrl+U"));
+    contextMenu.addSeparator();
+    contextMenu.addAction(QIcon(":/images/moveup.png"), tr("Move Up"),this,SLOT(moveMixUp()),tr("Ctrl+Up"));
+    contextMenu.addAction(QIcon(":/images/movedown.png"), tr("Move Down"),this,SLOT(moveMixDown()),tr("Ctrl+Down"));
+
+    contextMenu.exec(globalPos);
+}
+
+void MixesPanel::mimeMixerDropped(int index, const QMimeData *data, Qt::DropAction /*action*/)
+{
+    int idx= MixerlistWidget->item(index > 0 ? index-1 : 0)->data(Qt::UserRole).toByteArray().at(0);
+    pasteMixerMimeData(data, idx);
+}
+
+void MixesPanel::mixesEdited()
+{
+    emit modified();
+}
+
+void MixesPanel::mixerlistWidget_KeyPress(QKeyEvent *event)
+{
+    if(event->matches(QKeySequence::SelectAll)) mixerAdd();  //Ctrl A
+    if(event->matches(QKeySequence::Delete))    mixersDelete();
+    if(event->matches(QKeySequence::Copy))      mixersCopy();
+    if(event->matches(QKeySequence::Cut))       mixersCut();
+    if(event->matches(QKeySequence::Paste))     mixersPaste();
+    if(event->matches(QKeySequence::Underline)) mixersDuplicate();
+
+    if(event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter) mixerOpen();
+    if(event->matches(QKeySequence::MoveToNextLine))
+        MixerlistWidget->setCurrentRow(MixerlistWidget->currentRow()+1);
+    if(event->matches(QKeySequence::MoveToPreviousLine))
+        MixerlistWidget->setCurrentRow(MixerlistWidget->currentRow()-1);
+}
+
+int MixesPanel::gm_moveMix(int idx, bool dir) //true=inc=down false=dec=up
+{
+    if(idx>GetEepromInterface()->getCapability(Mixes) || (idx==0 && !dir) || (idx==GetEepromInterface()->getCapability(Mixes) && dir)) return idx;
+
+    int tdx = dir ? idx+1 : idx-1;
+    MixData &src=model.mixData[idx];
+    MixData &tgt=model.mixData[tdx];
+
+    unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
+    if((src.destCh==0) || (src.destCh>outputs) || (tgt.destCh>outputs)) return idx;
+
+    if (tgt.destCh!=src.destCh) {
+        if ((dir)  && (src.destCh<outputs)) src.destCh++;
+        if ((!dir) && (src.destCh>0)) src.destCh--;
+        return idx;
+    }
+
+    //flip between idx and tgt
+    MixData temp;
+    memcpy(&temp,&src,sizeof(MixData));
+    memcpy(&src,&tgt,sizeof(MixData));
+    memcpy(&tgt,&temp,sizeof(MixData));
+    return tdx;
+}
+
+void MixesPanel::moveMixUp()
+{
+    QList<int> list = createMixListFromSelected();
+    QList<int> highlightList;
+    foreach(int idx, list) {
+      highlightList << gm_moveMix(idx, false);
+    }
+    emit modified();
+    update();
+    setSelectedByMixList(highlightList);
+}
+
+void MixesPanel::moveMixDown()
+{
+    QList<int> list = createMixListFromSelected();
+    QList<int> highlightList;
+    foreach(int idx, list) {
+      highlightList << gm_moveMix(idx, true);
+    }
+    emit modified();
+    update();
+    setSelectedByMixList(highlightList);
+}
+
+void MixesPanel::clearMixes()
+{
+  if (QMessageBox::question(this, tr("Clear Mixes?"), tr("Really clear all the mixes?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    model.clearMixes();
+    emit modified();
+    update();
+  }
+}
diff --git a/companion/src/modeledit/mixes.h b/companion/src/modeledit/mixes.h
new file mode 100644
index 000000000..5e5dc4e80
--- /dev/null
+++ b/companion/src/modeledit/mixes.h
@@ -0,0 +1,56 @@
+#ifndef MIXES_H
+#define MIXES_H
+
+#include "modelpanel.h"
+#include "mixerslist.h"
+#include "mixerdialog.h"
+
+class MixesPanel : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    virtual ~MixesPanel();
+
+    virtual void update();
+
+  private slots:
+    // TODO all slots?
+    void clearMixes();
+    void mixersDelete(bool ask=true);
+    void mixersCut();
+    void mixersCopy();
+    void mixersPaste();
+    void mixersDuplicate();
+    void mixerOpen();
+    void mixerAdd();
+    void moveMixUp();
+    void moveMixDown();
+
+    void mixerlistWidget_customContextMenuRequested(QPoint pos);
+    void mixerlistWidget_doubleClicked(QModelIndex index);
+    void mixerlistWidget_KeyPress(QKeyEvent *event);
+
+    void mimeMixerDropped(int index, const QMimeData *data, Qt::DropAction action);
+    void pasteMixerMimeData(const QMimeData * mimeData, int destIdx);
+
+    void mixesEdited();
+
+  private:
+    GeneralSettings & generalSettings;
+    MixersList *MixerlistWidget;
+    bool mixInserted;
+
+    int getMixerIndex(unsigned int dch);
+    bool gm_insertMix(int idx);
+    void gm_deleteMix(int index);
+    void gm_openMix(int index);
+    int gm_moveMix(int idx, bool dir);
+    void mixersDeleteList(QList<int> list);
+    QList<int> createMixListFromSelected();
+    void setSelectedByMixList(QList<int> list);
+
+};
+
+#endif // MIXES_H
diff --git a/companion/src/modeledit/modeledit.cpp b/companion/src/modeledit/modeledit.cpp
new file mode 100644
index 000000000..fcdc68108
--- /dev/null
+++ b/companion/src/modeledit/modeledit.cpp
@@ -0,0 +1,130 @@
+#include "modeledit.h"
+#include "ui_modeledit.h"
+#include "setup.h"
+#include "heli.h"
+#include "flightmodes.h"
+#include "inputs.h"
+#include "mixes.h"
+#include "channels.h"
+#include "curves.h"
+#include "customswitches.h"
+#include "customfunctions.h"
+#include "telemetry.h"
+#include <QScrollArea>
+
+ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool isNew, QWidget *parent) :
+  QDialog(parent),
+  ui(new Ui::ModelEdit),
+  modelId(modelId),
+  model(radioData.models[modelId]),
+  generalSettings(generalSettings)
+{
+  ui->setupUi(this);
+  addTab(new Setup(this, model), tr("Setup"));
+  addTab(new HeliPanel(this, model), tr("Heli"));
+  addTab(new FlightModes(this, model, radioData.generalSettings), tr("Flight Modes"));
+  addTab(new InputsPanel(this, model, radioData.generalSettings), tr("Inputs"));
+  addTab(new MixesPanel(this, model, radioData.generalSettings), tr("Mixes"));
+  addTab(new Channels(this, model), tr("Channels"));
+  addTab(new CustomSwitchesPanel(this, model), tr("Custom Switches"));
+  if (GetEepromInterface()->getCapability(CustomFunctions))
+    addTab(new CustomFunctionsPanel(this, model, radioData.generalSettings), tr("Assignable Functions"));
+  addTab(new Curves(this, model), tr("Curves"));
+  // TODO remove this capability if (!GetEepromInterface()->getCapability(FSSwitch))
+  if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY)
+    addTab(new TelemetryPanel(this, model), tr("Telemetry"));
+}
+
+ModelEdit::~ModelEdit()
+{
+  delete ui;
+}
+
+class VerticalScrollArea : public QScrollArea
+{
+  public:
+    VerticalScrollArea(QWidget * parent, ModelPanel * panel);
+
+  protected:
+    virtual bool eventFilter(QObject *o, QEvent *e);
+
+  private:
+    ModelPanel * panel;
+    QWidget * parent;
+};
+
+VerticalScrollArea::VerticalScrollArea(QWidget * parent, ModelPanel * panel):
+  QScrollArea(parent),
+  panel(panel),
+  parent(parent)
+{
+  setWidgetResizable(true);
+  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  setWidget(panel);
+  panel->installEventFilter(this);
+}
+
+bool VerticalScrollArea::eventFilter(QObject *o, QEvent *e)
+{
+  if (o == panel && e->type() == QEvent::Resize) {
+    setMinimumWidth(panel->minimumSizeHint().width() + verticalScrollBar()->width());
+  }
+  return false;
+}
+
+void ModelEdit::addTab(ModelPanel *panel, QString text)
+{
+  panels << panel;
+  QWidget * widget = new QWidget(ui->tabWidget);
+  QVBoxLayout *baseLayout = new QVBoxLayout(widget);
+  VerticalScrollArea * area = new VerticalScrollArea(widget, panel);
+  baseLayout->addWidget(area);
+  ui->tabWidget->addTab(widget, text);
+  connect(panel, SIGNAL(modified()), this, SLOT(onTabModified()));
+}
+
+void ModelEdit::onTabModified()
+{
+  emit modified();
+}
+
+void ModelEdit::on_tabWidget_currentChanged(int index)
+{
+  panels[index]->update();
+}
+
+void ModelEdit::on_pushButton_clicked()
+{
+  launchSimulation();
+}
+
+// TODO merge both
+#include "simulatordialog.h"
+#include "xsimulatordialog.h"
+
+void ModelEdit::launchSimulation()
+{
+  if (GetEepromInterface()->getSimulator()) {
+    RadioData *simuData = new RadioData();
+    simuData->generalSettings = generalSettings;
+    simuData->models[modelId] = model;
+    if (GetEepromInterface()->getCapability(SimulatorType)) {
+      xsimulatorDialog sd(this);
+      sd.loadParams(*simuData, modelId);
+      sd.exec();
+    }
+    else {
+      simulatorDialog sd(this);
+      sd.loadParams(*simuData, modelId);
+      sd.exec();
+    }
+    delete simuData;
+  }
+  else {
+    QMessageBox::warning(NULL,
+        QObject::tr("Warning"),
+        QObject::tr("Simulator for this firmware is not yet available"));
+  }
+}
+
+
diff --git a/companion/src/modeledit/modeledit.h b/companion/src/modeledit/modeledit.h
new file mode 100644
index 000000000..4208a7190
--- /dev/null
+++ b/companion/src/modeledit/modeledit.h
@@ -0,0 +1,39 @@
+#ifndef MODELEDIT_H
+#define MODELEDIT_H
+
+#include <QDialog>
+#include "modelpanel.h"
+
+namespace Ui {
+    class ModelEdit;
+}
+
+class ModelEdit : public QDialog
+{
+    Q_OBJECT
+
+  public:
+    explicit ModelEdit(RadioData & radioData, int modelId , bool openWizard =false, bool inNew =false, QWidget *parent = 0);
+    ~ModelEdit();
+
+  signals:
+    void modified();
+
+  private slots:
+    void onTabModified();
+    void on_pushButton_clicked();
+    void on_tabWidget_currentChanged(int index);
+
+  private:
+    Ui::ModelEdit *ui;
+    int modelId;
+    ModelData & model;
+    GeneralSettings & generalSettings;
+    QVector<ModelPanel *> panels;
+
+    void addTab(ModelPanel *panel, QString text);
+    void launchSimulation();
+
+};
+
+#endif // MODELEDIT_H
diff --git a/companion/src/modeledit/modeledit.ui b/companion/src/modeledit/modeledit.ui
new file mode 100644
index 000000000..a4ac2fa1e
--- /dev/null
+++ b/companion/src/modeledit/modeledit.ui
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ModelEdit</class>
+ <widget class="QDialog" name="ModelEdit">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>339</width>
+    <height>385</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../companion9x.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMinimumSize</enum>
+     </property>
+     <item>
+      <widget class="QTabWidget" name="tabWidget">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="tabPosition">
+        <enum>QTabWidget::North</enum>
+       </property>
+       <property name="currentIndex">
+        <number>-1</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="text">
+        <string>Simulate</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../companion9x.qrc">
+         <normaloff>:/images/simulate.png</normaloff>:/images/simulate.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../companion9x.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/modelpanel.cpp b/companion/src/modeledit/modelpanel.cpp
new file mode 100644
index 000000000..b4c257aba
--- /dev/null
+++ b/companion/src/modeledit/modelpanel.cpp
@@ -0,0 +1,30 @@
+#include "modelpanel.h"
+#include <QLabel>
+
+ModelPanel::ModelPanel(QWidget * parent, ModelData & model):
+  QWidget(parent),
+  model(model),
+  lock(false)
+{
+}
+
+ModelPanel::~ModelPanel()
+{
+}
+
+void ModelPanel::update()
+{
+}
+
+void ModelPanel::addLabel(QGridLayout * gridLayout, QString text, int col)
+{
+  QLabel *label = new QLabel(this);
+  label->setFrameShape(QFrame::Panel);
+  label->setFrameShadow(QFrame::Raised);
+  label->setMidLineWidth(0);
+  label->setAlignment(Qt::AlignCenter);
+  label->setMargin(3);
+  label->setText(text);
+  gridLayout->addWidget(label, 0, col, 1, 1);
+}
+
diff --git a/companion/src/modeledit/modelpanel.h b/companion/src/modeledit/modelpanel.h
new file mode 100644
index 000000000..8e37010dd
--- /dev/null
+++ b/companion/src/modeledit/modelpanel.h
@@ -0,0 +1,29 @@
+#ifndef MODELPANEL_H
+#define MODELPANEL_H
+
+#include <QWidget>
+#include <QGridLayout>
+#include "eeprominterface.h"
+
+class ModelPanel : public QWidget
+{
+    Q_OBJECT
+
+  public:
+    ModelPanel(QWidget *parent, ModelData & model);
+    virtual ~ModelPanel();
+
+  signals:
+    void modified();
+
+  public slots:
+    virtual void update();
+
+  protected:
+    ModelData & model;
+    bool lock;
+    void addLabel(QGridLayout * gridLayout, QString text, int col);
+
+};
+
+#endif // CHANNELS_H
diff --git a/companion/src/node.cpp b/companion/src/modeledit/node.cpp
similarity index 74%
rename from companion/src/node.cpp
rename to companion/src/modeledit/node.cpp
index 66fa209b1..b421490f9 100644
--- a/companion/src/node.cpp
+++ b/companion/src/modeledit/node.cpp
@@ -46,32 +46,28 @@
 
 #include "edge.h"
 #include "node.h"
-#include "modeledit.h"
 
-Node::Node(QSpinBox *sb,QSpinBox *sbx)
+Node::Node():
+  minX(-100),
+  maxX(+100)
 {
-    setFlag(ItemIsMovable);
-    setFlag(ItemSendsGeometryChanges);
-    setCacheMode(DeviceCoordinateCache);
-    setZValue(-1);
-    nodecolor = QColor(Qt::yellow);
-    qsb = sb;
-    qsbx = sbx;
-    bPressed  = false;
-    centerX   = true;
-    centerY   = true;
-    fixedX    = false;
-    fixedY    = false;
-    ballSize = DEFAULT_BALL_SIZE;
-    minX=-100;
-    maxX=100;
-
+  setFlag(ItemIsMovable);
+  setFlag(ItemSendsGeometryChanges);
+  setCacheMode(DeviceCoordinateCache);
+  setZValue(-1);
+  nodecolor = QColor(Qt::yellow);
+  bPressed  = false;
+  centerX   = true;
+  centerY   = true;
+  fixedX    = false;
+  fixedY    = false;
+  ballSize = DEFAULT_BALL_SIZE;
 }
 
 void Node::addEdge(Edge *edge)
 {
-    edgeList << edge;
-    edge->adjust();
+  edgeList << edge;
+  edge->adjust();
 }
 
 void Node::stepToCenter(qreal step)
@@ -105,7 +101,7 @@ void Node::stepToCenter(qreal step)
 
 }
 
-void Node::setColor(QColor color)
+void Node::setColor(const QColor & color)
 {
     nodecolor=color;
 }
@@ -190,26 +186,23 @@ QVariant Node::itemChange(GraphicsItemChange change, const QVariant &value)
              if(fixedY) newPos.setY(y());//make sure x doesn't change
              newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left())));// bound X
              newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top())));// bound Y
-             if (qsb) {
-               ModelEdit* modeledit = qobject_cast<ModelEdit*>(qsb->parent()->parent()->parent()->parent()->parent()->parent()->parent());
-               modeledit->redrawCurve = false;
-               qsb->setValue(100+(rect.top()-y())*200/rect.height());
-               if (qsbx && !getFixedX()) {
-                 int newX = -100 + ( (newPos.x()-rect.left()) * 200) / rect.width();
-                 if (newX < minX) newX = minX;
-                 if (newX > maxX) newX = maxX;
-                 newPos.setX(((newX+100)*rect.width()/200+rect.left()));
-                 qsbx->setValue(newX);
-               }
-               modeledit->redrawCurve = true;
+
+             int newX = -100 + ( (newPos.x()-rect.left()) * 200) / rect.width();
+             int newY = 100+(rect.top()-y())*200/rect.height();
+             if (newX < minX) newX = minX;
+             if (newX > maxX) newX = maxX;
+
+             if (!getFixedX()) {           
+               newPos.setX(((newX+100)*rect.width()/200+rect.left()));
              }
+             
+             emit moved(newX, newY);
              return newPos;
          }
         break;
     case ItemPositionHasChanged:
-
         foreach (Edge *edge, edgeList)
-            edge->adjust();
+          edge->adjust();
         break;
     default:
         break;
@@ -222,25 +215,19 @@ void Node::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     update();
     bPressed = true;
-    if(qsb) qsb->setFocus();
     QGraphicsItem::mousePressEvent(event);
+    emit focus();
 }
 
 void Node::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     update();
     bPressed = false;
-    if(scene()) {
-      if(qsb) {
-        qsb->clearFocus();
-        ModelEdit* modeledit = qobject_cast<ModelEdit*>(qsb->parent()->parent()->parent()->parent()->parent()->parent()->parent());
-        QGraphicsItem::mouseReleaseEvent(event);
-        modeledit->drawCurve();
-      } else {
-        QGraphicsItem::mouseReleaseEvent(event);
-      }
-      //need to tell SB that it needs to write the value
-    } else {
+    if (scene()) {
+      QGraphicsItem::mouseReleaseEvent(event);
+      emit unfocus();
+    }
+    else {
       QGraphicsItem::mouseReleaseEvent(event);
     }
 }
diff --git a/companion/src/node.h b/companion/src/modeledit/node.h
similarity index 91%
rename from companion/src/node.h
rename to companion/src/modeledit/node.h
index 7d33f111f..9bc699cb6 100644
--- a/companion/src/node.h
+++ b/companion/src/modeledit/node.h
@@ -52,11 +52,12 @@ QT_BEGIN_NAMESPACE
 class QGraphicsSceneMouseEvent;
 QT_END_NAMESPACE
 
-class Node : public QGraphicsItem
+class Node : public QGraphicsObject
 {
+  Q_OBJECT
 
-public:
-    Node(QSpinBox *sb = 0, QSpinBox *sbx = 0);
+  public:
+    Node();
 
     void addEdge(Edge *edge);
     QList<Edge *> edges() const;
@@ -80,16 +81,19 @@ public:
     bool getFixedY() {return fixedY;}
     void setMinX(int val) {minX = val;};
     void setMaxX(int val) {maxX = val;};
-    void setColor(QColor color);
+    void setColor(const QColor & color);
     
-protected:
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+  signals:
+    void moved(int x, int y);
+    void focus();
+    void unfocus();
 
+  protected:
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     
-private:
-
+  private:
     bool bPressed;
     bool centerX;
     bool centerY;
@@ -98,8 +102,6 @@ private:
     int  ballSize;
     int minX;
     int maxX;
-    QSpinBox *qsb;
-    QSpinBox *qsbx;
     QList<Edge *> edgeList;
     QPointF newPos;
     QColor nodecolor;
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
new file mode 100644
index 000000000..0302d367e
--- /dev/null
+++ b/companion/src/modeledit/setup.cpp
@@ -0,0 +1,652 @@
+#include "setup.h"
+#include "ui_setup.h"
+#include "ui_setup_timer.h"
+#include "ui_setup_module.h"
+#include "helpers.h"
+
+TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer):
+  ModelPanel(parent, model),
+  timer(timer),
+  ui(new Ui::Timer)
+{
+  ui->setupUi(this);
+
+  // Mode
+  populateTimerSwitchCB(ui->mode, timer.mode);
+
+  if (!GetEepromInterface()->getCapability(PermTimers)) {
+    ui->persistent->hide();
+    ui->persistentValue->hide();
+  }
+
+  if (!GetEepromInterface()->getCapability(minuteBeep)) {
+    ui->minuteBeep->hide();
+  }
+
+  if (!GetEepromInterface()->getCapability(countdownBeep)) {
+    ui->countdownBeep->hide();
+  }
+}
+
+TimerPanel::~TimerPanel()
+{
+  delete ui;
+}
+
+void TimerPanel::update()
+{
+  int min = timer.val / 60;
+  int sec = timer.val % 60;
+  ui->value->setTime(QTime(0, min, sec));
+
+  if (GetEepromInterface()->getCapability(PermTimers)) {
+    int sign = 1;
+    int pvalue = timer.pvalue;
+    if (pvalue < 0) {
+      pvalue = -pvalue;
+      sign = -1;
+    }
+    int hours = pvalue / 3600;
+    pvalue -= hours * 3600;
+    int minutes = pvalue / 60;
+    int seconds = pvalue % 60;
+    ui->persistent->setChecked(timer.persistent);
+    ui->persistentValue->setText(QString(" %1(%2:%3:%4)").arg(sign<0 ? "-" :" ").arg(hours, 2, 10, QLatin1Char('0')).arg(minutes, 2, 10, QLatin1Char('0')).arg(seconds, 2, 10, QLatin1Char('0')));
+  }
+
+  if (GetEepromInterface()->getCapability(minuteBeep)) {
+    ui->minuteBeep->setChecked(timer.minuteBeep);
+  }
+
+  if (GetEepromInterface()->getCapability(countdownBeep)) {
+    ui->countdownBeep->setChecked(timer.countdownBeep);
+  }
+}
+
+void TimerPanel::on_value_editingFinished()
+{
+  timer.val = ui->value->time().minute()*60 + ui->value->time().second();
+  emit modified();
+}
+
+void TimerPanel::on_mode_currentIndexChanged(int index)
+{
+  timer.mode = TimerMode(ui->mode->itemData(index).toInt());
+  emit modified();
+}
+
+void TimerPanel::on_persistent_toggled(bool checked)
+{
+  timer.persistent = checked;
+  emit modified();
+}
+
+void TimerPanel::on_minuteBeep_toggled(bool checked)
+{
+  timer.minuteBeep = checked;
+  emit modified();
+}
+
+void TimerPanel::on_countdownBeep_toggled(bool checked)
+{
+  timer.countdownBeep = checked;
+  emit modified();
+}
+
+/******************************************************************************/
+
+ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module, int moduleIdx):
+  ModelPanel(parent, model),
+  module(module),
+  moduleIdx(moduleIdx),
+  ui(new Ui::Module)
+{
+  lock = true;
+
+  ui->setupUi(this);
+
+  QString label;
+  if (moduleIdx < 0) {
+    label = tr("Trainer Module");
+    ui->trainerMode->setCurrentIndex(model.trainerMode);
+  }
+  else {
+    ui->label_trainerMode->hide();
+    ui->trainerMode->hide();
+    if (moduleIdx == 0)
+      label = tr("Internal Module");
+    else
+      label = tr("External Module");
+
+  }
+  ui->label_module->setText(label);
+
+  // The protocols available on this board
+  for (int i=0; i<PROTO_LAST; i++) {
+    if (GetEepromInterface()->isAvailable((Protocol)i, moduleIdx)) {
+      ui->protocol->addItem(getProtocolStr(i), (QVariant)i);
+      if (i == module.protocol) ui->protocol->setCurrentIndex(ui->protocol->count()-1);
+    }
+  }
+
+  if (GetEepromInterface()->getCapability(HasFailsafe)) {
+    for (int i=0; i<16; i++) {
+      QSlider * slider = new QSlider(this);
+      slider->setMinimumSize(QSize(30, 50));
+      slider->setRange(-100, 100);
+      QSpinBox * spinbox = new QSpinBox(this);
+      spinbox->setMinimumSize(QSize(20, 0));
+      spinbox->setRange(-100, 100);
+      slider->setProperty("index", i);
+      spinbox->setProperty("index", i);
+      failsafeSliders << slider;
+      failsafeSpins << spinbox;
+      ui->failsafesLayout->addWidget(slider, 2*(i/8), i%8, Qt::AlignHCenter);
+      ui->failsafesLayout->addWidget(spinbox, 1+2*(i/8), i%8, Qt::AlignHCenter);
+      connect(slider, SIGNAL(valueChanged(int)), this, SLOT(onFailsafeChannelChanged(int)));
+      connect(slider, SIGNAL(valueChanged(int)), this, SLOT(onFailsafeChannelChanged(int)));
+    }
+  }
+
+  lock = false;
+}
+
+ModulePanel::~ModulePanel()
+{
+  delete ui;
+}
+
+#define MASK_PROTOCOL       1
+#define MASK_CHANNELS_COUNT 2
+#define MASK_RX_NUMBER      4
+#define MASK_CHANNELS_RANGE 8
+#define MASK_PPM_FIELDS     16
+#define MASK_FAILSAFES      32
+
+void ModulePanel::update()
+{
+  unsigned int mask = 0;
+  Protocol protocol = (Protocol)module.protocol;
+
+  if (moduleIdx >= 0 || model.trainerMode != 0) {
+    mask |= MASK_PROTOCOL;
+    switch (protocol) {
+      case OFF:
+        break;
+      case PXX_XJT_X16:
+      case PXX_XJT_D8:
+      case PXX_XJT_LR12:
+      case PXX_DJT:
+        mask |= MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT | MASK_RX_NUMBER;
+        if (protocol==PXX_XJT_X16) mask |= MASK_FAILSAFES;
+        break;
+      case LP45:
+      case DSM2:
+      case DSMX:
+        mask |= MASK_CHANNELS_RANGE | MASK_RX_NUMBER;
+        module.channelsCount = 8;
+        break;
+      default:
+        mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT;
+        break;
+    }
+  }
+
+  ui->label_protocol->setVisible(mask & MASK_PROTOCOL);
+  ui->protocol->setVisible(mask & MASK_PROTOCOL);
+  ui->label_rxNumber->setVisible(mask & MASK_PROTOCOL);
+  ui->rxNumber->setVisible(mask & MASK_PROTOCOL);
+  ui->rxNumber->setEnabled(mask & MASK_RX_NUMBER);
+  ui->rxNumber->setValue(model.modelId);
+  ui->label_channelsStart->setVisible(mask & MASK_CHANNELS_RANGE);
+  ui->channelsStart->setVisible(mask & MASK_CHANNELS_RANGE);
+  ui->channelsStart->setValue(module.channelsStart+1);
+  ui->label_channelsCount->setVisible(mask & MASK_CHANNELS_RANGE);
+  ui->channelsCount->setVisible(mask & MASK_CHANNELS_RANGE);
+  ui->channelsCount->setEnabled(mask & MASK_CHANNELS_COUNT);
+  ui->channelsCount->setValue(module.channelsCount);
+  ui->channelsCount->setSingleStep(GetEepromInterface()->getCapability(HasPPMStart) ? 1 : 2);
+
+  // PPM settings fields
+  ui->label_ppmPolarity->setVisible(mask & MASK_PPM_FIELDS);
+  ui->ppmPolarity->setVisible(mask & MASK_PPM_FIELDS);
+  ui->ppmPolarity->setCurrentIndex(module.ppmPulsePol);
+  ui->label_ppmDelay->setVisible(mask & MASK_PPM_FIELDS);
+  ui->ppmDelay->setVisible(mask & MASK_PPM_FIELDS);
+  ui->ppmDelay->setValue(module.ppmDelay);
+  ui->label_ppmFrameLength->setVisible(mask & MASK_PPM_FIELDS);
+  ui->ppmFrameLength->setVisible(mask & MASK_PPM_FIELDS);
+  ui->ppmFrameLength->setMinimum(module.channelsCount*(model.extendedLimits ? 2.250 :2)+3.5);
+  ui->ppmFrameLength->setMaximum(GetEepromInterface()->getCapability(PPMFrameLength));
+  ui->ppmFrameLength->setValue(22.5+((double)module.ppmFrameLength)*0.5);
+
+  if (GetEepromInterface()->getCapability(HasFailsafe)) {
+    ui->label_failsafeMode->setVisible(mask & MASK_FAILSAFES);
+    ui->failsafeMode->setVisible(mask & MASK_FAILSAFES);
+    ui->failsafeMode->setCurrentIndex(module.failsafeMode);
+    ui->label_failsafeFrame->setVisible(mask & MASK_FAILSAFES);
+    ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES);
+    ui->failsafesFrame->setEnabled(module.failsafeMode == 1);
+    for (int i=0; i<failsafeSliders.size(); i++) {
+      failsafeSliders[i]->setValue(module.failsafeChannels[i]);
+      failsafeSpins[i]->setValue(module.failsafeChannels[i]);
+    }
+  }
+}
+
+void ModulePanel::on_trainerMode_currentIndexChanged(int index)
+{
+  if (!lock) {
+    model.trainerMode = index;
+    update();
+    emit modified();
+  }
+}
+
+void ModulePanel::on_protocol_currentIndexChanged(int index)
+{
+  if (!lock) {
+    module.protocol = ui->protocol->itemData(index).toInt();
+    update();
+    emit modified();
+  }
+}
+
+void ModulePanel::on_ppmPolarity_currentIndexChanged(int index)
+{
+  module.ppmPulsePol = index;
+  emit modified();
+}
+
+void ModulePanel::on_channelsCount_editingFinished()
+{
+  if (!lock) {
+    module.channelsCount = ui->channelsCount->value();
+    update();
+    emit modified();
+  }
+}
+
+void ModulePanel::on_channelsStart_editingFinished()
+{
+  if (!lock) {
+    module.channelsStart = ui->channelsStart->value() - 1;
+    update();
+    emit modified();
+  }
+}
+
+void ModulePanel::on_ppmDelay_editingFinished()
+{
+  if (!lock) {
+    // TODO only accept valid values
+    module.ppmDelay = ui->ppmDelay->value();
+    emit modified();
+  }
+}
+
+void ModulePanel::on_rxNumber_editingFinished()
+{
+  model.modelId = ui->rxNumber->value();
+  emit modified();
+}
+
+void ModulePanel::on_ppmFrameLength_editingFinished()
+{
+  module.ppmFrameLength = (ui->ppmFrameLength->value()-22.5) / 0.5;
+  emit modified();
+}
+
+void ModulePanel::on_failsafeMode_currentIndexChanged(int value)
+{
+  if (!lock) {
+    module.failsafeMode = value;
+    update();
+    emit modified();
+  }
+}
+
+void ModulePanel::onFailsafeChannelChanged(int value)
+{
+  if (!lock) {
+    lock = true;
+    int index = sender()->property("index").toInt();
+    module.failsafeChannels[index] = value;
+    failsafeSpins[index]->setValue(value);
+    failsafeSliders[index]->setValue(value);
+    emit modified();
+    lock = false;
+  }
+}
+
+/******************************************************************************/
+
+Setup::Setup(QWidget *parent, ModelData & model):
+  ModelPanel(parent, model),
+  ui(new Ui::Setup)
+{
+  lock = true;
+
+  memset(modules, 0, sizeof(modules));
+
+  ui->setupUi(this);
+
+  ui->name->setMaxLength(IS_TARANIS(GetEepromInterface()->getBoard()) ? 12 : 10);
+
+  for (int i=0; i<C9X_MAX_TIMERS; i++) {
+    timers[i] = new TimerPanel(this, model, model.timers[i]);
+    ui->gridLayout->addWidget(timers[i], 1+i, 1);
+    connect(timers[i], SIGNAL(modified()), this, SLOT(onChildModified()));
+  }
+
+  for (int i=0; i<GetEepromInterface()->getCapability(NumModules); i++) {
+    modules[i] = new ModulePanel(this, model, model.moduleData[i], i);
+    ui->modulesLayout->addWidget(modules[i]);
+    connect(modules[i], SIGNAL(modified()), this, SLOT(onChildModified()));
+  }
+
+  if (GetEepromInterface()->getCapability(ModelTrainerEnable)) {
+    modules[C9X_NUM_MODULES] = new ModulePanel(this, model, model.moduleData[C9X_NUM_MODULES], -1);
+    ui->modulesLayout->addWidget(modules[C9X_NUM_MODULES]);
+  }
+
+  if (GetEepromInterface()->getCapability(ModelImage)) {
+    QStringList items;
+    items.append("");
+    QSettings settings("companion9x", "companion9x");
+    QString path = settings.value("sdPath", ".").toString();
+    path.append("/BMP/");
+    QDir qd(path);
+    int vml = GetEepromInterface()->getCapability(VoicesMaxLength)+4;
+    if (qd.exists()) {
+      QStringList filters;
+      filters << "*.bmp" << "*.bmp";
+      foreach ( QString file, qd.entryList(filters, QDir::Files) ) {
+        QFileInfo fi(file);
+        QString temp = fi.completeBaseName();
+        if (!items.contains(temp) && temp.length() <= vml) {
+          items.append(temp);
+        }
+      }
+    }
+    if (!items.contains(model.bitmap)) {
+      items.append(model.bitmap);
+    }
+    items.sort();
+    foreach ( QString file, items ) {
+      ui->image->addItem(file);
+      if (file == model.bitmap) {
+        ui->image->setCurrentIndex(ui->image->count()-1);
+        QString fileName = path;
+        fileName.append(model.bitmap);
+        fileName.append(".bmp");
+        QImage image(fileName);
+        if (image.isNull()) {
+          fileName = path;
+          fileName.append(model.bitmap);
+          fileName.append(".BMP");
+          image.load(fileName);
+        }
+        if (!image.isNull()) {
+          ui->imagePreview->setPixmap(QPixmap::fromImage(image.scaled( 64,32)));;
+        }
+      }
+    }
+  }
+  else {
+    ui->image->hide();
+    ui->modelImage_label->hide();
+    ui->imagePreview->hide();
+  }
+
+  // Beep Center checkboxes
+  int analogs = 4 + GetEepromInterface()->getCapability(Pots);
+  for (int i=0; i<analogs+GetEepromInterface()->getCapability(RotaryEncoders); i++) {
+    QCheckBox * checkbox = new QCheckBox(this);
+    checkbox->setProperty("index", i);
+    checkbox->setText(i<analogs ? AnalogString(i) : RotaryEncoderString(i-analogs));
+    ui->centerBeepLayout->addWidget(checkbox, 0, i+1);
+    connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(onBeepCenterToggled(bool)));
+    centerBeepCheckboxes << checkbox;
+  }
+  ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, analogs+GetEepromInterface()->getCapability(RotaryEncoders));
+
+  // Startup switches warnings
+  ui->switchesStartupWarning->setProperty("index", 0);
+  connect(ui->switchesStartupWarning, SIGNAL(currentIndexChanged(int)), this, SLOT(startupSwitchEdited(int)));
+  for (int i=0; i<GetEepromInterface()->getCapability(Switches)-1; i++) {
+    QLabel * label = new QLabel();
+    QSlider * slider = new QSlider();
+    slider->setProperty("index", i+1);
+    slider->setOrientation(Qt::Vertical);
+    slider->setMinimum(0);
+    slider->setSingleStep(1);
+    slider->setPageStep(1);
+    slider->setInvertedAppearance(true);
+    slider->setTickPosition(QSlider::TicksBothSides);
+    slider->setTickInterval(1);
+    slider->setMinimumSize(QSize(30, 50));
+    slider->setMaximumSize(QSize(50, 50));
+    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+      label->setText(switchesX9D[i]);
+      slider->setMaximum(i==5 ? 1 : 2);
+    }
+    else {
+      label->setText(switches9X[i]);
+      slider->setMaximum(i==0 ? 2 : 1);
+    }
+    ui->switchesStartupLayout->addWidget(label, 0, i+1);
+    ui->switchesStartupLayout->addWidget(slider, 1, i+1);
+    connect(slider, SIGNAL(valueChanged(int)), this, SLOT(startupSwitchEdited(int)));
+    startupSwitchesSliders << slider;
+  }
+  ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, GetEepromInterface()->getCapability(Switches));
+
+  lock = false;
+}
+
+Setup::~Setup()
+{
+  delete ui;
+}
+
+void Setup::on_extendedLimits_toggled(bool checked)
+{
+  model.extendedLimits = checked;
+  emit modified();
+}
+
+void Setup::on_throttleWarning_toggled(bool checked)
+{
+  model.disableThrottleWarning = checked;
+  emit modified();
+}
+
+void Setup::on_throttleReverse_toggled(bool checked)
+{
+  model.throttleReversed = checked;
+  emit modified();
+}
+
+void Setup::on_extendedTrims_toggled(bool checked)
+{
+  model.extendedTrims = checked;
+  emit modified();
+}
+
+void Setup::on_trimIncrement_currentIndexChanged(int index)
+{
+  model.trimInc = index;
+  emit modified();
+}
+
+void Setup::on_throttleSource_currentIndexChanged(int index)
+{
+  model.thrTraceSrc = index;
+  emit modified();
+}
+
+void Setup::on_name_editingFinished()
+{
+  int length = ui->name->maxLength();
+  strncpy(model.name, ui->name->text().toAscii(), length);
+  emit modified();
+}
+
+void Setup::on_image_currentIndexChanged(int index)
+{
+  if (!lock) {
+    strncpy(model.bitmap, ui->image->currentText().toAscii(), GetEepromInterface()->getCapability(VoicesMaxLength));
+    QSettings settings("companion9x", "companion9x");
+    QString path=settings.value("sdPath", ".").toString();
+    path.append("/BMP/");
+    QDir qd(path);
+    if (qd.exists()) {
+      QString fileName=path;
+      fileName.append(model.bitmap);
+      fileName.append(".bmp");
+      QImage image(fileName);
+      if (image.isNull()) {
+        fileName=path;
+        fileName.append(model.bitmap);
+        fileName.append(".BMP");
+        image.load(fileName);
+      }
+      if (!image.isNull()) {
+        ui->imagePreview->setPixmap(QPixmap::fromImage(image.scaled( 64,32)));;
+      }
+      else {
+        ui->imagePreview->clear();
+      }
+    }
+    else {
+      ui->imagePreview->clear();
+    }
+    emit modified();
+  }
+}
+
+void Setup::update()
+{
+  ui->name->setText(model.name);
+
+  ui->throttleReverse->setChecked(model.throttleReversed);
+  populateTTraceCB(ui->throttleSource, model.thrTraceSrc);
+  ui->throttleWarning->setChecked(model.disableThrottleWarning);
+
+  //trim inc, thro trim, thro expo, instatrim
+  ui->trimIncrement->setCurrentIndex(model.trimInc);
+  ui->throttleTrim->setChecked(model.thrTrim);
+  ui->extendedLimits->setChecked(model.extendedLimits);
+  ui->extendedTrims->setChecked(model.extendedTrims);
+
+  updateBeepCenter();
+  updateStartupSwitches();
+
+  for (int i=0; i<C9X_MAX_TIMERS; i++)
+    timers[i]->update();
+
+  for (int i=0; i<C9X_NUM_MODULES+1; i++)
+    if (modules[i])
+      modules[i]->update();
+}
+
+void Setup::updateBeepCenter()
+{
+  for (int i=0; i<centerBeepCheckboxes.size(); i++) {
+    centerBeepCheckboxes[i]->setChecked(model.beepANACenter & (0x01 << i));
+  }
+}
+
+void Setup::updateStartupSwitches()
+{
+  lock = true;
+
+  unsigned int switchStates = model.switchWarningStates;
+  bool enabled = !(switchStates & 0x01);
+  ui->switchesStartupWarning->setCurrentIndex(switchStates & 0x01);
+  switchStates >>= 1;
+
+  for (int i=0; i<GetEepromInterface()->getCapability(Switches)-1; i++) {
+    QSlider * slider = startupSwitchesSliders[i];
+    slider->setEnabled(enabled);
+    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+      slider->setValue(i==5 ? (switchStates & 0x3)/2 : switchStates & 0x3);
+      switchStates >>= 2;
+    }
+    else {
+      slider->setValue(i==0 ? switchStates & 0x3 : switchStates & 0x1);
+      switchStates >>= (i==0 ? 2 : 1);
+    }
+  }
+
+  lock = false;
+}
+
+void Setup::startupSwitchEdited(int value)
+{
+  if (!lock) {
+    int shift = 0;
+    unsigned int mask;
+    int index = sender()->property("index").toInt();
+
+    if (index == 0) {
+      mask = 0x01;
+    }
+    else if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+      if (index == 6)
+        mask = 0x02 << (index*2 - 1);
+      else {
+        shift = index*2 - 1;
+        mask = 0x03 << shift;
+      }
+    }
+    else {
+      if (index == 1) {
+        shift = 1;
+        mask = 0x03 << shift;
+      }
+      else {
+        mask = 0x01 << (index+1);
+      }
+    }
+
+    model.switchWarningStates &= ~mask;
+
+    if (value) {
+      if (shift == 0) {
+        model.switchWarningStates |= mask;
+      }
+      else {
+        model.switchWarningStates |= (value << shift);
+      }
+    }
+
+    updateStartupSwitches();
+    emit modified();
+  }
+}
+
+void Setup::on_throttleTrim_toggled(bool checked)
+{
+  model.thrTrim = checked;
+  emit modified();
+}
+
+void Setup::onBeepCenterToggled(bool checked)
+{
+  if (!lock) {
+    int index = sender()->property("index").toInt();
+    unsigned int mask = (0x01 << index);
+    if (checked)
+      model.beepANACenter |= mask;
+    else
+      model.beepANACenter &= ~mask;
+    emit modified();
+  }
+}
+
+void Setup::onChildModified()
+{
+  emit modified();
+}
diff --git a/companion/src/modeledit/setup.h b/companion/src/modeledit/setup.h
new file mode 100644
index 000000000..7b33ffe5a
--- /dev/null
+++ b/companion/src/modeledit/setup.h
@@ -0,0 +1,102 @@
+#ifndef SETUP_H
+#define SETUP_H
+
+#include "modelpanel.h"
+#include <QVector>
+#include <QCheckBox>
+#include <QSlider>
+#include <QSpinBox>
+
+namespace Ui {
+  class Setup;
+  class Timer;
+  class Module;
+}
+
+class TimerPanel : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    TimerPanel(QWidget *parent, ModelData & model, TimerData & timer);
+    virtual ~TimerPanel();
+
+    virtual void update();
+
+  private slots:
+    void on_mode_currentIndexChanged(int index);
+    void on_value_editingFinished();
+    void on_persistent_toggled(bool checked);
+    void on_minuteBeep_toggled(bool checked);
+    void on_countdownBeep_toggled(bool checked);
+
+  private:
+    TimerData & timer;
+    Ui::Timer *ui;
+};
+
+class ModulePanel : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    ModulePanel(QWidget *parent, ModelData & model, ModuleData & module, int moduleIdx);
+    virtual ~ModulePanel();
+
+    virtual void update();
+
+  private slots:
+    void on_trainerMode_currentIndexChanged(int index);
+    void on_protocol_currentIndexChanged(int index);
+    void on_ppmDelay_editingFinished();
+    void on_channelsCount_editingFinished();
+    void on_channelsStart_editingFinished();
+    void on_ppmPolarity_currentIndexChanged(int index);
+    void on_ppmFrameLength_editingFinished();
+    void on_rxNumber_editingFinished();
+    void on_failsafeMode_currentIndexChanged(int value);
+    void onFailsafeChannelChanged(int value);
+
+  private:
+    ModuleData & module;
+    int moduleIdx;
+    Ui::Module *ui;
+    QVector<QSpinBox *> failsafeSpins;
+    QVector<QSlider *> failsafeSliders;
+};
+
+class Setup : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    Setup(QWidget *parent, ModelData & model);
+    virtual ~Setup();
+
+    virtual void update();
+
+  private slots:
+    void on_name_editingFinished();
+    void on_throttleSource_currentIndexChanged(int index);
+    void on_throttleTrim_toggled(bool checked);
+    void on_extendedLimits_toggled(bool checked);
+    void on_extendedTrims_toggled(bool checked);
+    void on_throttleWarning_toggled(bool checked);
+    void on_throttleReverse_toggled(bool checked);
+    void on_image_currentIndexChanged(int index);
+    void on_trimIncrement_currentIndexChanged(int index);
+    void onBeepCenterToggled(bool checked);
+    void startupSwitchEdited(int value);
+    void onChildModified();
+
+  private:
+    Ui::Setup *ui;
+    QVector<QSlider *> startupSwitchesSliders;
+    QVector<QCheckBox *> centerBeepCheckboxes;
+    ModulePanel * modules[C9X_NUM_MODULES+1];
+    TimerPanel * timers[C9X_MAX_TIMERS];
+    void updateStartupSwitches();
+    void updateBeepCenter();
+};
+
+#endif // SETUP_H
diff --git a/companion/src/modeledit/setup.ui b/companion/src/modeledit/setup.ui
new file mode 100644
index 000000000..c4a632c00
--- /dev/null
+++ b/companion/src/modeledit/setup.ui
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Setup</class>
+ <widget class="QWidget" name="Setup">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>782</width>
+    <height>334</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Model Name</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_timer2">
+       <property name="text">
+        <string>Timer2</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Timer1</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_ttrace">
+       <property name="text">
+        <string>Throttle Source</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="swwarn_label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Switch startup  Warning</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_12">
+       <property name="text">
+        <string>Center beep</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <layout class="QGridLayout" name="centerBeepLayout"/>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_10">
+       <property name="text">
+        <string>Trim Increment</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <layout class="QGridLayout" name="switchesStartupLayout" rowstretch="0,0" columnstretch="0">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMinimumSize</enum>
+       </property>
+       <property name="verticalSpacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <item row="1" column="0">
+        <widget class="QComboBox" name="switchesStartupWarning">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <item>
+          <property name="text">
+           <string>ON</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>OFF</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="switchesStartupWarning_Label">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Check</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="1">
+      <layout class="QGridLayout" name="gridLayout_37" columnstretch="0,0,0,0,0,0">
+       <item row="0" column="3">
+        <widget class="QComboBox" name="image"/>
+       </item>
+       <item row="0" column="4">
+        <widget class="QLabel" name="imagePreview">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>64</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>64</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::Panel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="5">
+        <spacer name="horizontalSpacer_26">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="1">
+        <spacer name="horizontalSpacer_24">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="2">
+        <widget class="QLabel" name="modelImage_label">
+         <property name="text">
+          <string>Model Image</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLineEdit" name="name">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maxLength">
+          <number>10</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="4" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <item>
+        <widget class="QComboBox" name="trimIncrement">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <item>
+          <property name="text">
+           <string>Exponential</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Extra Fine</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Fine</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Medium</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Coarse</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="extendedLimits">
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+         <property name="text">
+          <string>Extended Limits</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="extendedTrims">
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+         <property name="text">
+          <string>Extended Trims</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="3" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QComboBox" name="throttleSource">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="throttleTrim">
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+         <property name="text">
+          <string>Throttle Trim</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="throttleWarning">
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+         <property name="text">
+          <string>Throttle Warning</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="throttleReverse">
+         <property name="whatsThis">
+          <string>Reverse throttle operation.
+If this is checked the throttle will be reversed.  Idle will be forward, trim will also be reversed and the throttle warning will be reversed as well.
+
+</string>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+         <property name="text">
+          <string>Reverse Throttle</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_9">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="modulesLayout"/>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/setup_module.ui b/companion/src/modeledit/setup_module.ui
new file mode 100644
index 000000000..500ea2fe8
--- /dev/null
+++ b/companion/src/modeledit/setup_module.ui
@@ -0,0 +1,497 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Module</class>
+ <widget class="QWidget" name="Module">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>694</width>
+    <height>340</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="moduleGB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="title">
+      <string/>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_69" rowstretch="0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0">
+      <item row="7" column="1" colspan="5">
+       <widget class="QFrame" name="failsafesFrame">
+        <property name="maximumSize">
+         <size>
+          <width>700</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <layout class="QGridLayout" name="failsafesLayout"/>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_failsafeMode">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Failsafe Mode</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" alignment="Qt::AlignRight">
+       <widget class="QLabel" name="label_channelsStart">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Start</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QComboBox" name="protocol">
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="4" alignment="Qt::AlignRight">
+       <widget class="QLabel" name="label_ppmDelay">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>PPM delay</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="5">
+       <widget class="QSpinBox" name="ppmDelay">
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="suffix">
+         <string> usec</string>
+        </property>
+        <property name="minimum">
+         <number>100</number>
+        </property>
+        <property name="maximum">
+         <number>800</number>
+        </property>
+        <property name="singleStep">
+         <number>50</number>
+        </property>
+        <property name="value">
+         <number>300</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3" alignment="Qt::AlignLeft">
+       <widget class="QComboBox" name="ppmPolarity">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <item>
+         <property name="text">
+          <string>Negative</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Positive</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_rxNumber">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>RX Number</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="trainerMode">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <item>
+         <property name="text">
+          <string>Master</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Slave</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="4" column="2" alignment="Qt::AlignRight">
+       <widget class="QLabel" name="label_ppmPolarity">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Polarity</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" alignment="Qt::AlignRight">
+       <widget class="QLabel" name="label_trainerMode">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Trainer Mode</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QSpinBox" name="rxNumber">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="suffix">
+         <string/>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>125</number>
+        </property>
+        <property name="singleStep">
+         <number>1</number>
+        </property>
+        <property name="value">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QDoubleSpinBox" name="ppmFrameLength">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="suffix">
+         <string> mSec</string>
+        </property>
+        <property name="decimals">
+         <number>1</number>
+        </property>
+        <property name="minimum">
+         <double>12.500000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>32.500000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.500000000000000</double>
+        </property>
+        <property name="value">
+         <double>22.500000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" alignment="Qt::AlignRight">
+       <widget class="QLabel" name="label_ppmFrameLength">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>PPM Frame Length</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="7">
+       <widget class="QLabel" name="label_module">
+        <property name="styleSheet">
+         <string notr="true">font-weight: bold;</string>
+        </property>
+        <property name="text">
+         <string>Label</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="5" alignment="Qt::AlignLeft">
+       <widget class="QSpinBox" name="channelsCount">
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="suffix">
+         <string>ch</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>16</number>
+        </property>
+        <property name="singleStep">
+         <number>2</number>
+        </property>
+        <property name="value">
+         <number>8</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3" alignment="Qt::AlignLeft">
+       <widget class="QSpinBox" name="channelsStart">
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="suffix">
+         <string>ch</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>32</number>
+        </property>
+        <property name="singleStep">
+         <number>1</number>
+        </property>
+        <property name="value">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="4" alignment="Qt::AlignRight">
+       <widget class="QLabel" name="label_channelsCount">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Channels</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" alignment="Qt::AlignLeft">
+       <widget class="QComboBox" name="failsafeMode">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>125</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <item>
+         <property name="text">
+          <string>Hold</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Custom</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>No Pulses</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="7" column="0" alignment="Qt::AlignRight">
+       <widget class="QLabel" name="label_failsafeFrame">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Failsafe Positions</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="3" column="0" alignment="Qt::AlignRight">
+       <widget class="QLabel" name="label_protocol">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Protocol</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/setup_timer.ui b/companion/src/modeledit/setup_timer.ui
new file mode 100644
index 000000000..96ed9370f
--- /dev/null
+++ b/companion/src/modeledit/setup_timer.ui
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Timer</class>
+ <widget class="QWidget" name="Timer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>726</width>
+    <height>54</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QTimeEdit" name="value">
+     <property name="accelerated">
+      <bool>true</bool>
+     </property>
+     <property name="currentSection">
+      <enum>QDateTimeEdit::MinuteSection</enum>
+     </property>
+     <property name="displayFormat">
+      <string>mm:ss</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="mode"/>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="persistent">
+     <property name="text">
+      <string>Persistent</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="persistentValue">
+     <property name="text">
+      <string> (00:00:00)</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="minuteBeep">
+     <property name="text">
+      <string>MinuteBeep</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="countdownBeep">
+     <property name="text">
+      <string>CountDownBeep</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="spacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>255</width>
+       <height>17</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
new file mode 100644
index 000000000..22db68ae4
--- /dev/null
+++ b/companion/src/modeledit/telemetry.cpp
@@ -0,0 +1,939 @@
+#include "telemetry.h"
+#include "ui_telemetry.h"
+#include "ui_telemetry_analog.h"
+#include "helpers.h"
+
+TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog):
+  QWidget(parent),
+  ui(new Ui::TelemetryAnalog),
+  analog(analog),
+  lock(false)
+{
+  ui->setupUi(this);
+
+  float ratio;
+
+  if (analog.type==0 || analog.type==1 || analog.type==2) {
+    ratio = (analog.ratio<<analog.multiplier)/10.0;
+    ui->RatioSB->setDecimals(1);
+    ui->RatioSB->setMaximum(25.5*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
+  }
+  else {
+    ratio = analog.ratio<<analog.multiplier;
+    ui->RatioSB->setDecimals(0);
+    ui->RatioSB->setMaximum(255*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
+  }
+  ui->RatioSB->setValue(ratio);
+
+  update();
+
+  ui->UnitCB->setCurrentIndex(analog.type);
+  ui->alarm1LevelCB->setCurrentIndex(analog.alarms[0].level);
+  ui->alarm1GreaterCB->setCurrentIndex(analog.alarms[0].greater);
+  ui->alarm2LevelCB->setCurrentIndex(analog.alarms[1].level);
+  ui->alarm2GreaterCB->setCurrentIndex(analog.alarms[1].greater);
+
+  if (!(GetEepromInterface()->getCapability(Telemetry) & TM_HASOFFSET)) {
+    ui->CalibSB->hide();
+    ui->CalibLabel->hide();
+  }
+  else {
+    ui->label_Max->setText(tr("Range"));
+  }
+}
+
+void TelemetryAnalog::update()
+{
+    float ratio, alarm1value, alarm2value;
+    if (analog.ratio==0) {
+      ui->alarm1ValueSB->setMinimum(0);
+      ui->alarm1ValueSB->setMaximum(0);
+      ui->alarm2ValueSB->setMinimum(0);
+      ui->alarm2ValueSB->setMaximum(0);
+      ui->CalibSB->setMinimum(0);
+      ui->CalibSB->setMaximum(0);
+      ui->CalibSB->setValue(0);
+      ui->alarm1ValueSB->setValue(0);
+      ui->alarm2ValueSB->setValue(0);
+      return;
+    }
+
+    if (analog.type==0 || analog.type==1 || analog.type==2) {
+      ratio=(analog.ratio<<analog.multiplier)/10.0;
+      ui->alarm1ValueSB->setDecimals(2);
+      ui->alarm1ValueSB->setSingleStep(ratio/255.0);
+      ui->alarm2ValueSB->setDecimals(2);
+      ui->alarm2ValueSB->setSingleStep(ratio/255.0);
+      ui->alarm1ValueSB->setMinimum((analog.ratio*1.0*analog.offset)/2550.0);
+      ui->alarm1ValueSB->setMaximum(ratio+(analog.ratio*1.0*analog.offset)/2550.0);
+      ui->alarm2ValueSB->setMinimum((analog.offset*1.0*analog.ratio)/2550.0);
+      ui->alarm2ValueSB->setMaximum(ratio+(analog.offset*1.0*analog.ratio)/2550.0);
+    }
+    else {
+      ratio=analog.ratio<<analog.multiplier;
+      ui->alarm1ValueSB->setDecimals(2);
+      ui->alarm1ValueSB->setSingleStep(ratio/255.0);
+      ui->alarm2ValueSB->setDecimals(2);
+      ui->alarm2ValueSB->setSingleStep(ratio/255.0);
+      ui->alarm1ValueSB->setMinimum((analog.offset*1.0*analog.ratio)/255.0);
+      ui->alarm1ValueSB->setMaximum(ratio+(analog.offset*1.0*analog.ratio)/255.0);
+      ui->alarm2ValueSB->setMinimum((analog.offset*1.0*analog.ratio)/255.0);
+      ui->alarm2ValueSB->setMaximum(ratio+(analog.offset*1.0*analog.ratio)/255.0);
+    }
+    ui->CalibSB->setDecimals(2);
+    ui->CalibSB->setMaximum((ratio*127)/255.0);
+    ui->CalibSB->setMinimum((-ratio*128)/255.0);
+    ui->CalibSB->setSingleStep(ratio/255.0);
+    ui->CalibSB->setValue((analog.offset*ratio)/255);
+    alarm1value=ratio*(analog.alarms[0].value/255.0+analog.offset/255.0);
+    alarm2value=ratio*(analog.alarms[1].value/255.0+analog.offset/255.0);;
+    ui->alarm1ValueSB->setValue(alarm1value);
+    ui->alarm2ValueSB->setValue(alarm2value);
+}
+
+void TelemetryAnalog::on_UnitCB_currentIndexChanged(int index)
+{
+    float ratio;
+    analog.type=index;
+    switch (index) {
+      case 0:
+      case 1:
+      case 2:
+        ui->RatioSB->setDecimals(1);
+        ui->RatioSB->setMaximum(25.5*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
+        ratio=(analog.ratio<<analog.multiplier)/10.0;
+        break;
+      default:
+        ui->RatioSB->setDecimals(0);
+        ui->RatioSB->setMaximum(255*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
+        ratio=(analog.ratio<<analog.multiplier);
+        break;
+    }
+    ui->RatioSB->setValue(ratio);
+    update();
+    emit modified();
+}
+
+void TelemetryAnalog::on_RatioSB_valueChanged()
+{
+  if (!lock) {
+    if (analog.type==0 || analog.type==1 || analog.type==2) {
+      analog.multiplier = findmult(ui->RatioSB->value(), 25.5);
+      float singlestep =(1<<analog.multiplier)/10.0;
+      lock=true;
+      ui->RatioSB->setSingleStep(singlestep);
+      ui->RatioSB->setValue(round(ui->RatioSB->value()/singlestep)*singlestep);
+      lock=false;
+    }
+    else {
+      analog.multiplier = findmult(ui->RatioSB->value(), 255);
+      float singlestep =(1<<analog.multiplier);
+      lock = true;
+      ui->RatioSB->setSingleStep(singlestep);
+      ui->RatioSB->setValue(round(ui->RatioSB->value()/singlestep)*singlestep);
+      lock = false;
+    }
+    emit modified();
+  }
+}
+
+void TelemetryAnalog::on_RatioSB_editingFinished()
+{
+    float ratio, calib, alarm1value,alarm2value;
+    if (lock) return;
+    if (analog.type==0 || analog.type==1 || analog.type==2) {
+      analog.multiplier = findmult(ui->RatioSB->value(), 25.5);
+      ui->CalibSB->setSingleStep((1<<analog.multiplier)/10.0);
+      ui->alarm1ValueSB->setSingleStep((1<<analog.multiplier)/10.0);
+      ui->alarm2ValueSB->setSingleStep((1<<analog.multiplier)/10.0);
+      analog.ratio = ((int)(round(ui->RatioSB->value()*10))/(1 <<analog.multiplier));
+    }  else {
+      analog.multiplier = findmult(ui->RatioSB->value(), 255);
+      ui->CalibSB->setSingleStep(1<<analog.multiplier);
+      ui->alarm1ValueSB->setSingleStep(1<<analog.multiplier);
+      ui->alarm2ValueSB->setSingleStep(1<<analog.multiplier);
+      analog.ratio = (ui->RatioSB->value()/(1 << analog.multiplier));
+    }
+    ui->CalibSB->setMaximum((ui->RatioSB->value()*127)/255);
+    ui->CalibSB->setMinimum((ui->RatioSB->value()*-128)/255);
+    ui->alarm1ValueSB->setMaximum(ui->RatioSB->value());
+    ui->alarm2ValueSB->setMaximum(ui->RatioSB->value());
+    repaint();
+    ratio=analog.ratio * (1 << analog.multiplier);
+    calib=ui->CalibSB->value();
+    alarm1value=ui->alarm1ValueSB->value();
+    alarm2value=ui->alarm2ValueSB->value();
+    if (analog.type==0) {
+      calib*=10;
+      alarm1value*=10;
+      alarm2value*=10;
+    }
+    if (calib>0) {
+      if (calib>((ratio*127)/255)) {
+        analog.offset=127;
+      } else {
+        analog.offset=round(calib*255/ratio);
+      }
+    }
+    if (calib<0) {
+      if (calib<((ratio*-128)/255)) {
+        analog.offset=-128;
+      } else {
+        analog.offset=round(calib*255/ratio);
+      }
+    }
+    analog.alarms[0].value=round((alarm1value*255-analog.offset*(analog.ratio<<analog.multiplier))/(analog.ratio<<analog.multiplier));
+    analog.alarms[1].value=round((alarm2value*255-analog.offset*(analog.ratio<<analog.multiplier))/(analog.ratio<<analog.multiplier));
+    update();
+    // TODO ? telBarUpdate();
+    emit modified();
+}
+
+void TelemetryAnalog::on_CalibSB_editingFinished()
+{
+    float ratio,calib,alarm1value,alarm2value;
+    if (analog.type==0 || analog.type==1 || analog.type==2) {
+      ratio=(analog.ratio<<analog.multiplier)/10.0;
+    } else {
+      ratio=analog.ratio<<analog.multiplier;
+    }
+    if (ratio!=0) {
+      analog.offset = round((255*ui->CalibSB->value()/ratio));
+      calib=ratio*analog.offset/255.0;
+      alarm1value=ui->alarm1ValueSB->value();
+      alarm2value=ui->alarm2ValueSB->value();
+      if (alarm1value<calib) {
+        alarm1value=calib;
+      } else if (alarm1value>(ratio+calib)) {
+        alarm1value=ratio+calib;
+      }
+      if (alarm2value<calib) {
+        alarm2value=calib;
+      } else if (alarm2value>(ratio+calib)) {
+        alarm2value=ratio+calib;
+      }
+      analog.alarms[0].value=round(((alarm1value-calib)*255)/ratio);
+      analog.alarms[1].value=round(((alarm2value-calib)*255)/ratio);
+    } else {
+      analog.offset=0;
+      analog.alarms[0].value=0;
+      analog.alarms[1].value=0;
+    }
+    update();
+    // TODO ? telBarUpdate();
+    emit modified();
+}
+
+void TelemetryAnalog::on_alarm1LevelCB_currentIndexChanged(int index)
+{
+    analog.alarms[0].level = index;
+    emit modified();
+}
+
+
+void TelemetryAnalog::on_alarm1GreaterCB_currentIndexChanged(int index)
+{
+    analog.alarms[0].greater = index;
+    emit modified();
+}
+
+void TelemetryAnalog::on_alarm1ValueSB_editingFinished()
+{
+    float ratio, calib, alarm1value;
+    ratio=analog.ratio<<analog.multiplier;
+    calib=analog.offset;
+    alarm1value=ui->alarm1ValueSB->value();
+    if (analog.type==0) {
+      ratio/=10;
+    }
+    if (alarm1value<((calib*ratio)/255)) {
+      analog.alarms[0].value=0;
+    } else if (alarm1value>(ratio+(calib*ratio)/255)) {
+      analog.alarms[0].value=255;
+    } else {
+      analog.alarms[0].value = round((alarm1value-((calib*ratio)/255))/ratio*255);
+    }
+    update();
+    emit modified();
+}
+
+void TelemetryAnalog::on_alarm2LevelCB_currentIndexChanged(int index)
+{
+    analog.alarms[1].level = index;
+    emit modified();
+}
+
+void TelemetryAnalog::on_alarm2GreaterCB_currentIndexChanged(int index)
+{
+    analog.alarms[1].greater = index;
+    emit modified();
+}
+
+void TelemetryAnalog::on_alarm2ValueSB_editingFinished()
+{
+    float ratio, calib, alarm2value;
+    ratio = analog.ratio<<analog.multiplier;
+    calib = analog.offset;
+    alarm2value = ui->alarm2ValueSB->value();
+    if (analog.type==0) {
+      ratio/=10;
+    }
+    if (alarm2value<((calib*ratio)/255)) {
+      analog.alarms[1].value=0;
+    } else if (alarm2value>(ratio+(calib*ratio)/255)) {
+      analog.alarms[1].value=255;
+    } else {
+      analog.alarms[1].value = round((alarm2value-((calib*ratio)/255))/ratio*255);
+    }
+    update();
+    emit modified();
+}
+
+TelemetryAnalog::~TelemetryAnalog()
+{
+  delete ui;
+}
+
+/******************************************************/
+
+TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model):
+  ModelPanel(parent, model),
+  ui(new Ui::Telemetry)
+{
+  ui->setupUi(this);
+
+  analogs[0] = new TelemetryAnalog(this, model.frsky.channels[0]);
+  ui->A1Layout->addWidget(analogs[0]);
+  connect(analogs[0], SIGNAL(modified()), this, SLOT(onAnalogModified()));
+  analogs[1] = new TelemetryAnalog(this, model.frsky.channels[1]);
+  ui->A2Layout->addWidget(analogs[1]);
+  connect(analogs[1], SIGNAL(modified()), this, SLOT(onAnalogModified()));
+
+  QGroupBox* barsgb[3] = { ui->CS1Bars, ui->CS2Bars, ui->CS3Bars };
+  QGroupBox* numsgb[3] = { ui->CS1Nums, ui->CS2Nums, ui->CS3Nums };
+
+  QComboBox* barscb[12] = { ui->telBarCS1B1_CB, ui->telBarCS1B2_CB,  ui->telBarCS1B3_CB,  ui->telBarCS1B4_CB,
+                            ui->telBarCS2B1_CB, ui->telBarCS2B2_CB,  ui->telBarCS2B3_CB,  ui->telBarCS2B4_CB,
+                            ui->telBarCS3B1_CB, ui->telBarCS3B2_CB,  ui->telBarCS3B3_CB,  ui->telBarCS3B4_CB};
+  QDoubleSpinBox* minSB[12] = { ui->telMinCS1SB1,  ui->telMinCS1SB2,  ui->telMinCS1SB3,  ui->telMinCS1SB4,
+                                ui->telMinCS2SB1,  ui->telMinCS2SB2,  ui->telMinCS2SB3,  ui->telMinCS2SB4,
+                                ui->telMinCS3SB1,  ui->telMinCS3SB2,  ui->telMinCS3SB3,  ui->telMinCS3SB4};
+  QDoubleSpinBox* maxSB[12] = { ui->telMaxCS1SB1,  ui->telMaxCS1SB2,  ui->telMaxCS1SB3,  ui->telMaxCS1SB4,
+                                ui->telMaxCS2SB1,  ui->telMaxCS2SB2,  ui->telMaxCS2SB3,  ui->telMaxCS2SB4,
+                                ui->telMaxCS3SB1,  ui->telMaxCS3SB2,  ui->telMaxCS3SB3,  ui->telMaxCS3SB4};
+  QComboBox* tmp[36] = { ui->telemetryCS1F1_CB, ui->telemetryCS1F2_CB, ui->telemetryCS1F3_CB, ui->telemetryCS1F4_CB, ui->telemetryCS1F5_CB, ui->telemetryCS1F6_CB, ui->telemetryCS1F7_CB, ui->telemetryCS1F8_CB, ui->telemetryCS1F9_CB, ui->telemetryCS1F10_CB, ui->telemetryCS1F11_CB, ui->telemetryCS1F12_CB,
+                         ui->telemetryCS2F1_CB, ui->telemetryCS2F2_CB, ui->telemetryCS2F3_CB, ui->telemetryCS2F4_CB, ui->telemetryCS2F5_CB, ui->telemetryCS2F6_CB, ui->telemetryCS2F7_CB, ui->telemetryCS2F8_CB, ui->telemetryCS2F9_CB, ui->telemetryCS2F10_CB, ui->telemetryCS2F11_CB, ui->telemetryCS2F12_CB,
+                         ui->telemetryCS3F1_CB, ui->telemetryCS3F2_CB, ui->telemetryCS3F3_CB, ui->telemetryCS3F4_CB, ui->telemetryCS3F5_CB, ui->telemetryCS3F6_CB, ui->telemetryCS3F7_CB, ui->telemetryCS3F8_CB, ui->telemetryCS3F9_CB, ui->telemetryCS3F10_CB, ui->telemetryCS3F11_CB, ui->telemetryCS3F12_CB};
+
+  memcpy(barsGB, barsgb, sizeof(barsGB));
+  memcpy(numsGB, numsgb, sizeof(numsGB));
+  memcpy(barsCB, barscb, sizeof(barsCB));
+  memcpy(this->maxSB, maxSB, sizeof(this->maxSB));
+  memcpy(this->minSB, minSB, sizeof(this->minSB));
+  memcpy(csf, tmp, sizeof(csf));
+
+  setup();
+}
+
+TelemetryPanel::~TelemetryPanel()
+{
+  delete ui;
+}
+
+void TelemetryPanel::setup()
+{
+    QSettings settings("companion9x", "companion9x");
+    QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString();
+
+    lock=true;
+    ui->telemetryCSType1->setCurrentIndex(model.frsky.screens[0].type);
+    ui->telemetryCSType2->setCurrentIndex(model.frsky.screens[1].type);
+    ui->telemetryCSType3->setCurrentIndex(model.frsky.screens[2].type);
+
+    for (int i=0; i<3; i++) {
+      bool isNum = (model.frsky.screens[i].type==0);
+      barsGB[i]->setVisible(!isNum);
+      numsGB[i]->setVisible(isNum);
+    }
+
+    connect(ui->telemetryCSType1,SIGNAL(currentIndexChanged(int)),this,SLOT(ScreenTypeCBcurrentIndexChanged(int)));
+    connect(ui->telemetryCSType2,SIGNAL(currentIndexChanged(int)),this,SLOT(ScreenTypeCBcurrentIndexChanged(int)));
+    connect(ui->telemetryCSType3,SIGNAL(currentIndexChanged(int)),this,SLOT(ScreenTypeCBcurrentIndexChanged(int)));
+
+    //frsky Settings
+    if (!GetEepromInterface()->getCapability(TelemetryRSSIModel) ) {
+      ui->RSSIGB->hide();
+    }
+    ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
+    ui->rssiAlarm2SB->setValue(model.frsky.rssiAlarms[1].value);
+    ui->rssiAlarm1CB->setCurrentIndex(model.frsky.rssiAlarms[0].level);
+    ui->rssiAlarm2CB->setCurrentIndex(model.frsky.rssiAlarms[1].level);
+
+    if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
+      ui->AltitudeGPS_ChkB->hide();
+    } else {
+      ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt);
+    }
+    int varioCap=GetEepromInterface()->getCapability(HasVario);
+  //  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+    if (false) {
+      ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed);
+    } else {
+      ui->AltitudeToolbar_ChkB->hide();
+    }
+    if (!varioCap) {
+      ui->varioLimitMax_DSB->hide();
+      ui->varioLimitMinOff_ChkB->hide();
+      ui->varioLimitMin_DSB->hide();
+      ui->varioLimitCenterMin_DSB->hide();
+      ui->varioLimitCenterMax_DSB->hide();
+      ui->varioLimit_label->hide();
+      ui->VarioLabel_1->hide();
+      ui->VarioLabel_2->hide();
+      ui->VarioLabel_3->hide();
+      ui->VarioLabel_4->hide();
+      ui->varioSourceCB->hide();
+      ui->varioSource_label->hide();
+    } else {
+      if (!GetEepromInterface()->getCapability(HasVarioSink)) {
+        ui->varioLimitMinOff_ChkB->hide();
+        ui->varioLimitMin_DSB->hide();
+        ui->varioLimitCenterMin_DSB->hide();
+        ui->VarioLabel_1->hide();
+        ui->VarioLabel_2->hide();
+      }
+      ui->varioLimitMin_DSB->setValue(model.frsky.varioMin-10);
+      ui->varioLimitMax_DSB->setValue(model.frsky.varioMax+10);
+      ui->varioLimitCenterMax_DSB->setValue((model.frsky.varioCenterMax/10.0)+0.5);
+      ui->varioSourceCB->setCurrentIndex(model.frsky.varioSource);
+      if (model.frsky.varioCenterMin==-16) {
+        ui->varioLimitMinOff_ChkB->setChecked(true);
+        ui->varioLimitCenterMin_DSB->setValue(-2.0);
+        ui->varioLimitCenterMin_DSB->setDisabled(true);
+      } else {
+        ui->varioLimitMinOff_ChkB->setChecked(false);
+        ui->varioLimitCenterMin_DSB->setValue((model.frsky.varioCenterMin/10.0)-0.5);
+      }
+      int mask=1;
+      for (int i=0; i< ui->varioSourceCB->count(); i++) {
+        if (!(varioCap&mask)) {
+          QModelIndex index = ui->varioSourceCB->model()->index(i, 0);
+          QVariant v(0);
+          ui->varioSourceCB->model()->setData(index, v, Qt::UserRole - 1);
+        }
+        mask <<=1;
+      }
+    }
+
+    if (!(GetEepromInterface()->getCapability(HasAltitudeSel)||GetEepromInterface()->getCapability(HasVario))) {
+      ui->altimetryGB->hide();
+    }
+    if (GetEepromInterface()->getCapability(NoTelemetryProtocol)) {
+      model.frsky.usrProto=1;
+      ui->frskyProtoCB->setDisabled(true);
+    } else {
+      ui->frskyProtoCB->setEnabled(true);
+    }
+
+    if (GetEepromInterface()->getCapability(TelemetryCSFields)==0) {
+      ui->groupBox_5->hide();
+    } else {
+      if (GetEepromInterface()->getCapability(TelemetryCSFields)==8) {
+        ui->tabCsView->removeTab(1);
+        ui->tabCsView->removeTab(2);
+      }
+      if (GetEepromInterface()->getCapability(TelemetryCSFields)==16) {
+        ui->tabCsView->removeTab(2);
+      }
+      int cols=GetEepromInterface()->getCapability(TelemetryColsCSFields);
+      if (cols==0) cols=2;
+      for (int screen=0; screen<(GetEepromInterface()->getCapability(TelemetryCSFields)/(4*cols)); screen++) {
+        for (int c=0; c<cols; c++) {
+          for (int r=0; r<4; r++) {
+            int index=screen*12+c*4+r;
+            if (model.frsky.screens[screen].type==0) {
+              populateCustomScreenFieldCB(csf[index], model.frsky.screens[screen].body.lines[r].source[c], (r<4), model.frsky.usrProto);
+            } else {
+              populateCustomScreenFieldCB(csf[index], 0, (r<4), model.frsky.usrProto);
+            }
+            connect(csf[index], SIGNAL(currentIndexChanged(int)), this, SLOT(customFieldEdited()));
+          }
+        }
+        for (int c=cols; c<3; c++) {
+          for (int r=0; r<4; r++) {
+            int index=screen*12+c*4+r;
+            csf[index]->hide();
+          }
+        }
+      }
+    }
+
+    if (!GetEepromInterface()->getCapability(TelemetryUnits)) {
+      ui->frskyUnitsCB->setDisabled(true);
+      int index=0;
+      if (firmware_id.contains("imperial")) {
+        index=1;
+      }
+      ui->frskyUnitsCB->setCurrentIndex(index);
+    }
+    if ((GetEepromInterface()->getCapability(Telemetry)&TM_HASWSHH)) {
+      ui->frskyProtoCB->addItem(tr("Winged Shadow How High"));
+    } else {
+      ui->frskyProtoCB->addItem(tr("Winged Shadow How High (not supported)"));
+    }
+
+    ui->frskyProtoCB->setCurrentIndex(model.frsky.usrProto);
+    ui->frskyUnitsCB->setCurrentIndex(model.frsky.imperial);
+    ui->frskyBladesCB->setCurrentIndex(model.frsky.blades);
+    ui->frskyCurrentCB->setCurrentIndex(model.frsky.currentSource);
+    ui->frskyVoltCB->setCurrentIndex(model.frsky.voltsSource);
+
+    for (int screen=0; screen<2;screen++) {
+      for (int rows=0; rows<4; rows++) {
+        for (int cols=0; cols<3; cols++) {
+          int index=screen*12+cols*4+rows;
+          populateCustomScreenFieldCB(csf[index], model.frsky.screens[screen].body.lines[rows].source[cols], (rows<4), model.frsky.usrProto);
+        }
+      }
+    }
+
+    for (int j=0; j<12; j++) {
+      int screen = j/4;
+      int field = j%4;
+      populateCustomScreenFieldCB(barsCB[j], model.frsky.screens[screen].body.bars[field].source, false, model.frsky.usrProto);
+      switch (model.frsky.screens[screen].body.bars[field].source-1) {
+        case TELEMETRY_SOURCE_TX_BATT:
+        case TELEMETRY_SOURCE_A1:
+        case TELEMETRY_SOURCE_A1_MIN:
+        case TELEMETRY_SOURCE_A2:
+        case TELEMETRY_SOURCE_A2_MIN:
+        case TELEMETRY_SOURCE_CELLS_SUM:
+        case TELEMETRY_SOURCE_VFAS:
+        case TELEMETRY_SOURCE_CURRENT_MAX:
+        case TELEMETRY_SOURCE_CURRENT:
+          minSB[j]->setDecimals(1);
+          maxSB[j]->setDecimals(1);
+          break;
+        case TELEMETRY_SOURCE_CELL:
+          minSB[j]->setDecimals(2);
+          maxSB[j]->setDecimals(2);
+          break;
+        default:
+          minSB[j]->setDecimals(0);
+          maxSB[j]->setDecimals(0);
+      }
+      minSB[j]->setMinimum(getBarValue(model.frsky.screens[screen].body.bars[field].source, 0, &model.frsky));
+      minSB[j]->setMaximum(getBarValue(model.frsky.screens[screen].body.bars[field].source, 255, &model.frsky));
+      minSB[j]->setSingleStep(getBarStep(model.frsky.screens[screen].body.bars[field].source));
+      minSB[j]->setValue(getBarValue(model.frsky.screens[screen].body.bars[field].source, model.frsky.screens[screen].body.bars[field].barMin, &model.frsky));
+      maxSB[j]->setMinimum(getBarValue(model.frsky.screens[screen].body.bars[field].source, 0, &model.frsky));
+      maxSB[j]->setMaximum(getBarValue(model.frsky.screens[screen].body.bars[field].source, 255, &model.frsky));
+      maxSB[j]->setSingleStep(getBarStep(model.frsky.screens[screen].body.bars[field].source));
+      maxSB[j]->setValue(getBarValue(model.frsky.screens[screen].body.bars[field].source, (255-model.frsky.screens[screen].body.bars[field].barMax), &model.frsky));
+
+      if (model.frsky.screens[screen].body.bars[field].source==0 || model.frsky.screens[screen].type==0) {
+        minSB[j]->setDisabled(true);
+        maxSB[j]->setDisabled(true);
+      }
+      connect(barsCB[j],SIGNAL(currentIndexChanged(int)),this,SLOT(telBarCBcurrentIndexChanged(int)));
+      connect(maxSB[j],SIGNAL(editingFinished()),this,SLOT(telMaxSBeditingFinished()));
+      connect(minSB[j],SIGNAL(editingFinished()),this,SLOT(telMinSBeditingFinished()));
+    }
+    lock=false;
+}
+
+void TelemetryPanel::onAnalogModified()
+{
+  emit modified();
+}
+
+void TelemetryPanel::on_frskyUnitsCB_currentIndexChanged(int index)
+{
+    model.frsky.imperial=index;
+    emit modified();
+}
+
+void TelemetryPanel::on_frskyBladesCB_currentIndexChanged(int index)
+{
+    model.frsky.blades=index;
+    emit modified();
+}
+
+void TelemetryPanel::on_frskyCurrentCB_currentIndexChanged(int index)
+{
+    model.frsky.currentSource=index;
+    emit modified();
+}
+
+void TelemetryPanel::on_frskyVoltCB_currentIndexChanged(int index)
+{
+    model.frsky.voltsSource=index;
+    emit modified();
+}
+
+void TelemetryPanel::on_frskyProtoCB_currentIndexChanged(int index)
+{
+    if (lock) return;
+    int bindex[12];
+    lock=true;
+    for (int i=0; i<12; i++) {
+      bindex[i]=barsCB[i]->currentIndex();
+      model.frsky.usrProto=index;
+      populateCustomScreenFieldCB(barsCB[i], bindex[i], false, model.frsky.usrProto);
+    }
+    if (!GetEepromInterface()->getCapability(TelemetryCSFields)) {
+      ui->groupBox_5->hide();
+    } else {
+      for (int screen=0; screen<2;screen++) {
+        for (int rows=0; rows<4; rows++) {
+          for (int cols=0; cols<3; cols++) {
+            int index=screen*12+cols*4+rows;
+            populateCustomScreenFieldCB(csf[index], model.frsky.screens[screen].body.lines[rows].source[cols], (rows<4), model.frsky.usrProto);
+          }
+        }
+      }
+    }
+    lock=false;
+    if (index==0) {
+      for (int i=0; i<12; i++) {
+        if (bindex[i]>2) {
+          barsCB[i]->setCurrentIndex(0);
+        } else {
+          barsCB[i]->setCurrentIndex(bindex[i]);
+        }
+      }
+    } else if (index==2) {
+      for (int i=0; i<12; i++) {
+        if (bindex[i]>3) {
+          barsCB[i]->setCurrentIndex(0);
+        } else {
+          barsCB[i]->setCurrentIndex(bindex[i]);
+        }
+      }
+    } else {
+      for (int i=0; i<12; i++) {
+        barsCB[i]->setCurrentIndex(bindex[i]);
+      }
+    }
+    emit modified();
+}
+
+void TelemetryPanel::on_rssiAlarm1CB_currentIndexChanged(int index) {
+    if (lock) return;
+    model.frsky.rssiAlarms[0].level=index;
+    emit modified();
+}
+
+void TelemetryPanel::on_rssiAlarm2CB_currentIndexChanged(int index) {
+    if (lock) return;
+    model.frsky.rssiAlarms[1].level=index;
+    emit modified();
+}
+
+void TelemetryPanel::on_rssiAlarm1SB_editingFinished()
+{
+    if (lock) return;
+    model.frsky.rssiAlarms[0].value=(ui->rssiAlarm1SB->value());
+    emit modified();
+}
+
+void TelemetryPanel::on_rssiAlarm2SB_editingFinished()
+{
+    if (lock) return;
+    model.frsky.rssiAlarms[1].value=(ui->rssiAlarm2SB->value());
+    emit modified();
+}
+
+void TelemetryPanel::on_AltitudeGPS_ChkB_toggled(bool checked)
+{
+    if (lock) return;
+    model.frsky.FrSkyGpsAlt = checked;
+    emit modified();
+    //AltitudeGPS_CB
+}
+
+void TelemetryPanel::on_AltitudeToolbar_ChkB_toggled(bool checked)
+{
+    model.frsky.altitudeDisplayed = checked;
+    emit modified();
+}
+
+void TelemetryPanel::on_varioSourceCB_currentIndexChanged(int index)
+{
+    if (lock) return;
+    model.frsky.varioSource = index;
+    emit modified();
+}
+
+void TelemetryPanel::on_varioLimitMin_DSB_editingFinished()
+{
+    if (lock) return;
+    model.frsky.varioMin= round(ui->varioLimitMin_DSB->value()+10);
+    emit modified();
+}
+
+void TelemetryPanel::on_varioLimitMax_DSB_editingFinished()
+{
+    if (lock) return;
+    model.frsky.varioMax= round(ui->varioLimitMax_DSB->value()-10);
+    emit modified();
+}
+
+void TelemetryPanel::on_varioLimitCenterMin_DSB_editingFinished()
+{
+    if (lock) return;
+    if (ui->varioLimitCenterMin_DSB->value()>ui->varioLimitCenterMax_DSB->value()) {
+      ui->varioLimitCenterMax_DSB->setValue(ui->varioLimitCenterMin_DSB->value());
+    }
+    model.frsky.varioCenterMin= round((ui->varioLimitCenterMin_DSB->value()+0.5)*10);
+    emit modified();
+}
+
+void TelemetryPanel::on_varioLimitMinOff_ChkB_toggled(bool checked)
+{
+    if (lock) return;
+    model.frsky.varioCenterMin = -16;
+    if (!checked) {
+      lock=true;
+      ui->varioLimitCenterMin_DSB->setValue(-2.0);
+      ui->varioLimitCenterMin_DSB->setEnabled(true);
+      lock=false;
+    } else {
+      ui->varioLimitCenterMin_DSB->setValue(-2.0);
+      ui->varioLimitCenterMin_DSB->setDisabled(true);
+    }
+    emit modified();
+}
+
+void TelemetryPanel::on_varioLimitCenterMax_DSB_editingFinished()
+{
+    if (lock) return;
+    if (ui->varioLimitCenterMin_DSB->value()>ui->varioLimitCenterMax_DSB->value()) {
+      ui->varioLimitCenterMax_DSB->setValue(ui->varioLimitCenterMin_DSB->value());
+    }
+    model.frsky.varioCenterMax= round((ui->varioLimitCenterMax_DSB->value()-0.5)*10);
+    emit modified();
+}
+
+void TelemetryPanel::telBarUpdate()
+{
+    int index;
+    lock=true;
+    for (int i=0; i<12; i++) {
+      int screen=i/4;
+      index=barsCB[i]->currentIndex();
+      if (index==TELEMETRY_SOURCE_A1 || index==TELEMETRY_SOURCE_A1 || index==TELEMETRY_SOURCE_A1_MIN || index==TELEMETRY_SOURCE_A2_MIN) {
+        minSB[i]->setMinimum(getBarValue(index, 0, &model.frsky));
+        minSB[i]->setMaximum(getBarValue(index, 255, &model.frsky));
+        minSB[i]->setSingleStep(getBarStep(index));
+        maxSB[i]->setMinimum(getBarValue(index, 0, &model.frsky));
+        maxSB[i]->setMaximum(getBarValue(index, 255, &model.frsky));
+        maxSB[i]->setSingleStep(getBarStep(index));
+        minSB[i]->setValue(getBarValue(index, model.frsky.screens[screen].body.bars[i%4].barMin, &model.frsky));
+        maxSB[i]->setValue(getBarValue(index, 255-model.frsky.screens[screen].body.bars[i%4].barMax, &model.frsky));
+      }
+    }
+    lock=false;
+}
+
+void TelemetryPanel::ScreenTypeCBcurrentIndexChanged(int index)
+{
+    if (lock) return;
+
+    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
+    int screen = comboBox->objectName().right(1).toInt() -1;
+    lock=true;
+    model.frsky.screens[screen].type=index;
+
+    for (int i=0; i<3; i++) {
+      bool isNum = (model.frsky.screens[i].type==0);
+      barsGB[i]->setVisible(!isNum);
+      numsGB[i]->setVisible(isNum);
+    }
+
+    lock=false;
+    emit modified();
+}
+
+void TelemetryPanel::telBarCBcurrentIndexChanged(int index)
+{
+    if (lock) return;
+    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
+    int screenId = comboBox->objectName().mid(8,1).toInt() - 1;
+    int barId = comboBox->objectName().mid(10,1).toInt() - 1;
+    int bar=barId+screenId*4;
+    model.frsky.screens[screenId].body.bars[barId].source=index;
+    lock=true;
+    if (index==0) {
+      model.frsky.screens[screenId].body.bars[barId].barMin=0;
+      model.frsky.screens[screenId].body.bars[barId].barMax=0;
+      minSB[bar]->setDisabled(true);
+      maxSB[bar]->setDisabled(true);
+    } else {
+      minSB[bar]->setEnabled(true);
+      maxSB[bar]->setEnabled(true);
+    }
+    switch (index-1) {
+      case TELEMETRY_SOURCE_TX_BATT:
+      case TELEMETRY_SOURCE_A1:
+      case TELEMETRY_SOURCE_A1_MIN:
+      case TELEMETRY_SOURCE_A2:
+      case TELEMETRY_SOURCE_A2_MIN:
+      case TELEMETRY_SOURCE_CELLS_SUM:
+      case TELEMETRY_SOURCE_VFAS:
+      case TELEMETRY_SOURCE_CURRENT_MAX:
+      case TELEMETRY_SOURCE_CURRENT:
+        minSB[bar]->setDecimals(1);
+        maxSB[bar]->setDecimals(1);
+        break;
+      case TELEMETRY_SOURCE_CELL:
+        minSB[bar]->setDecimals(2);
+        maxSB[bar]->setDecimals(2);
+        break;
+      default:
+        minSB[bar]->setDecimals(0);
+        maxSB[bar]->setDecimals(0);
+    }
+    minSB[bar]->setMinimum(getBarValue(index, 0, &model.frsky));
+    minSB[bar]->setMaximum(getBarValue(index, 255, &model.frsky));
+    minSB[bar]->setSingleStep(getBarStep(index));
+    maxSB[bar]->setMinimum(getBarValue(index, 0, &model.frsky));
+    maxSB[bar]->setMaximum(getBarValue(index, 255, &model.frsky));
+    maxSB[bar]->setSingleStep(getBarStep(index));
+    minSB[bar]->setValue(getBarValue(index, model.frsky.screens[screenId].body.bars[barId].barMin, &model.frsky));
+    maxSB[bar]->setValue(getBarValue(index, 255-model.frsky.screens[screenId].body.bars[barId].barMax, &model.frsky));
+    lock=false;
+    emit modified();
+}
+
+void TelemetryPanel::telMinSBeditingFinished()
+{
+    if (lock) return;
+    QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
+    int screenId = spinBox->objectName().mid(8,1).toInt() - 1;
+    int barId = spinBox->objectName().right(1).toInt() - 1;
+    int minId = barId+screenId*4;
+    lock=true;
+    if (model.frsky.screens[screenId].body.bars[barId].source==TELEMETRY_SOURCE_A1 || model.frsky.screens[screenId].body.bars[barId].source==TELEMETRY_SOURCE_A1_MIN) {
+     model.frsky.screens[screenId].body.bars[barId].barMin=round((minSB[minId]->value()-analogs[0]->ui->CalibSB->value())/getBarStep(model.frsky.screens[screenId].body.bars[barId].source));
+    } else if (model.frsky.screens[screenId].body.bars[minId].source==TELEMETRY_SOURCE_A2 || model.frsky.screens[screenId].body.bars[minId].source==TELEMETRY_SOURCE_A2_MIN) {
+     model.frsky.screens[screenId].body.bars[barId].barMin=round((minSB[minId]->value()-analogs[1]->ui->CalibSB->value())/getBarStep(model.frsky.screens[screenId].body.bars[barId].source));
+    } else {
+     model.frsky.screens[screenId].body.bars[barId].barMin=round((minSB[minId]->value()-getBarValue(model.frsky.screens[screenId].body.bars[barId].source, 0, &model.frsky))/getBarStep(model.frsky.screens[screenId].body.bars[barId].source));
+    }
+    spinBox->setValue(getBarValue(model.frsky.screens[screenId].body.bars[barId].source, model.frsky.screens[screenId].body.bars[barId].barMin, &model.frsky));
+    if (maxSB[minId]->value()<minSB[minId]->value()) {
+      model.frsky.screens[screenId].body.bars[minId].barMax=(255-model.frsky.screens[screenId].body.bars[barId].barMin+1);
+      maxSB[minId]->setValue(getBarValue(model.frsky.screens[screenId].body.bars[barId].source, 255-model.frsky.screens[screenId].body.bars[barId].barMax, &model.frsky));
+    }
+    maxSB[minId]->setMinimum(getBarValue(model.frsky.screens[screenId].body.bars[barId].source, (model.frsky.screens[screenId].body.bars[barId].barMin+1), &model.frsky));
+    lock=false;
+    emit modified();
+}
+
+void TelemetryPanel::telMaxSBeditingFinished()
+{
+    if (lock) return;
+    QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
+    int screenId = spinBox->objectName().mid(8,1).toInt() - 1;
+    int barId = spinBox->objectName().right(1).toInt() - 1;
+    lock=true;
+    if (model.frsky.screens[screenId].body.bars[barId].source==5) {
+      model.frsky.screens[screenId].body.bars[barId].barMax = (255-round((spinBox->value()-analogs[0]->ui->CalibSB->value())/getBarStep(model.frsky.screens[screenId].body.bars[barId].source)));
+    } else if (model.frsky.screens[screenId].body.bars[barId].source==6) {
+      model.frsky.screens[screenId].body.bars[barId].barMax = (255-round((spinBox->value()-analogs[1]->ui->CalibSB->value())/getBarStep(model.frsky.screens[screenId].body.bars[barId].source)));
+    } else {
+      model.frsky.screens[screenId].body.bars[barId].barMax = (255-round((spinBox->value()-getBarValue(model.frsky.screens[screenId].body.bars[barId].source, 0, &model.frsky))/getBarStep(model.frsky.screens[screenId].body.bars[barId].source) ));
+    }
+    spinBox->setValue(getBarValue(model.frsky.screens[screenId].body.bars[barId].source, (255-model.frsky.screens[screenId].body.bars[barId].barMax), &model.frsky));
+    lock=false;
+    emit modified();
+}
+
+void TelemetryPanel::customFieldEdited()
+{
+  if (!lock) {
+    lock = true;
+
+    int cols=GetEepromInterface()->getCapability(TelemetryColsCSFields);
+    if (cols==0) cols=2;
+
+    for (int i=0; i<GetEepromInterface()->getCapability(TelemetryCSFields); i++) {
+      int screen=i/(4*cols);
+      int r=((i%(4*cols))%4);
+      int c=((i%(4*cols))/4);
+      if (model.frsky.screens[screen].type==0) {
+        model.frsky.screens[screen].body.lines[r].source[c]=csf[i]->currentIndex();
+      }
+    }
+    emit modified();
+
+    lock = false;
+  }
+}
+
+float TelemetryPanel::getBarStep(int barId)
+{
+    switch (barId-1) {
+      case TELEMETRY_SOURCE_TX_BATT:
+        return  0.1;
+        break;
+      case TELEMETRY_SOURCE_TIMER1:
+      case TELEMETRY_SOURCE_TIMER2:
+        return 3;
+        break;
+      case TELEMETRY_SOURCE_A1:
+      case TELEMETRY_SOURCE_A1_MIN:
+        return (analogs[0]->ui->RatioSB->value()/255);
+        break;
+      case TELEMETRY_SOURCE_A2:
+      case TELEMETRY_SOURCE_A2_MIN:
+        return (analogs[1]->ui->RatioSB->value()/255);
+        break;
+      case TELEMETRY_SOURCE_ALT:
+      case TELEMETRY_SOURCE_GPS_ALT:
+      case TELEMETRY_SOURCE_ALT_MAX:
+      case TELEMETRY_SOURCE_ALT_MIN:
+        return 8;
+        break;
+      case TELEMETRY_SOURCE_RPM:
+      case TELEMETRY_SOURCE_RPM_MAX:
+        return 50;
+        break;
+      case TELEMETRY_SOURCE_CELLS_SUM:
+      case TELEMETRY_SOURCE_VFAS:
+        return  0.1;
+        break;
+      case TELEMETRY_SOURCE_CELL:
+        return  0.02;
+        break;
+      case TELEMETRY_SOURCE_HDG:
+        return  2;
+        break;
+      case TELEMETRY_SOURCE_DIST:
+      case TELEMETRY_SOURCE_DIST_MAX:
+        return  8;
+        break;
+      case TELEMETRY_SOURCE_CURRENT_MAX:
+      case TELEMETRY_SOURCE_CURRENT:
+        return  0.5;
+        break;
+      case TELEMETRY_SOURCE_POWER:
+        return  5;
+        break;
+      case TELEMETRY_SOURCE_CONSUMPTION:
+        return  20;
+        break;
+      case TELEMETRY_SOURCE_SPEED:
+      case TELEMETRY_SOURCE_SPEED_MAX:
+        if (model.frsky.imperial==1) {
+          return 1;
+        } else {
+          return 1.852;
+        }
+        break;
+      default:
+        return  1;
+        break;
+    }
+}
diff --git a/companion/src/modeledit/telemetry.h b/companion/src/modeledit/telemetry.h
new file mode 100644
index 000000000..6984a9f51
--- /dev/null
+++ b/companion/src/modeledit/telemetry.h
@@ -0,0 +1,98 @@
+#ifndef TELEMETRY_H
+#define TELEMETRY_H
+
+#include "modelpanel.h"
+#include <QGroupBox>
+#include <QComboBox>
+#include <QDoubleSpinBox>
+
+namespace Ui {
+  class TelemetryAnalog;
+  class Telemetry;
+}
+
+class TelemetryAnalog : public QWidget
+{
+    Q_OBJECT
+
+    friend class TelemetryPanel;
+
+  public:
+    TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog);
+    virtual ~TelemetryAnalog();
+
+  signals:
+    void modified();
+
+  private slots:
+    void on_UnitCB_currentIndexChanged(int index);
+    void on_RatioSB_editingFinished();
+    void on_RatioSB_valueChanged();
+    void on_CalibSB_editingFinished();
+    void on_alarm1LevelCB_currentIndexChanged(int index);
+    void on_alarm1GreaterCB_currentIndexChanged(int index);
+    void on_alarm1ValueSB_editingFinished();
+    void on_alarm2LevelCB_currentIndexChanged(int index);
+    void on_alarm2GreaterCB_currentIndexChanged(int index);
+    void on_alarm2ValueSB_editingFinished();
+
+  private:
+    Ui::TelemetryAnalog *ui;
+    FrSkyChannelData & analog;
+    bool lock;
+
+    void update();
+};
+
+class TelemetryPanel : public ModelPanel
+{
+    Q_OBJECT
+
+  public:
+    TelemetryPanel(QWidget *parent, ModelData & model);
+    virtual ~TelemetryPanel();
+
+  signals:
+    void modified();
+
+  private slots:
+    void onAnalogModified();
+    void on_frskyProtoCB_currentIndexChanged(int index);
+    void on_frskyUnitsCB_currentIndexChanged(int index);
+    void on_frskyBladesCB_currentIndexChanged(int index);
+    void on_frskyCurrentCB_currentIndexChanged(int index);
+    void on_frskyVoltCB_currentIndexChanged(int index);
+    void on_AltitudeToolbar_ChkB_toggled(bool checked);
+    void on_rssiAlarm1CB_currentIndexChanged(int index);
+    void on_rssiAlarm2CB_currentIndexChanged(int index);
+    void on_rssiAlarm1SB_editingFinished();
+    void on_rssiAlarm2SB_editingFinished();
+    void on_AltitudeGPS_ChkB_toggled(bool checked);
+    void on_varioSourceCB_currentIndexChanged(int index);
+    void on_varioLimitMin_DSB_editingFinished();
+    void on_varioLimitMax_DSB_editingFinished();
+    void on_varioLimitCenterMin_DSB_editingFinished();
+    void on_varioLimitMinOff_ChkB_toggled(bool checked);
+    void on_varioLimitCenterMax_DSB_editingFinished();
+    void telBarCBcurrentIndexChanged(int index);
+    void ScreenTypeCBcurrentIndexChanged(int index);
+    void telMaxSBeditingFinished();
+    void telMinSBeditingFinished();
+    void customFieldEdited();
+
+  private:
+    Ui::Telemetry *ui;
+    TelemetryAnalog * analogs[2];
+    QGroupBox* barsGB[3];
+    QGroupBox* numsGB[3];
+    QComboBox* barsCB[12];
+    QDoubleSpinBox* minSB[12];
+    QDoubleSpinBox* maxSB[12];
+    QComboBox* csf[36];
+
+    void setup();
+    float getBarStep(int barId);
+    void telBarUpdate();
+};
+
+#endif // TELEMETRY_H
diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui
new file mode 100644
index 000000000..b03ab1091
--- /dev/null
+++ b/companion/src/modeledit/telemetry.ui
@@ -0,0 +1,2026 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Telemetry</class>
+ <widget class="QWidget" name="Telemetry">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>692</width>
+    <height>540</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_14" stretch="0,0,0">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMinimumSize</enum>
+     </property>
+     <item>
+      <widget class="QGroupBox" name="A1GB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
+       <property name="title">
+        <string>A1</string>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
+       <layout class="QVBoxLayout" name="A1Layout">
+        <property name="topMargin">
+         <number>1</number>
+        </property>
+        <property name="bottomMargin">
+         <number>1</number>
+        </property>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="A2GB">
+       <property name="title">
+        <string>A2</string>
+       </property>
+       <layout class="QVBoxLayout" name="A2Layout">
+        <property name="topMargin">
+         <number>1</number>
+        </property>
+        <property name="bottomMargin">
+         <number>1</number>
+        </property>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="RSSIGB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>RSSI</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_7">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_927">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>Alarm 1</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="rssiAlarm1CB">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>----</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Yellow</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Orange</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Red</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="QSpinBox" name="rssiAlarm1SB">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="suffix">
+           <string/>
+          </property>
+          <property name="minimum">
+           <number>20</number>
+          </property>
+          <property name="maximum">
+           <number>80</number>
+          </property>
+          <property name="singleStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>50</number>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_928">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Alarm 2</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QComboBox" name="rssiAlarm2CB">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>----</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Yellow</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Orange</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Red</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="QSpinBox" name="rssiAlarm2SB">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="suffix">
+           <string/>
+          </property>
+          <property name="minimum">
+           <number>20</number>
+          </property>
+          <property name="maximum">
+           <number>80</number>
+          </property>
+          <property name="singleStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>50</number>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <spacer name="verticalSpacer_16">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_13" stretch="1,1">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMinimumSize</enum>
+     </property>
+     <item>
+      <widget class="QGroupBox" name="serialGB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Serial Protocol</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_6">
+        <property name="topMargin">
+         <number>1</number>
+        </property>
+        <property name="bottomMargin">
+         <number>1</number>
+        </property>
+        <item>
+         <layout class="QGridLayout" name="gridLayout_34" columnstretch="0,1,1,1">
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Volt source</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="frskyUnitsCB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <item>
+             <property name="text">
+              <string>Metric</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Imperial</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="QLabel" name="current_label">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Current source</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_112">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Protocol</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="3">
+           <widget class="QComboBox" name="frskyCurrentCB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <item>
+             <property name="text">
+              <string>NONE</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>A1</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>A2</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>FAS</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="3">
+           <widget class="QComboBox" name="frskyProtoCB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <item>
+             <property name="text">
+              <string>None</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>FrSky Sensor Hub</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="frskyVoltCB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <item>
+             <property name="text">
+              <string>A1</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>A2</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>FAS</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>CEL</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="3">
+           <widget class="QComboBox" name="frskyBladesCB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <item>
+             <property name="text">
+              <string>2</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>3</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>4</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_113">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Units</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QLabel" name="blades_label">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Blades</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="altimetryGB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Altimetry / Vario</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_39">
+        <property name="topMargin">
+         <number>1</number>
+        </property>
+        <property name="bottomMargin">
+         <number>1</number>
+        </property>
+        <item row="0" column="0">
+         <layout class="QGridLayout" name="gridLayout_40" rowstretch="1,0,0" columnstretch="0,0">
+          <item row="0" column="1">
+           <widget class="QComboBox" name="varioSourceCB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <item>
+             <property name="text">
+              <string>Alti</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Alti+</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Vario</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>A1</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>A2</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <layout class="QGridLayout" name="gridLayout_66" columnstretch="1,0,0,0">
+            <item row="0" column="0">
+             <widget class="QLabel" name="VarioLabel_1">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Sink Max</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QDoubleSpinBox" name="varioLimitCenterMin_DSB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="decimals">
+               <number>1</number>
+              </property>
+              <property name="minimum">
+               <double>-2.000000000000000</double>
+              </property>
+              <property name="maximum">
+               <double>0.000000000000000</double>
+              </property>
+              <property name="singleStep">
+               <double>0.100000000000000</double>
+              </property>
+              <property name="value">
+               <double>-0.500000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QDoubleSpinBox" name="varioLimitCenterMax_DSB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="decimals">
+               <number>1</number>
+              </property>
+              <property name="minimum">
+               <double>-1.000000000000000</double>
+              </property>
+              <property name="maximum">
+               <double>2.000000000000000</double>
+              </property>
+              <property name="singleStep">
+               <double>0.100000000000000</double>
+              </property>
+              <property name="value">
+               <double>0.500000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="3">
+             <widget class="QDoubleSpinBox" name="varioLimitMax_DSB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="decimals">
+               <number>0</number>
+              </property>
+              <property name="minimum">
+               <double>3.000000000000000</double>
+              </property>
+              <property name="maximum">
+               <double>17.000000000000000</double>
+              </property>
+              <property name="value">
+               <double>10.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QDoubleSpinBox" name="varioLimitMin_DSB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="decimals">
+               <number>0</number>
+              </property>
+              <property name="minimum">
+               <double>-17.000000000000000</double>
+              </property>
+              <property name="maximum">
+               <double>-3.000000000000000</double>
+              </property>
+              <property name="value">
+               <double>-10.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QCheckBox" name="varioLimitMinOff_ChkB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Off</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="3">
+             <widget class="QLabel" name="VarioLabel_2">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Climb Max</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="VarioLabel_3">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Sink Min</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="QLabel" name="VarioLabel_4">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Climb Min</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="varioSource_label">
+            <property name="text">
+             <string>Vario source</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="varioLimit_label">
+            <property name="text">
+             <string>Vario limits</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <layout class="QHBoxLayout" name="horizontalLayout_16">
+            <item>
+             <widget class="QCheckBox" name="AltitudeGPS_ChkB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Use GPS as altitude source</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="AltitudeToolbar_ChkB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Display altitude in toolbar</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QGroupBox" name="groupBox_5">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string/>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_5">
+        <property name="topMargin">
+         <number>1</number>
+        </property>
+        <property name="bottomMargin">
+         <number>1</number>
+        </property>
+        <item row="0" column="0" colspan="2">
+         <widget class="QTabWidget" name="tabCsView">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <widget class="QWidget" name="tab">
+           <attribute name="title">
+            <string>Telemetry screen 1</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_35">
+            <item row="0" column="0" colspan="2">
+             <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,0,1">
+              <item>
+               <widget class="QLabel" name="telemetryCS1Type_LABEL">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>Custom Screen Type</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="telemetryCSType1">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>90</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <item>
+                 <property name="text">
+                  <string>Nums</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Bars</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_16">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+            <item row="1" column="0">
+             <widget class="QGroupBox" name="CS1Nums">
+              <layout class="QGridLayout" name="telemetryCS1Nums">
+               <item row="1" column="0">
+                <widget class="QComboBox" name="telemetryCS1F2_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QComboBox" name="telemetryCS1F1_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QComboBox" name="telemetryCS1F3_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="2">
+                <widget class="QComboBox" name="telemetryCS1F9_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <widget class="QComboBox" name="telemetryCS1F4_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="telemetryCS1F5_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QComboBox" name="telemetryCS1F6_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="QComboBox" name="telemetryCS1F10_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QComboBox" name="telemetryCS1F7_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="1">
+                <widget class="QComboBox" name="telemetryCS1F8_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="2">
+                <widget class="QComboBox" name="telemetryCS1F11_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="2">
+                <widget class="QComboBox" name="telemetryCS1F12_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QGroupBox" name="CS1Bars">
+              <layout class="QGridLayout" name="telemetryCS1Bars" columnstretch="1,0,1,0">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_265">
+                 <property name="text">
+                  <string>Source</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QLabel" name="label_266">
+                 <property name="text">
+                  <string>Min</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="2">
+                <widget class="QLabel" name="label_267">
+                 <property name="text">
+                  <string>Gauge</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="3">
+                <widget class="QLabel" name="label_268">
+                 <property name="text">
+                  <string>Max</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QComboBox" name="telBarCS1B1_CB"/>
+               </item>
+               <item row="1" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS1SB1">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="QLabel" name="telBarCS1BAR1">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 1</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS1SB1">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QComboBox" name="telBarCS1B2_CB"/>
+               </item>
+               <item row="2" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS1SB2">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="2">
+                <widget class="QLabel" name="telBarCS1BAR2">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 2</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS1SB2">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <widget class="QComboBox" name="telBarCS1B3_CB"/>
+               </item>
+               <item row="3" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS1SB3">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="2">
+                <widget class="QLabel" name="telBarCS1BAR3">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 3</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="3" rowspan="2">
+                <widget class="QDoubleSpinBox" name="telMaxCS1SB3">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="0" rowspan="2">
+                <widget class="QComboBox" name="telBarCS1B4_CB"/>
+               </item>
+               <item row="4" column="1" rowspan="2">
+                <widget class="QDoubleSpinBox" name="telMinCS1SB4">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="2">
+                <widget class="QLabel" name="telBarCS1BAR4">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 4</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS1SB4">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="tab_2">
+           <attribute name="title">
+            <string>Telemetry screen 2</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_36">
+            <item row="1" column="0">
+             <widget class="QGroupBox" name="CS2Nums">
+              <layout class="QGridLayout" name="telemetryCS2Nums">
+               <item row="1" column="0">
+                <widget class="QComboBox" name="telemetryCS2F2_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QComboBox" name="telemetryCS2F1_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QComboBox" name="telemetryCS2F3_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="2">
+                <widget class="QComboBox" name="telemetryCS2F9_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <widget class="QComboBox" name="telemetryCS2F4_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="telemetryCS2F5_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QComboBox" name="telemetryCS2F6_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QComboBox" name="telemetryCS2F7_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="1">
+                <widget class="QComboBox" name="telemetryCS2F8_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="QComboBox" name="telemetryCS2F10_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="2">
+                <widget class="QComboBox" name="telemetryCS2F11_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="2">
+                <widget class="QComboBox" name="telemetryCS2F12_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QGroupBox" name="CS2Bars">
+              <layout class="QGridLayout" name="telemetryCS2Bars" columnstretch="1,0,1,0">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_285">
+                 <property name="text">
+                  <string>Source</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QLabel" name="label_286">
+                 <property name="text">
+                  <string>Min</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="2">
+                <widget class="QLabel" name="label_287">
+                 <property name="text">
+                  <string>Gauge</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="3">
+                <widget class="QLabel" name="label_288">
+                 <property name="text">
+                  <string>Max</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QComboBox" name="telBarCS2B1_CB"/>
+               </item>
+               <item row="1" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS2SB1">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="QLabel" name="telBarCS2BAR1">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 1</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS2SB1">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QComboBox" name="telBarCS2B2_CB"/>
+               </item>
+               <item row="2" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS2SB2">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="2">
+                <widget class="QLabel" name="telBarCS2BAR2">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 2</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS2SB2">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <widget class="QComboBox" name="telBarCS2B3_CB"/>
+               </item>
+               <item row="3" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS2SB3">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="2">
+                <widget class="QLabel" name="telBarCS2BAR3">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 3</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="3" rowspan="2">
+                <widget class="QDoubleSpinBox" name="telMaxCS2SB3">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="0" rowspan="2">
+                <widget class="QComboBox" name="telBarCS2B4_CB"/>
+               </item>
+               <item row="4" column="1" rowspan="2">
+                <widget class="QDoubleSpinBox" name="telMinCS2SB4">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="2">
+                <widget class="QLabel" name="telBarCS2BAR4">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 4</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS2SB4">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item row="0" column="0" colspan="2">
+             <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,1">
+              <item>
+               <widget class="QLabel" name="telemetryCS2Type_LABEL">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Custom Screen Type</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="telemetryCSType2">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>90</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <item>
+                 <property name="text">
+                  <string>Nums</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Bars</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_17">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="tab_3">
+           <attribute name="title">
+            <string>Telemetry screen 3</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_32">
+            <item row="0" column="0" colspan="2">
+             <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="0,0,1">
+              <item>
+               <widget class="QLabel" name="telemetryCS3Type_LABEL">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Custom Screen Type</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="telemetryCSType3">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>90</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <item>
+                 <property name="text">
+                  <string>Nums</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Bars</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_18">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+            <item row="1" column="0">
+             <widget class="QGroupBox" name="CS3Nums">
+              <layout class="QGridLayout" name="telemetryCS3Nums">
+               <item row="1" column="0">
+                <widget class="QComboBox" name="telemetryCS3F2_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QComboBox" name="telemetryCS3F1_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QComboBox" name="telemetryCS3F3_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="2">
+                <widget class="QComboBox" name="telemetryCS3F9_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <widget class="QComboBox" name="telemetryCS3F4_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="telemetryCS3F5_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QComboBox" name="telemetryCS3F6_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QComboBox" name="telemetryCS3F7_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="1">
+                <widget class="QComboBox" name="telemetryCS3F8_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="QComboBox" name="telemetryCS3F10_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="2">
+                <widget class="QComboBox" name="telemetryCS3F11_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="2">
+                <widget class="QComboBox" name="telemetryCS3F12_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QGroupBox" name="CS3Bars">
+              <layout class="QGridLayout" name="telemetryCS3Bars" columnstretch="1,0,1,0">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_277">
+                 <property name="text">
+                  <string>Source</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QLabel" name="label_278">
+                 <property name="text">
+                  <string>Min</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="2">
+                <widget class="QLabel" name="label_279">
+                 <property name="text">
+                  <string>Gauge</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="3">
+                <widget class="QLabel" name="label_280">
+                 <property name="text">
+                  <string>Max</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QComboBox" name="telBarCS3B1_CB">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS3SB1">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="QLabel" name="telBarCS3BAR1">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 1</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS3SB1">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QComboBox" name="telBarCS3B2_CB"/>
+               </item>
+               <item row="2" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS3SB2">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="2">
+                <widget class="QLabel" name="telBarCS3BAR2">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 2</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS3SB2">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <widget class="QComboBox" name="telBarCS3B3_CB"/>
+               </item>
+               <item row="3" column="1">
+                <widget class="QDoubleSpinBox" name="telMinCS3SB3">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="2">
+                <widget class="QLabel" name="telBarCS3BAR3">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 3</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="3" rowspan="2">
+                <widget class="QDoubleSpinBox" name="telMaxCS3SB3">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="0" rowspan="2">
+                <widget class="QComboBox" name="telBarCS3B4_CB"/>
+               </item>
+               <item row="4" column="1" rowspan="2">
+                <widget class="QDoubleSpinBox" name="telMinCS3SB4">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="2">
+                <widget class="QLabel" name="telBarCS3BAR4">
+                 <property name="autoFillBackground">
+                  <bool>false</bool>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">Background:qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 128, 255), stop:0.339795 rgba(0, 0, 128, 255), stop:0.339799 rgba(255, 255, 255, 255), stop:0.662444 rgba(255, 255, 255, 255),)
+</string>
+                 </property>
+                 <property name="frameShape">
+                  <enum>QFrame::Panel</enum>
+                 </property>
+                 <property name="frameShadow">
+                  <enum>QFrame::Raised</enum>
+                 </property>
+                 <property name="text">
+                  <string>Gauge 4</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="3">
+                <widget class="QDoubleSpinBox" name="telMaxCS3SB4">
+                 <property name="decimals">
+                  <number>0</number>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/telemetry_analog.ui b/companion/src/modeledit/telemetry_analog.ui
new file mode 100644
index 000000000..d8b713105
--- /dev/null
+++ b/companion/src/modeledit/telemetry_analog.ui
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TelemetryAnalog</class>
+ <widget class="QWidget" name="TelemetryAnalog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>272</width>
+    <height>118</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="gridLayout_11" columnstretch="1,1,1,1" columnminimumwidth="0,0,0,0">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_918">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Unit</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_Max">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Max Value</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_919">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Alarm 1    </string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="alarm1LevelCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string>----</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Yellow</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Orange</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Red</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="2" column="2">
+      <widget class="QComboBox" name="alarm1GreaterCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string>&lt;</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>&gt;</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_921">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Alarm 2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QComboBox" name="alarm2LevelCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string>----</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Yellow</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Orange</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Red</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QComboBox" name="alarm2GreaterCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string>&lt;</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>&gt;</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QDoubleSpinBox" name="RatioSB">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="decimals">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <double>255.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QDoubleSpinBox" name="CalibSB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="decimals">
+        <number>2</number>
+       </property>
+       <property name="minimum">
+        <double>-12.800000000000001</double>
+       </property>
+       <property name="maximum">
+        <double>12.699999999999999</double>
+       </property>
+       <property name="singleStep">
+        <double>0.100000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="3">
+      <widget class="QDoubleSpinBox" name="alarm1ValueSB">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="decimals">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <double>255.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="3">
+      <widget class="QDoubleSpinBox" name="alarm2ValueSB">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="decimals">
+        <number>0</number>
+       </property>
+       <property name="maximum">
+        <double>255.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLabel" name="CalibLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Min Value</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" colspan="2">
+      <widget class="QComboBox" name="UnitCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <item>
+        <property name="text">
+         <string>Volts (V)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Amps (A)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Speed (m/s or ft/s)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Raw (-)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Speed (km/h or miles/h)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Meters (m or ft)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Temp (°)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Fuel (%)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>mAmps (mA)</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/companion/src/modeledit/templates.cpp b/companion/src/modeledit/templates.cpp
new file mode 100644
index 000000000..c45b920bf
--- /dev/null
+++ b/companion/src/modeledit/templates.cpp
@@ -0,0 +1,852 @@
+#include "templates.h"
+#include <QListWidget>
+#include <QMessageBox>
+
+Templates::Templates(QWidget * parent, ModelData & model):
+  QWidget(parent),
+  model(model)
+{
+  QGridLayout * gridLayout = new QGridLayout(this);
+  QListWidget * templateList = new QListWidget(this);
+  gridLayout->addWidget(templateList, 0, 0, 1, 1);
+
+  templateList->addItem(tr("Simple 4-CH"));
+  templateList->addItem(tr("T-Cut"));
+  templateList->addItem(tr("Sticky T-Cut"));
+  templateList->addItem(tr("V-Tail"));
+  templateList->addItem(tr("Elevon\\Delta"));
+  templateList->addItem(tr("Heli Setup"));
+  templateList->addItem(tr("Heli Setup with gyro gain control"));
+  templateList->addItem(tr("Gyro gain control"));
+  templateList->addItem(tr("Heli Setup (Futaba's channel assignment style)"));
+  templateList->addItem(tr("Heli Setup with gyro gain control (Futaba's channel assignment style)"));
+  templateList->addItem(tr("Gyro gain control (Futaba's channel assignment style)"));
+  templateList->addItem(tr("Servo Test"));
+  templateList->addItem(tr("MultiCopter"));
+  templateList->addItem(tr("Use Model Config Wizard"));
+
+  connect(templateList, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(doubleClicked(QModelIndex)));
+}
+
+Templates::~Templates()
+{
+}
+
+void Templates::setSwitch(unsigned int idx, unsigned int func, int v1, int v2)
+{
+    g_model.customSw[idx-1].func = func;
+    g_model.customSw[idx-1].val1   = v1;
+    g_model.customSw[idx-1].val2   = v2;
+}
+
+void Templates::onDoubleClicked(QModelIndex index)
+{
+    QString text = ui->templateList->item(index.row())->text();
+    if (index.row()==13) {
+      uint64_t result=0xffffffff;
+      modelConfigDialog *mcw = new modelConfigDialog(radioData, &result, this);
+      mcw->exec();
+      if (result!=0xffffffff) {
+        applyNumericTemplate(result);
+        updateSettings();
+        tabMixes();
+      }
+    } else {
+      int res = QMessageBox::question(this,tr("Apply Template?"),tr("Apply template \"%1\"?").arg(text),QMessageBox::Yes | QMessageBox::No);
+      if(res!=QMessageBox::Yes) return;
+      applyTemplate(index.row());
+      updateSettings();
+      tabMixes();
+   }
+}
+
+void Templates::applyNumericTemplate(uint64_t tpl)
+{
+    clearCurves();
+    clearExpos(false);
+    clearMixes(false);
+    int8_t heli_ar1[] = {-100, -20, 30, 70, 90};
+    int8_t heli_ar2[] = {80, 70, 60, 70, 100};
+    int8_t heli_ar3[] = {100, 90, 80, 90, 100};
+    int8_t heli_ar4[] = {-30,  -15, 0, 50, 100};
+    int8_t heli_ar5[] = {-100, -50, 0, 50, 100};
+    bool rx[10];
+    for (int i=0; i<10 ; i++) {
+      rx[i]=false;
+    }
+    int thrsw=GetEepromInterface()->getCapability(GetThrSwitch);
+    MixData *md = &model.mixData[0];
+    uint8_t spo2ch=(tpl & 0x0F);
+    tpl>>=4;
+    uint8_t spo1ch=(tpl & 0x0F);
+    tpl>>=4;
+    uint8_t fla2ch=(tpl & 0x0F);
+    tpl>>=4;
+    uint8_t fla1ch=(tpl & 0x0F);
+    tpl>>=4;
+    uint8_t rud2ch=(tpl & 0x0F);
+    tpl>>=4;
+    uint8_t ele2ch=(tpl & 0x0F);
+    tpl>>=4;
+    uint8_t ail2ch=(tpl & 0x0F);
+    tpl>>=4;
+    uint8_t chstyle=(tpl & 0x03);
+    tpl>>=2;
+    uint8_t gyro=(tpl & 0x03);
+    tpl>>=2;
+    uint8_t tailtype=(tpl & 0x03);
+    tpl>>=2;
+    uint8_t swashtype=(tpl & 0x07);
+    tpl>>=3;
+    uint8_t ruddertype=(tpl & 0x03);
+    tpl>>=2;
+    uint8_t spoilertype=(tpl & 0x3);
+    tpl>>=2;
+    uint8_t flaptype=(tpl & 0x03);
+    tpl>>=2;
+    uint8_t ailerontype=(tpl & 0x03);
+    tpl>>=2;
+    uint8_t enginetype=(tpl & 0x03);
+    tpl>>=2;
+    uint8_t modeltype=(tpl & 0x03);
+
+  #define ICC(x) icc[(x)-1]
+    uint8_t icc[4] = {0};
+    for(uint8_t i=1; i<=4; i++) //generate inverse array
+      for(uint8_t j=1; j<=4; j++) if(CC(i)==j) icc[j-1]=i;
+
+    int ailerons;
+    int flaps;
+    int throttle;
+    int spoilers;
+    int elevators;
+    int rudders;
+    int sign;
+    uint8_t rxch;
+    switch (modeltype) {
+      case 0:
+        ailerons=ailerontype;
+        flaps=flaptype;
+        throttle=1;
+        switch (tailtype) {
+          case 0:
+          case 1:
+            rudders=1;
+            elevators=1;
+            break;
+          case 2:
+            rudders=1;
+            elevators=2;
+            break;
+        }
+        rxch=ICC(STK_RUD);
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
+        if (tailtype==1) {
+          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+        }
+        rx[rxch-1]=true;
+        rxch=ICC(STK_ELE);
+        if (tailtype==1) {
+          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
+        }
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+        rx[rxch-1]=true;
+        rxch=ICC(STK_THR);
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("THR").toAscii().data(),6);
+        rx[rxch-1]=true;
+        if (ail2ch > 0) {
+          rx[ail2ch-1]=true;
+        }
+        if (ele2ch > 0) {
+          rx[ele2ch-1]=true;
+        }
+        if (fla1ch > 0) {
+          rx[fla1ch-1]=true;
+        }
+        if (fla2ch > 0) {
+          rx[fla2ch-1]=true;
+        }
+        if (ailerons>0) {
+          rxch=ICC(STK_AIL);
+          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
+          rx[rxch-1]=true;
+        }
+        if (ailerons>1) {
+          if (ail2ch==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL2").toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          } else {
+            md=setDest(ail2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL2").toAscii().data(),6);
+          }
+        }
+        if (elevators>1) {
+          if (ele2ch==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();;strncpy(md->name, tr("ELE2").toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          }else{
+            md=setDest(ele2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();;strncpy(md->name, tr("ELE2").toAscii().data(),6);
+          }
+        }
+        if (flaps>0) {
+              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6); md->speedUp=4; md->speedDown=4;
+              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6); md->speedUp=4; md->speedDown=4;
+        }
+        sign=-1;
+        for (uint8_t i=0; i< flaps; i++) {
+          sign*=-1;
+          int index;
+          if (i==0) {
+            index=fla1ch;
+          } else {
+            index=fla2ch;
+          }
+          if (index==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          } else {
+            md=setDest(index);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
+          }
+        }
+        break;
+      case 1:
+        setCurve(CURVE5(1),heli_ar1);
+        setCurve(CURVE5(2),heli_ar2);
+        setCurve(CURVE5(3),heli_ar3);
+        setCurve(CURVE5(4),heli_ar4);
+        setCurve(CURVE5(5),heli_ar5);
+        setCurve(CURVE5(6),heli_ar5);
+        switch (swashtype) {
+          case 0:
+            model.swashRingData.type = HELI_SWASH_TYPE_90;
+            break;
+          case 1:
+            model.swashRingData.type = HELI_SWASH_TYPE_120;
+            break;
+          case 2:
+            model.swashRingData.type = HELI_SWASH_TYPE_120X;
+            break;
+          case 3:
+            model.swashRingData.type = HELI_SWASH_TYPE_140;
+            break;
+          case 4:
+            model.swashRingData.type = HELI_SWASH_TYPE_NONE;
+            break;
+        }
+        model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
+
+        if (chstyle==0) {
+          if (swashtype!=4) {
+            md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+            md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
+            md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("PITCH").toAscii().data(),6);
+          } else {
+            md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+            md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
+            md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("PITCH").toAscii().data(),6);
+          }
+          md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
+          md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
+          md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
+          md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
+          md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
+          switch (gyro) {
+            case 1:
+              md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);strncpy(md->name, tr("GYRO").toAscii().data(),6);
+              md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);strncpy(md->name, tr("GYRO").toAscii().data(),6);
+              break;
+            case 2:
+              md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;strncpy(md->name, tr("GYRO").toAscii().data(),6);
+              md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;strncpy(md->name, tr("GYRO").toAscii().data(),6);
+              break;
+          }
+        } else {
+          if (swashtype!=4) {
+            md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
+            md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+            md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("PITCH").toAscii().data(),6);
+          } else {
+            md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
+            md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+            md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight= 100; md->swtch=RawSwitch();strncpy(md->name, tr("PITCH").toAscii().data(),6);
+          }
+          md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
+          md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
+          md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
+          md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
+          md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
+          switch (gyro) {
+            case 1:
+              md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);strncpy(md->name, tr("GYRO").toAscii().data(),6);
+              md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);strncpy(md->name, tr("GYRO").toAscii().data(),6);
+              break;
+            case 2:
+              md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;strncpy(md->name, tr("GYRO").toAscii().data(),6);
+              md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;strncpy(md->name, tr("GYRO").toAscii().data(),6);
+              break;
+          }
+        }
+        // collective
+        md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
+        md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
+        md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
+        break;
+      case 2:
+        ailerons=ailerontype;
+        flaps=flaptype;
+        spoilers=spoilertype;
+        throttle=enginetype;
+        switch (tailtype) {
+          case 0:
+          case 1:
+            rudders=1;
+            elevators=1;
+            break;
+          case 2:
+            rudders=1;
+            elevators=2;
+            break;
+        }
+        if (throttle==1) {
+         rxch=ICC(STK_THR);
+         md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("THR").toAscii().data(),6);
+         rx[rxch-1]=true;
+        }
+        rxch=ICC(STK_RUD);
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
+        if (tailtype==1) {
+          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
+        }
+        rx[rxch-1]=true;
+        rxch=ICC(STK_ELE);
+        if (tailtype==1) {
+          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+        }
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+        rx[rxch-1]=true;
+        if (ail2ch > 0) {
+          rx[ail2ch-1]=true;
+        }
+        if (ele2ch > 0) {
+          rx[ele2ch-1]=true;
+        }
+        if (fla1ch > 0) {
+          rx[fla1ch-1]=true;
+        }
+        if (fla2ch > 0) {
+          rx[fla2ch-1]=true;
+        }
+        if (spo1ch > 0) {
+          rx[spo1ch-1]=true;
+        }
+        if (spo2ch > 0) {
+          rx[spo2ch-1]=true;
+        }
+
+        if (ailerons>0) {
+          rxch=ICC(STK_AIL);
+          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
+          rx[rxch-1]=true;
+        }
+        if (ailerons>1) {
+          if (ail2ch==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL2").toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          } else {
+            md=setDest(ail2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL2").toAscii().data(),6);
+          }
+        }
+        if (elevators>1) {
+          if (ele2ch==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE2").toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          } else {
+            md=setDest(ele2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE2").toAscii().data(),6);
+          }
+        }
+        if (flaps>0) {
+              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6);md->speedUp=4; md->speedDown=4;
+              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6);md->speedUp=4; md->speedDown=4;
+        }
+        sign=-1;
+        for (uint8_t i=0; i< flaps; i++) {
+          sign*=-1;
+          int index;
+          if (i==0) {
+            index=fla1ch;
+          } else {
+            index=fla2ch;
+          }
+          if (index==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          } else {
+            md=setDest(index);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
+          }
+        }
+        if (spoilers>0) {
+              md=setDest(12);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);strncpy(md->name, tr("SPOIL").toAscii().data(),6); md->speedUp=4;;md->speedDown=4;
+              md=setDest(12);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);strncpy(md->name, tr("SPOIL").toAscii().data(),6);md->speedUp=4;md->speedDown=4;
+        }
+        sign=-1;
+        for (uint8_t i=0; i< spoilers; i++) {
+          sign*=-1;
+          int index;
+          if (i==0) {
+            index=spo1ch;
+          } else {
+            index=spo2ch;
+          }
+          if (index==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 11); md->weight=100*sign;  md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("SPOIL%1").arg(i+1).toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          } else {
+            md=setDest(index);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 11);  md->weight=100*sign;  md->sOffset=0; md->swtch=RawSwitch();strncpy(md->name, tr("SPOIL%1").arg(i+1).toAscii().data(),6);
+          }
+        }
+        break;
+      case 3:
+        flaps=flaptype;
+        throttle=enginetype;
+        rudders=ruddertype;
+        if (throttle==1) {
+         rxch=ICC(STK_THR);
+         md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("THR").toAscii().data(),6);
+         rx[rxch-1]=true;
+        }
+        rxch=ICC(STK_ELE);
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("ELE").toAscii().data(),6);
+        rx[rxch-1]=true;
+        rxch=ICC(STK_AIL);
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
+        md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("AIL").toAscii().data(),6);
+        rx[rxch-1]=true;
+        if (rudders>0) {
+          rxch=ICC(STK_RUD);
+          md=setDest(rxch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD").toAscii().data(),6);
+          rx[rxch-1]=true;
+        }
+        if (rud2ch > 0) {
+          rx[rud2ch-1]=true;
+        }
+        if (fla1ch > 0) {
+          rx[fla1ch-1]=true;
+        }
+        if (fla2ch > 0) {
+          rx[fla2ch-1]=true;
+        }
+        if (rudders>1) {
+          if (rud2ch==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD2").toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          } else {
+            md=setDest(rud2ch);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=-100; md->swtch=RawSwitch();strncpy(md->name, tr("RUD2").toAscii().data(),6);
+          }
+        }
+        if (flaps>0) {
+              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6); md->sOffset=0; md->speedUp=4;
+              md=setDest(11);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_AIL);strncpy(md->name, tr("FLAPS").toAscii().data(),6); md->sOffset=0; md->speedUp=4;
+        }
+        sign=-1;
+        for (uint8_t i=0; i< flaps; i++) {
+          sign*=-1;
+          int index;
+          if (i==0) {
+            index=fla1ch;
+          } else {
+            index=fla2ch;
+          }
+          if (index==0) {
+            for (int j=0; j<10 ; j++) {
+              if (!rx[j]) {
+                md=setDest(j+1);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->speedUp=4; md->speedDown=4; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
+                rx[j]=true;
+                break;
+              }
+            }
+          } else {
+            md=setDest(index);  md->srcRaw=RawSource(SOURCE_TYPE_CH, 10);  md->weight=100*sign; md->sOffset=0; md->speedUp=4; md->speedDown=4; md->swtch=RawSwitch();strncpy(md->name, tr("FLAP%1").arg(i+1).toAscii().data(),6);
+          }
+        }
+        break;
+    }
+    updateHeliTab();
+    updateCurvesTab();
+    if (modeltype==1 && swashtype!=4) {
+      ui->tabWidget->setCurrentIndex(1);
+    } else {
+      ui->tabWidget->setCurrentIndex(4);
+    }
+    resizeEvent();
+}
+
+void Templates::applyTemplate(uint8_t idx)
+{
+    int8_t heli_ar1[] = {-100, -20, 30, 70, 90};
+    int8_t heli_ar2[] = {80, 70, 60, 70, 100};
+    int8_t heli_ar3[] = {100, 90, 80, 90, 100};
+    int8_t heli_ar4[] = {-30,  -15, 0, 50, 100};
+    int8_t heli_ar5[] = {-100, -50, 0, 50, 100};
+
+    int thrsw=GetEepromInterface()->getCapability(GetThrSwitch);
+    MixData *md = &model.mixData[0];
+
+    //CC(STK)   -> vSTK
+    //ICC(vSTK) -> STK
+  #define ICC(x) icc[(x)-1]
+    uint8_t icc[4] = {0};
+    for(uint8_t i=1; i<=4; i++) //generate inverse array
+      for(uint8_t j=1; j<=4; j++) if(CC(i)==j) icc[j-1]=i;
+
+
+    uint8_t j = 0;
+
+    //Simple 4-Ch
+    if(idx==j++) {
+      if (md->destCh)
+        clearMixes();
+      md=setDest(ICC(STK_RUD));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_AIL));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();
+    }
+
+    //T-Cut
+    if(idx==j++) {
+        md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100;  md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw);  md->mltpx=MLTPX_REP;
+    }
+
+    //sticky t-cut
+    if(idx==j++) {
+      md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100;  md->swtch=RawSwitch(SWITCH_TYPE_VIRTUAL, 12);  md->mltpx=MLTPX_REP;
+      md=setDest(14); md->srcRaw=RawSource(SOURCE_TYPE_CH, 13); md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(14); md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100;  md->swtch=RawSwitch(SWITCH_TYPE_VIRTUAL, 11);  md->mltpx=MLTPX_REP;
+      md=setDest(14); md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight= 100;  md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw);  md->mltpx=MLTPX_REP;
+      setSwitch(0xB, CS_FN_VNEG, RawSource(SOURCE_TYPE_STICK, 2).toValue(), -99);
+      setSwitch(0xC, CS_FN_VPOS, RawSource(SOURCE_TYPE_CH, 13).toValue(), 0);
+      updateSwitchesTab();
+    }
+
+    //V-Tail
+    if(idx==j++) {
+      clearMixes();
+      md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_AIL));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_RUD));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_RUD));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight= 100; md->swtch=RawSwitch();
+    }
+
+    //Elevon\\Delta
+    if(idx==j++) {
+      clearMixes();
+      md=setDest(ICC(STK_THR));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_RUD));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_ELE));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_AIL));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-100; md->swtch=RawSwitch();
+      md=setDest(ICC(STK_AIL));  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=100; md->swtch=RawSwitch();
+    }
+
+    //Heli Setup
+    if(idx==j++)  {
+      clearMixes();  //This time we want a clean slate
+      clearCurves();
+
+      // Set up Mixes
+      // 3 cyclic channels
+      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();
+
+      // rudder
+      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();
+
+      // throttle
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
+
+      // gyro gain
+      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);
+      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);
+
+      // collective
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
+
+      model.swashRingData.type = HELI_SWASH_TYPE_120;
+      model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
+
+      // set up Curves
+      setCurve(CURVE5(1),heli_ar1);
+      setCurve(CURVE5(2),heli_ar2);
+      setCurve(CURVE5(3),heli_ar3);
+      setCurve(CURVE5(4),heli_ar4);
+      setCurve(CURVE5(5),heli_ar5);
+      setCurve(CURVE5(6),heli_ar5);
+
+      // make sure curves are redrawn
+      updateHeliTab();
+      updateCurvesTab();
+      resizeEvent();
+    }
+
+    //Heli Setup  gyro gain control
+    if(idx==j++)  {
+      clearMixes();  //This time we want a clean slate
+      clearCurves();
+
+      // Set up Mixes
+      // 3 cyclic channels
+      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();
+
+      // rudder
+      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();
+
+      // throttle
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
+
+      // gyro gain
+      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;
+      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;
+
+      // collective
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
+
+      model.swashRingData.type = HELI_SWASH_TYPE_120;
+      model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
+
+      // set up Curves
+      setCurve(CURVE5(1),heli_ar1);
+      setCurve(CURVE5(2),heli_ar2);
+      setCurve(CURVE5(3),heli_ar3);
+      setCurve(CURVE5(4),heli_ar4);
+      setCurve(CURVE5(5),heli_ar5);
+      setCurve(CURVE5(6),heli_ar5);
+
+      // make sure curves are redrawn
+      updateHeliTab();
+      updateCurvesTab();
+      resizeEvent();
+    }
+
+    // gyro gain control
+    if(idx==j++)  {
+      int res = QMessageBox::question(this,tr("Clear Mixes?"),tr("Really clear existing mixes on CH6?"),QMessageBox::Yes | QMessageBox::No);
+      if(res!=QMessageBox::Yes) return;
+      // first clear mix on ch6
+      bool found=true;
+      while (found) {
+        found=false;
+        for (int i=0; i< GetEepromInterface()->getCapability(Mixes); i++) {
+          if (model.mixData[i].destCh==6) {
+            gm_deleteMix(i);
+            found=true;
+            break;
+          }
+        }
+      }
+      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;
+      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;
+    }
+
+    //Heli Setup  futaba style
+    if(idx==j++)  {
+      clearMixes();  //This time we want a clean slate
+      clearCurves();
+
+      // Set up Mixes
+      // 3 cyclic channels
+      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();
+
+      // rudder
+      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();
+
+      // throttle
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
+
+      // gyro gain
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA);
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-30; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA);
+
+      // collective
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
+
+      model.swashRingData.type = HELI_SWASH_TYPE_120;
+      model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
+
+      // set up Curves
+      setCurve(CURVE5(1),heli_ar1);
+      setCurve(CURVE5(2),heli_ar2);
+      setCurve(CURVE5(3),heli_ar3);
+      setCurve(CURVE5(4),heli_ar4);
+      setCurve(CURVE5(5),heli_ar5);
+      setCurve(CURVE5(6),heli_ar5);
+
+      // make sure curves are redrawn
+      updateHeliTab();
+      updateCurvesTab();
+      resizeEvent();
+    }
+
+    // Heli setup futaba style with gyro gain control
+    if(idx==j++)  {
+      clearMixes();  //This time we want a clean slate
+      clearCurves();
+
+      // Set up Mixes
+      // 3 cyclic channels
+      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 1);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 0);  md->weight= 100; md->swtch=RawSwitch();
+      md=setDest(6);  md->srcRaw=RawSource(SOURCE_TYPE_CYC, 2);  md->weight= 100; md->swtch=RawSwitch();
+
+      // rudder
+      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0); md->weight=100; md->swtch=RawSwitch();
+
+      // throttle
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(1); md->carryTrim=TRIM_OFF;
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(2); md->carryTrim=TRIM_OFF;
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight= 100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(3); md->carryTrim=TRIM_OFF;
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,thrsw); md->mltpx=MLTPX_REP;
+
+      // gyro gain
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;
+
+      // collective
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID0); md->curve=CV(4); md->carryTrim=TRIM_OFF;
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID1); md->curve=CV(5); md->carryTrim=TRIM_OFF;
+      md=setDest(11); md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_ID2); md->curve=CV(6); md->carryTrim=TRIM_OFF;
+
+      model.swashRingData.type = HELI_SWASH_TYPE_120;
+      model.swashRingData.collectiveSource = RawSource(SOURCE_TYPE_CH, 10);
+
+      // set up Curves
+      setCurve(CURVE5(1),heli_ar1);
+      setCurve(CURVE5(2),heli_ar2);
+      setCurve(CURVE5(3),heli_ar3);
+      setCurve(CURVE5(4),heli_ar4);
+      setCurve(CURVE5(5),heli_ar5);
+      setCurve(CURVE5(6),heli_ar5);
+
+      // make sure curves are redrawn
+      updateHeliTab();
+      updateCurvesTab();
+      resizeEvent();
+    }
+
+    // gyro gain control  futaba style
+    if(idx==j++)  {
+      int res = QMessageBox::question(this,tr("Clear Mixes?"),tr("Really clear existing mixes on CH5?"),QMessageBox::Yes | QMessageBox::No);
+      if(res!=QMessageBox::Yes) return;
+      // first clear mix on ch6
+      bool found=true;
+      while (found) {
+        found=false;
+        for (int i=0; i< GetEepromInterface()->getCapability(Mixes); i++) {
+          if (model.mixData[i].destCh==5) {
+            gm_deleteMix(i);
+            found=true;
+            break;
+          }
+        }
+      }
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight= 50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,-DSW_GEA); md->sOffset=100;
+      md=setDest(5);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 5); md->weight=-50; md->swtch=RawSwitch(SWITCH_TYPE_SWITCH,DSW_GEA); md->sOffset=100;
+    }
+
+    //Servo Test
+    if(idx==j++) {
+      md=setDest(15); md->srcRaw=RawSource(SOURCE_TYPE_CH, 15);   md->weight= 100; md->speedUp = 8; md->speedDown = 8; md->swtch=RawSwitch();
+      md=setDest(16); md->srcRaw=RawSource(SOURCE_TYPE_CUSTOM_SWITCH, 0); md->weight= 110; md->swtch=RawSwitch();
+      md=setDest(16); md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight=-110; md->swtch=RawSwitch(SWITCH_TYPE_VIRTUAL, 2); md->mltpx=MLTPX_REP;
+      md=setDest(16); md->srcRaw=RawSource(SOURCE_TYPE_MAX);  md->weight= 110; md->swtch=RawSwitch(SWITCH_TYPE_VIRTUAL, 3); md->mltpx=MLTPX_REP;
+      setSwitch(1, CS_FN_LESS, RawSource(SOURCE_TYPE_CH, 14).toValue(), RawSource(SOURCE_TYPE_CH, 15).toValue());
+      setSwitch(2, CS_FN_VPOS, RawSource(SOURCE_TYPE_CH, 14).toValue(), 105);
+      setSwitch(3, CS_FN_VNEG, RawSource(SOURCE_TYPE_CH, 14).toValue(), -105);
+
+      // redraw switches tab
+      updateSwitchesTab();
+    }
+
+    //MultiCopter
+    if(idx==j++) {
+      if (md->destCh)
+        clearMixes();
+      md=setDest(1);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 3);  md->weight=50; md->swtch=RawSwitch(); //CH1 AIL
+      md=setDest(2);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 1);  md->weight=-50; md->swtch=RawSwitch(); //CH2 ELE
+      md=setDest(3);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 2);  md->weight=100; md->swtch=RawSwitch(); //CH3 THR
+      md=setDest(4);  md->srcRaw=RawSource(SOURCE_TYPE_STICK, 0);  md->weight=100; md->swtch=RawSwitch(); //CH4 RUD
+    }
+}
+
+MixData* Templates::setDest(uint8_t dch)
+{
+    uint8_t i = 0;
+    while ((g_model.mixData[i].destCh<=dch) && (g_model.mixData[i].destCh) && (i<GetEepromInterface()->getCapability(Mixes))) i++;
+    if(i==GetEepromInterface()->getCapability(Mixes)) return &g_model.mixData[0];
+
+    memmove(&g_model.mixData[i+1],&g_model.mixData[i],
+            (GetEepromInterface()->getCapability(Mixes)-(i+1))*sizeof(MixData) );
+    memset(&g_model.mixData[i],0,sizeof(MixData));
+    g_model.mixData[i].destCh = dch;
+    return &g_model.mixData[i];
+}
diff --git a/companion/src/modeledit/templates.h b/companion/src/modeledit/templates.h
new file mode 100644
index 000000000..2f485f41e
--- /dev/null
+++ b/companion/src/modeledit/templates.h
@@ -0,0 +1,23 @@
+#ifndef TEMPLATES_H
+#define TEMPLATES_H
+
+#include <QWidget>
+#include "eeprominterface.h"
+
+class Templates : public QWidget
+{
+    Q_OBJECT
+
+  public:
+    Templates(QWidget *parent, ModelData & model);
+    ~Templates();
+
+  private slots:
+    void onDoubleClicked(QModelIndex index);
+
+  private:
+    void applyNumericTemplate(uint64_t tpl);
+    ModelData & model;
+};
+
+#endif // TEMPLATES_H
diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp
index e63959491..4f3b3eb02 100644
--- a/companion/src/modelslist.cpp
+++ b/companion/src/modelslist.cpp
@@ -51,7 +51,7 @@ public:
   }
   bool general_settings;
   uint8_t models_count;
-  uint8_t models[C9XMAX_MODELS];
+  uint8_t models[C9X_MAX_MODELS];
 };
 
 ModelsListWidget::ModelsListWidget(QWidget *parent):
@@ -226,7 +226,7 @@ void ModelsListWidget::dropEvent(QDropEvent *event)
     if (row < 0)
       return;
 
-    // QMessageBox::warning(this, tr("companion9x"),tr("Index :%1").arg(row));
+    // QMessageBox::warning(this, tr("Companion"),tr("Index :%1").arg(row));
     const QMimeData  *mimeData = event->mimeData();
     if(mimeData->hasFormat("application/x-companion9x"))
     {
@@ -360,9 +360,9 @@ void ModelsListWidget::deleteSelected(bool ask=true)
       }    
       if (isModel==true) {
         if (radioData->generalSettings.currModel != selModel) {
-          ret = QMessageBox::warning(this, "companion9x", tr("Delete Selected Models?"), QMessageBox::Yes | QMessageBox::No);
+          ret = QMessageBox::warning(this, "Companion", tr("Delete Selected Models?"), QMessageBox::Yes | QMessageBox::No);
         } else {
-          ret = QMessageBox::warning(this, "companion9x", tr("Cannot delete default model."), QMessageBox::Ok);
+          ret = QMessageBox::warning(this, "Companion", tr("Cannot delete default model."), QMessageBox::Ok);
         }
       }
     }
@@ -373,9 +373,9 @@ void ModelsListWidget::deleteSelected(bool ask=true)
           ((MdiChild *)parent())->setModified();
         } else if (index.row()>0) {
           if (ask) {
-            ret = QMessageBox::warning(this, "companion9x", tr("Cannot delete default model."), QMessageBox::Ok);
+            ret = QMessageBox::warning(this, "Companion", tr("Cannot delete default model."), QMessageBox::Ok);
           } else {
-            ret = QMessageBox::warning(this, "companion9x", tr("Cannot cut default model."), QMessageBox::Ok);
+            ret = QMessageBox::warning(this, "Companion", tr("Cannot cut default model."), QMessageBox::Ok);
           }
         }
       }
@@ -445,7 +445,7 @@ void ModelsListWidget::doPaste(QByteArray *gmData, int index)
     i++;
     gData++;
     if(c=='G') { //General settings
-      ret = QMessageBox::question(this, "companion9x", tr("Do you want to overwrite TX general settings?"),
+      ret = QMessageBox::question(this, "Companion", tr("Do you want to overwrite TX general settings?"),
               QMessageBox::Yes | QMessageBox::No);
       if (ret == QMessageBox::Yes) {
         radioData->generalSettings = *((GeneralSettings *)gData);
@@ -456,7 +456,7 @@ void ModelsListWidget::doPaste(QByteArray *gmData, int index)
     }
     else { //model data
       if (!radioData->models[id-1].isempty()) {
-        ret = QMessageBox::question(this, "companion9x", tr("You are pasting on an not empty model, are you sure?"),
+        ret = QMessageBox::question(this, "Companion", tr("You are pasting on an not empty model, are you sure?"),
                 QMessageBox::Yes | QMessageBox::No);
         if (ret == QMessageBox::Yes) {
           radioData->models[id-1] = *((ModelData *)gData);
@@ -519,7 +519,7 @@ void ModelsListWidget::duplicate()
           i++;
         }
         if (i==GetEepromInterface()->getMaxModels()) {
-          QMessageBox::warning(this, "companion9x", tr("No free slot available, cannot duplicate"), QMessageBox::Ok);
+          QMessageBox::warning(this, "Companion", tr("No free slot available, cannot duplicate"), QMessageBox::Ok);
         }
     }
 }
diff --git a/companion/src/modelslist.h b/companion/src/modelslist.h
index 02e1f6f73..8d6e73e83 100644
--- a/companion/src/modelslist.h
+++ b/companion/src/modelslist.h
@@ -48,7 +48,7 @@
 struct CurrentSelection
 {
   QListWidgetItem *current_item;
-  bool selected[C9XMAX_MODELS+1];
+  bool selected[C9X_MAX_MODELS+1];
 };
 
 class ModelsListWidget : public QListWidget
diff --git a/companion/src/preferencesdialog.cpp b/companion/src/preferencesdialog.cpp
index 6afa8ee9a..1d98d55ac 100644
--- a/companion/src/preferencesdialog.cpp
+++ b/companion/src/preferencesdialog.cpp
@@ -239,11 +239,11 @@ void preferencesDialog::firmwareChanged()
   }
   else {
     if (ui->fw_dnld->isEnabled()) {
-      ui->FwInfo->setText(tr("The selected firmware has never been downloaded by companion9x."));
+      ui->FwInfo->setText(tr("The selected firmware has never been downloaded by Companion."));
         ui->checkFWUpdates->hide();   
     }
     else {
-      ui->FwInfo->setText(tr("The selected firmware cannot be downloaded by companion9x."));
+      ui->FwInfo->setText(tr("The selected firmware cannot be downloaded by Companion."));
       ui->checkFWUpdates->hide();
     }
   }
@@ -506,10 +506,10 @@ void preferencesDialog::populateLocale()
   if (!strl.count()) return;
 
   QDir directory = QDir(":/");
-  QStringList files = directory.entryList(QStringList("companion9x_*.qm"), QDir::Files | QDir::NoSymLinks);
+  QStringList files = directory.entryList(QStringList("companion_*.qm"), QDir::Files | QDir::NoSymLinks);
 
   foreach(QString file, files) {
-    QLocale loc(file.mid(12, 2));
+    QLocale loc(file.mid(10, 2));
     ui->locale_QB->addItem(QLocale::languageToString(loc.language()), loc.name());
   }
 }
@@ -660,7 +660,7 @@ void preferencesDialog::on_ProfSave_PB_clicked()
   QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
   QString name=ui->ProfName_LE->text();
   if (name.isEmpty()) {
-    int ret = QMessageBox::question(this, "companion9x", 
+    int ret = QMessageBox::question(this, "Companion", 
                 tr("Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ?").arg(ui->ProfSlot_SB->value()) ,
                 QMessageBox::Yes | QMessageBox::No);
     if (ret==QMessageBox::Yes) {
@@ -719,7 +719,7 @@ void preferencesDialog::on_import_PB_clicked()
     QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
     QString name=ui->ProfName_LE->text();
     if (!name.isEmpty()) {
-      int ret = QMessageBox::question(this, "companion9x", 
+      int ret = QMessageBox::question(this, "Companion", 
                   tr("Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ?").arg(ui->ProfSlot_SB->value()) ,
                   QMessageBox::Yes | QMessageBox::No);
       if (ret==QMessageBox::No) {
diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp
index 6a287179e..ac1cc9feb 100644
--- a/companion/src/printdialog.cpp
+++ b/companion/src/printdialog.cpp
@@ -157,7 +157,7 @@ QString printDialog::printPhases()
     if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetEepromInterface()->getCapability(HasVariants) && GetEepromInterface()->getCapability(Gvars))) {
       if (GetEepromInterface()->getCapability(GvarsFlightPhases)) {
         gvars=1;
-        gvarnum=GetEepromInterface()->getCapability(GvarsNum);
+        gvarnum=GetEepromInterface()->getCapability(Gvars);
       }
     }
 
@@ -261,23 +261,8 @@ void printDialog::printExpo()
       };
 
       str += tr("Weight") + QString("%1").arg(getGVarString(ed->weight,true)).rightJustified(6, ' ');
-      if (!GetEepromInterface()->getCapability(ExpoIsCurve)) {
-        if (ed->expo!=0) {
-          if (ed->expo<126) {
-            str += " " + tr("Expo") + QString("%1").arg(getGVarString(ed->expo)).rightJustified(7, ' ');
-          } else {
-            str += " " + tr("Expo") + QString("%1").arg(getGVarString(ed->expo)).rightJustified(7, ' ');
-          }
-        }
-      } else {
-        if (ed->curveMode==0 && ed->curveParam!=0) {
-          if (ed->curveParam<126) {
-            str += " " + tr("Expo") + QString("%1").arg(getGVarString(ed->curveParam)).rightJustified(7, ' ');
-          } else {
-            str += " " + tr("Expo") + QString("%1").arg(getGVarString(ed->curveParam)).rightJustified(7, ' ');
-          }
-        }
-      }   
+      str += ed->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
+
       if (GetEepromInterface()->getCapability(FlightPhases)) {
         if(ed->phases) {
           if (ed->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
@@ -316,9 +301,7 @@ void printDialog::printExpo()
       } 
       if (ed->swtch.type) 
         str += " " + tr("Switch") + QString("(%1)").arg(ed->swtch.toString());
-      if (ed->curveMode)
-        if (ed->curveParam) 
-            str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(ed->curveParam).replace("<", "&lt;").replace(">", "&gt;"));
+      str += ed->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
       if (GetEepromInterface()->getCapability(HasExpoNames)) {
         QString ExpoName;
         ExpoName.append(ed->name);
@@ -370,13 +353,8 @@ void printDialog::printMixes()
       str += md->srcRaw.toString();
       if (md->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
       if (md->carryTrim) str += " " + tr("noTrim");
-      if(GetEepromInterface()->getCapability(MixFmTrim) && md->enableFmTrim==1){ 
-        if (md->sOffset)  str += " "+ tr("FMTrim") + QString(" %1").arg(getGVarString(md->sOffset));
-      } else {
-        if (md->sOffset)  str += " "+ tr("Offset") + QString(" %1").arg(getGVarString(md->sOffset));           
-      }
-      if (md->differential)  str += " "+ tr("Diff") + QString(" %1").arg(getGVarString(md->differential));
-      if (md->curve) str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(md->curve).replace("<", "&lt;").replace(">", "&gt;"));
+      if (md->sOffset)  str += " "+ tr("Offset") + QString(" %1").arg(getGVarString(md->sOffset));
+      str += md->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
       float scale=GetEepromInterface()->getCapability(SlowScale);
       if (md->delayDown || md->delayUp) str += tr(" Delay(u%1:d%2)").arg(md->delayUp/scale).arg(md->delayDown/scale);
       if (md->speedDown || md->speedUp) str += tr(" Slow(u%1:d%2)").arg(md->speedUp/scale).arg(md->speedDown/scale);
@@ -566,101 +544,7 @@ void printDialog::printCurves()
     if (numcurves==0) {
       numcurves=16;
     }
-    if (!GetEepromInterface()->getCapability(CustomCurves)) {
-      QImage qi(ISIZE+1,ISIZE+1,QImage::Format_RGB32);
-      QPainter painter(&qi);
-      painter.setBrush(QBrush("#FFFFFF"));
-      painter.setPen(QColor(0,0,0));
-      painter.drawRect(0,0,ISIZE,ISIZE);
-      str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=2><b>"+tr("5 Points Curves")+QString("</b></td></tr><tr><td width=\"200\"><img src=\"%1\" border=0></td><td><table border=1 cellspacing=0 cellpadding=3 width=\"100%\">").arg(curvefile5));
-      str.append("<tr>");
-      str.append(doTC("&nbsp;"));
-      for(i=0; i<5; i++) 
-          str.append(doTC(tr("pt %1").arg(i+1), "", true));
-      str.append("</tr>");
-      for(i=0; i<8; i++) {
-        pen.setColor(*qplot_color[i]);
-        painter.setPen(pen);
-        qplot_color[i]->getRgb(&r,&g,&b);
-        c=r;
-        c*=256;
-        c+=g;
-        c*=256;
-        c+=b;
-        sprintf(buffer,"%06x",c);
-        str.append("<tr>");
-        str.append(QString("<td width=\"70\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1));
-        count=0;
-        for(int j=0; j<5; j++) {
-          if (g_model->curves[i].points[j].y!=0)
-            count++;
-        }
-        for(int j=0; j<5; j++) {    
-          str.append(doTR(QString::number(g_model->curves[i].points[j].y),"green"));
-          if (j>0 && count!=0) {
-            painter.drawLine(ISIZE*(j-1)/4,ISIZE/2-(ISIZE*g_model->curves[i].points[j-1].y)/200,ISIZE*(j)/4,ISIZE/2-(ISIZE*g_model->curves[i].points[j].y)/200);
-          }
-        }
-        str.append("</tr>");
-      }
-      str.append("</table></td></tr></table></td></tr><tr><td>");
-      painter.setPen(QColor(0,0,0));
-      painter.drawLine(0,ISIZE/2,ISIZE,ISIZE/2);
-      painter.drawLine(ISIZE/2,0,ISIZE/2,ISIZE);
-      for(i=0; i<5; i++) {
-        painter.drawLine(ISIZE/2-2,(ISIZE*i)/4,ISIZE/2+2,(ISIZE*i)/4);
-        painter.drawLine((ISIZE*i)/4,ISIZE/2-2,(ISIZE*i)/4,ISIZE/2+2);
-      }
-
-      qi.save(curvefile5, "png",100); 
-      str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=2><b>"+tr("9 Points Curves")+QString("</b></td></tr><tr><td width=\"200\"><img src=\"%1\" border=0></td><td><table border=1 cellspacing=0 cellpadding=3 width=\"100%\">").arg(curvefile9));
-      str.append("<tr><td width=\"70\">&nbsp;</td>");
-      for(i=0; i<9; i++) str.append(doTC(tr("pt %1").arg(i+1), "", true));
-      str.append("</tr>");
-
-      painter.setBrush(QBrush("#FFFFFF"));
-      painter.setPen(QColor(0,0,0));
-      painter.drawRect(0,0,ISIZE,ISIZE);
-      for(i=0; i<9; i++) {
-        painter.drawLine(ISIZE/2-2,(ISIZE*i)/8,ISIZE/2+2,(ISIZE*i)/8);
-        painter.drawLine((ISIZE*i)/8,ISIZE/2-2,(ISIZE*i)/8,ISIZE/2+2);
-      }
-      for(i=0; i<8; i++) {
-        pen.setColor(*qplot_color[i]);
-        painter.setPen(pen);
-        qplot_color[i]->getRgb(&r,&g,&b);
-        c=r;
-        c*=256;
-        c+=g;
-        c*=256;
-        c+=b;
-        sprintf(buffer,"%06x",c);
-        str.append("<tr>");
-        str.append(QString("<td width=\"70\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+9));
-        count=0;
-        for(int j=0; j<9; j++) {
-          if (g_model->curves[i].points[j].y!=0)
-            count++;
-        }
-        for(int j=0; j<9; j++) {
-          str.append(doTR(QString::number(g_model->curves[i].points[j].y),"green"));
-          if (j>0 && count!=0) {
-            painter.drawLine(ISIZE*(j-1)/8,ISIZE/2-(ISIZE*g_model->curves[i+8].points[j-1].y)/200,ISIZE*(j)/8,ISIZE/2-(ISIZE*g_model->curves[i+8].points[j].y)/200);
-          }
-        }
-        str.append("</tr>");
-      }
-      str.append("</table></td></tr></table></td></tr></table>");
-      str.append("<br>");
-      painter.setPen(QColor(0,0,0));
-      painter.drawLine(0,ISIZE/2,ISIZE,ISIZE/2);
-      painter.drawLine(ISIZE/2,0,ISIZE/2,ISIZE);
-      for(i=0; i<9; i++) {
-        painter.drawLine(ISIZE/2-2,(ISIZE*i)/8,ISIZE/2+2,(ISIZE*i)/8);
-        painter.drawLine((ISIZE*i)/8,ISIZE/2-2,(ISIZE*i)/8,ISIZE/2+2);
-      }
-      qi.save(curvefile9, "png",100);     
-    } else {
+    {
       QImage qi(ISIZEW+1,ISIZEW+1,QImage::Format_RGB32);
       QPainter painter(&qi);
       painter.setBrush(QBrush("#FFFFFF"));
@@ -703,11 +587,10 @@ void printDialog::printCurves()
         sprintf(buffer,"%06x",c);
         str.append("<tr>");
         int curvepoints=g_model->curves[i].count;
-        if (!g_model->curves[i].custom) {
-          str.append(QString("<td width=\"70\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td><td width=5>Y</td>").arg(i+1));
-        } else {
+        if (g_model->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
           str.append(QString("<td width=\"70\" rowspan=2 valign=middle><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td><td width=5>Y</td>").arg(i+1));
-        }
+        else
+          str.append(QString("<td width=\"70\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td><td width=5>Y</td>").arg(i+1));
         count=0;
         for(int j=0; j<curvepoints; j++) {
           if (g_model->curves[i].points[j].y!=0)
@@ -716,18 +599,17 @@ void printDialog::printCurves()
         for(int j=0; j<curvepoints; j++) {    
           str.append(doTR(QString::number(g_model->curves[i].points[j].y),"green"));
           if (j>0 && count!=0) {
-            if (!g_model->curves[i].custom) {
-              painter.drawLine(ISIZEW*(j-1)/(curvepoints-1),ISIZEW/2-(ISIZEW*g_model->curves[i].points[j-1].y)/200,ISIZEW*(j)/(curvepoints-1),ISIZEW/2-(ISIZEW*g_model->curves[i].points[j].y)/200);
-            } else {
+            if (g_model->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
               painter.drawLine(ISIZEW/2+(ISIZEW*g_model->curves[i].points[j-1].x)/200,ISIZEW/2-(ISIZEW*g_model->curves[i].points[j-1].y)/200,ISIZEW/2+(ISIZEW*g_model->curves[i].points[j].x)/200,ISIZEW/2-(ISIZEW*g_model->curves[i].points[j].y)/200);
-            }
+            else
+              painter.drawLine(ISIZEW*(j-1)/(curvepoints-1),ISIZEW/2-(ISIZEW*g_model->curves[i].points[j-1].y)/200,ISIZEW*(j)/(curvepoints-1),ISIZEW/2-(ISIZEW*g_model->curves[i].points[j].y)/200);
           }
         }
         for(int j=curvepoints; j<numpoint; j++) {
           str.append(doTR("","green"));
         }     
         str.append("</tr>");
-        if (g_model->curves[i].custom) {
+        if (g_model->curves[i].type == CurveData::CURVE_TYPE_CUSTOM) {
           str.append("<tr><td width=5>X</td>");
           for(int j=0; j<curvepoints; j++) {    
             str.append(doTR(QString::number(g_model->curves[i].points[j].x),"green"));
@@ -787,7 +669,7 @@ void printDialog::printGvars()
   int gvarnum=0;
   if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetEepromInterface()->getCapability(HasVariants) && GetEepromInterface()->getCapability(Gvars))) {
     gvars=1;
-    gvarnum=GetEepromInterface()->getCapability(GvarsNum);
+    gvarnum=GetEepromInterface()->getCapability(Gvars);
   }
   if (!GetEepromInterface()->getCapability(GvarsFlightPhases) && (gvars==1 && GetEepromInterface()->getCapability(Gvars))) {
     QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
diff --git a/companion/src/simulatordialog.cpp b/companion/src/simulatordialog.cpp
index b55a4db82..0e3d2a688 100644
--- a/companion/src/simulatordialog.cpp
+++ b/companion/src/simulatordialog.cpp
@@ -227,7 +227,7 @@ void simulatorDialog::onTimerEvent()
 {
   static unsigned int lcd_counter = 0;
   if (!simulator->timer10ms()) {
-    QMessageBox::critical(this, "companion9x", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError()));
+    QMessageBox::critical(this, "Companion", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError()));
     timer->stop();
     return;
   }
diff --git a/companion/src/simulatordialog.h b/companion/src/simulatordialog.h
index b50629a7a..65edcb9e5 100644
--- a/companion/src/simulatordialog.h
+++ b/companion/src/simulatordialog.h
@@ -2,7 +2,7 @@
 #define SIMULATORDIALOG_H
 
 #include <QDialog>
-#include "node.h"
+#include "modeledit/node.h"
 #include "eeprominterface.h"
 #ifdef JOYSTICKS
 #include "joystick.h"
diff --git a/companion/src/simulatordialog.ui b/companion/src/simulatordialog.ui
index 2c9b67de3..004da67c6 100644
--- a/companion/src/simulatordialog.ui
+++ b/companion/src/simulatordialog.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Companion9x Simulator</string>
+   <string>Companion Simulator</string>
   </property>
   <property name="windowIcon">
    <iconset resource="companion9x.qrc">
@@ -1092,6 +1092,7 @@ QPushButton:checked {
            </property>
           </widget>
          </item>
+
          <item row="0" column="4" rowspan="3">
           <widget class="menuWidget" name="menu" native="true">
            <property name="sizePolicy">
@@ -1810,6 +1811,7 @@ QPushButton:checked {
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
+
            <property name="lineWidth">
             <number>2</number>
            </property>
@@ -2294,6 +2296,7 @@ border-radius: 4px;
          </item>
          <item row="0" column="0">
           <widget class="QLabel" name="label_ch01">
+
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
diff --git a/companion/src/translations.qrc.in b/companion/src/translations.qrc.in
index d01dd945f..434cbd225 100644
--- a/companion/src/translations.qrc.in
+++ b/companion/src/translations.qrc.in
@@ -1,12 +1,12 @@
 <!DOCTYPE RCC><RCC version="1.0">
     <qresource prefix="/">
-        <file>companion9x_fr.qm</file>
-        <file>companion9x_de.qm</file>
-        <file>companion9x_he.qm</file>
-        <file>companion9x_it.qm</file>
-        <file>companion9x_pt.qm</file>
-        <file>companion9x_ru.qm</file>
-        <file>companion9x_sv.qm</file>
-        <file>companion9x_cs.qm</file>
+        <file>companion_fr.qm</file>
+        <file>companion_de.qm</file>
+        <file>companion_he.qm</file>
+        <file>companion_it.qm</file>
+        <file>companion_pt.qm</file>
+        <file>companion_ru.qm</file>
+        <file>companion_sv.qm</file>
+        <file>companion_cs.qm</file>
     </qresource>
 </RCC>
diff --git a/companion/src/translations/companion9x_cs.ts b/companion/src/translations/companion_cs.ts
similarity index 94%
rename from companion/src/translations/companion9x_cs.ts
rename to companion/src/translations/companion_cs.ts
index c6bef50cc..d656507aa 100644
--- a/companion/src/translations/companion9x_cs.ts
+++ b/companion/src/translations/companion_cs.ts
@@ -1239,9 +1239,9 @@ Opravdu to takto chcete ?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="147"/>
-        <location filename="../mainwindow.cpp" line="635"/>
-        <location filename="../mainwindow.cpp" line="669"/>
-        <location filename="../mainwindow.cpp" line="2161"/>
+        <location filename="../mainwindow.cpp" line="636"/>
+        <location filename="../mainwindow.cpp" line="670"/>
+        <location filename="../mainwindow.cpp" line="2162"/>
         <source>File loaded</source>
         <translation>Soubor byl načten</translation>
     </message>
@@ -1259,22 +1259,21 @@ Opravdu to takto chcete ?</translation>
         <location filename="../mainwindow.cpp" line="246"/>
         <location filename="../mainwindow.cpp" line="289"/>
         <location filename="../mainwindow.cpp" line="467"/>
-        <location filename="../mainwindow.cpp" line="589"/>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="590"/>
+        <location filename="../mainwindow.cpp" line="594"/>
         <source>Unable to check for updates.</source>
         <translation>Nelze ověřit aktualizace.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="260"/>
         <source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
-        <translation>Je dostupná nová verze companion9x (verze %1)&lt;br&gt;Chcete ji stáhnout nyní?</translation>
+        <translation type="obsolete">Je dostupná nová verze companion9x (verze %1)&lt;br&gt;Chcete ji stáhnout nyní?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="268"/>
         <location filename="../mainwindow.cpp" line="270"/>
         <location filename="../mainwindow.cpp" line="310"/>
-        <location filename="../mainwindow.cpp" line="570"/>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="571"/>
+        <location filename="../mainwindow.cpp" line="573"/>
         <source>Save As</source>
         <translation>Uložit jako</translation>
     </message>
@@ -1289,13 +1288,12 @@ Opravdu to takto chcete ?</translation>
         <translation>Je dostupné nové vydání</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="281"/>
         <source>A new release of companion is available please check the repository</source>
-        <translation>Je dostupné nové vydání companion9x, prosím zkontrolujte repozitář</translation>
+        <translation type="obsolete">Je dostupné nové vydání companion9x, prosím zkontrolujte repozitář</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="285"/>
-        <location filename="../mainwindow.cpp" line="543"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>No updates available at this time.</source>
         <translation>žádné aktualizace nejsou nyní dostupné.</translation>
     </message>
@@ -1309,24 +1307,24 @@ Opravdu to takto chcete ?</translation>
         <location filename="../mainwindow.cpp" line="366"/>
         <location filename="../mainwindow.cpp" line="377"/>
         <location filename="../mainwindow.cpp" line="406"/>
-        <location filename="../mainwindow.cpp" line="901"/>
-        <location filename="../mainwindow.cpp" line="2066"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
-        <location filename="../mainwindow.cpp" line="2124"/>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="338"/>
         <location filename="../mainwindow.cpp" line="378"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
         <source>Error opening file %1:
 %2.</source>
         <translation>Chyba při otevírání souboru %1:
@@ -1366,10 +1364,8 @@ Opravdu to takto chcete ?</translation>
         <translation>Server companion je zaneprázdněn, zkuste to později</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="359"/>
-        <location filename="../mainwindow.cpp" line="399"/>
         <source>Compilation server requires registration, please check opentx web site</source>
-        <translation>Kompilační server vyžaduje registraci. Více najdete na webu opentx.</translation>
+        <translation type="obsolete">Kompilační server vyžaduje registraci. Více najdete na webu opentx.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="362"/>
@@ -1382,7 +1378,7 @@ Opravdu to takto chcete ?</translation>
         <translation type="obsolete">Chcete nyní zapsat firmware do rádia ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="487"/>
+        <location filename="../mainwindow.cpp" line="488"/>
         <source>Firmware %1 does not seem to have ever been downloaded.
 Version %2 is available.
 Do you want to download it now ?</source>
@@ -1391,31 +1387,31 @@ Verze %2 je dostupná.
 Chcete ho nyní stáhnout ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
-        <location filename="../mainwindow.cpp" line="517"/>
+        <location filename="../mainwindow.cpp" line="489"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="489"/>
-        <location filename="../mainwindow.cpp" line="518"/>
+        <location filename="../mainwindow.cpp" line="490"/>
+        <location filename="../mainwindow.cpp" line="519"/>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="491"/>
-        <location filename="../mainwindow.cpp" line="520"/>
+        <location filename="../mainwindow.cpp" line="492"/>
+        <location filename="../mainwindow.cpp" line="521"/>
         <source>Release Notes</source>
         <translation>Poznámky k vydání</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="499"/>
-        <location filename="../mainwindow.cpp" line="529"/>
+        <location filename="../mainwindow.cpp" line="500"/>
+        <location filename="../mainwindow.cpp" line="530"/>
         <source>Do you want to download release %1 now ?</source>
         <translation>Chcete nyní stáhnout vydání %1 ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="516"/>
+        <location filename="../mainwindow.cpp" line="517"/>
         <source>A new version of %1 firmware is available (current %2 - newer %3).
 Do you want to download it now ?</source>
         <translation>Nová verze firmware %1 je dostupná.
@@ -1423,57 +1419,57 @@ Do you want to download it now ?</source>
 Chcete ji stáhnout nyní ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>Ignore this version (r%1)?</source>
         <translation>Ignorovat tuto verzi (r%1)?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="556"/>
+        <location filename="../mainwindow.cpp" line="557"/>
         <source>Release notes contain very important informations. Do you want to see them now ?</source>
         <translation>Poznámky k vydání mohou obsahovat důležité informace. Chcete si je přečíst nyní ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="623"/>
+        <location filename="../mainwindow.cpp" line="624"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="644"/>
-        <location filename="../mainwindow.cpp" line="650"/>
+        <location filename="../mainwindow.cpp" line="645"/>
+        <location filename="../mainwindow.cpp" line="651"/>
         <source>File saved</source>
         <translation>Soubor byl uložen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Firmware updates</source>
         <translation>Aktualizace firmwaru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Current firmware does not provide release notes informations.</source>
         <translation>K tomuto firmwaru nejsou poznámky k vydání.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="903"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Nelze zapsat soubor %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Taranis radio not found</source>
         <translation>Radio Taranis nenalezeno</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
         <source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
         <translation>Nebylo možné identifikovat rádio ve vašem systému, zkontrolujte zda je eeprom disk připojen.</translation>
     </message>
@@ -1494,16 +1490,16 @@ nebyl rozpoznán jako platná EEPROM
 Chcete ji přesto naprogramovat?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Backup is impossible</source>
         <translation>Není možné zálohovat</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation>Složka pro zálohování zvolená v předvolbách neexistuje</translation>
     </message>
@@ -1516,8 +1512,8 @@ Chcete ji přesto naprogramovat?</translation>
         <translation type="obsolete">Nelze ověřit kompatibilitu EEprom! Mám přesto pokračovat?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
@@ -1538,7 +1534,7 @@ Chcete ji přesto naprogramovat?</translation>
         <translation type="obsolete">Zapsat do paměti FLASH rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Conversion failed</source>
         <translation>Porovnání selhalo</translation>
     </message>
@@ -1551,7 +1547,7 @@ Chcete ji přesto naprogramovat?</translation>
         <translation type="obsolete">Zapsat EEPROM do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Restore failed</source>
         <translation>Zápis selhal</translation>
     </message>
@@ -1568,7 +1564,7 @@ Chcete ji přesto naprogramovat?</translation>
         <translation type="obsolete">Nemohu naprogramovat rádio, původní EEPROM najdete zde: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Backup failed</source>
         <translation>Zálohování selhalo</translation>
     </message>
@@ -1585,19 +1581,12 @@ Chcete ji přesto naprogramovat?</translation>
         <translation type="obsolete">Načíst paměť FLASH z rádia do souboru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="106"/>
-        <location filename="../mainwindow.cpp" line="721"/>
-        <location filename="../mainwindow.cpp" line="741"/>
         <source>companion9x - Models and Settings Editor - %1 - profile %2</source>
-        <translation>companion9x - Editor nastavení rádia a modelů - %1 - profile %2</translation>
+        <translation type="obsolete">companion9x - Editor nastavení rádia a modelů - %1 - profile %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="108"/>
-        <location filename="../mainwindow.cpp" line="715"/>
-        <location filename="../mainwindow.cpp" line="732"/>
-        <location filename="../mainwindow.cpp" line="743"/>
         <source>companion9x - Models and Settings Editor - %1</source>
-        <translation>companion9x - Editor nastavení rádia a modelů - %1</translation>
+        <translation type="obsolete">companion9x - Editor nastavení rádia a modelů - %1</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="430"/>
@@ -1605,10 +1594,10 @@ Chcete ji přesto naprogramovat?</translation>
         <translation>Chcete zapsat firmware do rádia nyní ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1051"/>
-        <location filename="../mainwindow.cpp" line="1058"/>
-        <location filename="../mainwindow.cpp" line="1427"/>
-        <location filename="../mainwindow.cpp" line="1434"/>
+        <location filename="../mainwindow.cpp" line="1052"/>
+        <location filename="../mainwindow.cpp" line="1059"/>
+        <location filename="../mainwindow.cpp" line="1428"/>
+        <location filename="../mainwindow.cpp" line="1435"/>
         <source>Read Models and Settings From Tx</source>
         <translation>Načíst modely a nastavení z rádia</translation>
     </message>
@@ -1617,18 +1606,49 @@ Chcete ji přesto naprogramovat?</translation>
         <source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
         <translation>Firmware s těmito vybranými součástmi, se již nevejde do rádia</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="106"/>
+        <location filename="../mainwindow.cpp" line="722"/>
+        <location filename="../mainwindow.cpp" line="742"/>
+        <source>Companion - Models and Settings Editor - %1 - profile %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="716"/>
+        <location filename="../mainwindow.cpp" line="733"/>
+        <location filename="../mainwindow.cpp" line="744"/>
+        <source>Companion - Models and Settings Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="260"/>
+        <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="281"/>
+        <source>A new release of Companion is available please check the repository</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="359"/>
+        <location filename="../mainwindow.cpp" line="399"/>
+        <source>Compilation server requires registration, please check OpenTX web site</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="390"/>
         <source>Firmware does not fit in the Tx, due to selected firmware options</source>
         <translation>Firmware s těmito vybranými součástmi, se již nevejde do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
+        <location filename="../mainwindow.cpp" line="1080"/>
         <source>Write Models and settings from %1 to the Tx?</source>
         <translation>Zapsat modely a nastavení z %1 do rádia?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1082"/>
+        <location filename="../mainwindow.cpp" line="1083"/>
         <source>The file %1
 has not been recognized as a valid Models and Settings file
 Write anyway ?</source>
@@ -1637,386 +1657,406 @@ neobsahuje platná data modelů a nastavení
 Chcete ho přesto zapsat ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1108"/>
-        <location filename="../mainwindow.cpp" line="1115"/>
-        <location filename="../mainwindow.cpp" line="1158"/>
-        <location filename="../mainwindow.cpp" line="1165"/>
-        <location filename="../mainwindow.cpp" line="1357"/>
-        <location filename="../mainwindow.cpp" line="1399"/>
+        <location filename="../mainwindow.cpp" line="1109"/>
+        <location filename="../mainwindow.cpp" line="1116"/>
+        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1166"/>
+        <location filename="../mainwindow.cpp" line="1358"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>Backup Models and Settings From Tx</source>
         <translation>Zálohovat modely a nastavení z rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1131"/>
+        <location filename="../mainwindow.cpp" line="1132"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation>Nelze ověřit kompatibilitu dat modelů a nastavení! Chcete přesto pokračovat?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
         <source>The transmitter firmware belongs to another product family, check file and preferences!</source>
         <translation>Firmware patří do jiné produktové rodiny, zkontrolujte nastavení předvoleb!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>The transmitter firmware is outdated, please upgrade!</source>
         <translation>Firmware rádia je zastaralý, aktualizujte ho prosím!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1180"/>
+        <location filename="../mainwindow.cpp" line="1181"/>
         <source>Write Models and Settings To Tx</source>
         <translation>Zapsat modely a nastavení do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1363"/>
-        <location filename="../mainwindow.cpp" line="1406"/>
+        <location filename="../mainwindow.cpp" line="1364"/>
+        <location filename="../mainwindow.cpp" line="1407"/>
         <source>Write Firmware To Tx</source>
         <translation>Zapsat firmware do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Cannot convert Models and Settings for use with this firmware, original data will be used</source>
         <translation>Nemohu konvertovat modely a nastavení pro použití s tímto firmwarem, budou použita původní data</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1375"/>
         <source>Restore Models and Settings To Tx</source>
         <translation>Obnovit modely a nastavení do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Could not restore Models and Settings to TX. The models and settings data file can be found at: %1</source>
         <translation>Nelze obnovit modely a nastavení do rádia. Soubor s modely a nastavením najdete v: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Firmware write failed</source>
         <translation>Zápis firmware selhal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Could not write firmware to to transmitter. The models and settings data file can be found at: %1</source>
         <translation>Nelze zapsat firmware do rádio. Data modelů a nastavení najdete v: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Cannot backup existing Models and Settings from TX. Firmware write process aborted</source>
         <translation>Nemohu zálohovat stávající modely a nastavení z rádia. Zápis firmware byl přerušen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1416"/>
+        <location filename="../mainwindow.cpp" line="1417"/>
         <source>Save transmitter Models and Settings to File</source>
         <translation>Uložit modely a nastavení do souboru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Impossible to identify the radio on your system, please verify that the eeprom disk is connected.</source>
         <translation>Nebylo možné identifikovat rádio ve vašem systému, zkontrolujte zda je eeprom disk připojen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1444"/>
+        <location filename="../mainwindow.cpp" line="1445"/>
         <source>Read Tx Firmware to File</source>
         <translation>Načíst firmware z rádia a uložit do souboru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1492"/>
+        <location filename="../mainwindow.cpp" line="1493"/>
         <source>Copyright</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1493"/>
+        <location filename="../mainwindow.cpp" line="1494"/>
         <source>Version %1 (revision %2), %3</source>
         <translation>Verze %1 (revize %2), %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1494"/>
         <source>The companion9x project was originally forked from eePe</source>
-        <translation>Projekt companion9x vznikl oddělením z eePe</translation>
+        <translation type="obsolete">Projekt companion9x vznikl oddělením z eePe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1495"/>
+        <location filename="../mainwindow.cpp" line="1496"/>
         <source>If you&apos;ve found this program useful, please support by</source>
         <translation>Pokud vám byl tento program užitečný, podpořte jej</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1497"/>
+        <location filename="../mainwindow.cpp" line="1498"/>
         <source>donating</source>
         <translation>darem</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1499"/>
         <source>About companion9x</source>
-        <translation>O aplikaci Companion9x</translation>
+        <translation type="obsolete">O aplikaci Companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1563"/>
-        <location filename="../mainwindow.cpp" line="2019"/>
-        <location filename="../mainwindow.cpp" line="2040"/>
+        <location filename="../mainwindow.cpp" line="1564"/>
+        <location filename="../mainwindow.cpp" line="2020"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
         <source>&amp;%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1565"/>
+        <location filename="../mainwindow.cpp" line="1566"/>
         <source>%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
         <source>&amp;New</source>
         <translation>&amp;Nový</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
         <source>Create a new file</source>
         <translation>Vytvořit nový soubor</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1598"/>
         <source>&amp;Open...</source>
         <translation>&amp;Otevřít...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
+        <location filename="../mainwindow.cpp" line="1600"/>
         <source>Open an existing file</source>
         <translation>Otevřít existující soubor</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>&amp;loadBackup...</source>
         <translation>&amp;Načíst zálohu...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>Load backup from file</source>
         <translation>Načíst zálohu ze souboru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1607"/>
         <source>&amp;Save</source>
         <translation>&amp;Uložit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1608"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Save the document to disk</source>
         <translation>Uložit dokument na disk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Save &amp;As...</source>
         <translation>Uložit j&amp;ako...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1613"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
         <source>Save the document under a new name</source>
         <translation>Uložit dokument s novým jménem</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Lo&amp;gs</source>
         <translation>Lo&amp;gy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Ctrl+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Open log file</source>
         <translation>Otevřít soubor s logy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
+        <location filename="../mainwindow.cpp" line="1622"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Předvolby...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
+        <location filename="../mainwindow.cpp" line="1623"/>
         <source>Edit general preferences</source>
         <translation>Nastavení obecných předvoleb</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>&amp;Check for updates...</source>
         <translation>&amp;Zkontrolovat aktualizace...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
         <source>Check for new version of companion9x/er9x</source>
-        <translation>Zkontolovat dostupnost nové verze companion9x/er9x</translation>
+        <translation type="obsolete">Zkontolovat dostupnost nové verze companion9x/er9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Contributors &amp;List...</source>
         <translation>&amp;Seznam přispěvatelů...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Show companion9x contributors list</source>
-        <translation>Zobrazit seznam přispěvatelů companion9x</translation>
+        <translation type="obsolete">Zobrazit seznam přispěvatelů companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>ChangeLog...</source>
         <translation>Změny...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
         <source>Show companion9x changelog</source>
-        <translation>Zobrazit změny ve verzích companion9x</translation>
+        <translation type="obsolete">Zobrazit změny ve verzích companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
+        <location filename="../mainwindow.cpp" line="1495"/>
+        <source>The Companion project was originally forked from eePe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1500"/>
+        <source>About Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Check for new version of Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1631"/>
+        <source>Show Companion contributors list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1635"/>
+        <source>Show Companion changelog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Firmware ChangeLog...</source>
         <translation>Změny firmware...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Show firmware changelog</source>
         <translation>Zobrazit změny ve firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Compare...</source>
         <translation>Porovnat...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Compare models</source>
         <translation>Porovnat modely</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Customize your &amp;TX...</source>
         <translation>&amp;Přizpůsobení loga...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Customize the splash screen of your TX</source>
         <translation>Přizpůsobení úvodního logo vašeho rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1653"/>
         <source>E&amp;xit</source>
         <translation>U&amp;končit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1655"/>
         <source>Exit the application</source>
         <translation>Ukončit aplikaci companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1659"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Vyjmout</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1661"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Vyjmout aktuální výběr a uložit do schránky</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopírovat</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1667"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Kopírovat aktuální výběr do schránky</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1671"/>
         <source>&amp;Paste</source>
         <translation>&amp;Vložit</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1673"/>
         <source>Paste the clipboard&apos;s contents into the current selection</source>
         <translation>Vložit obsah schránky na aktuální pozici</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1677"/>
+        <location filename="../mainwindow.cpp" line="1678"/>
         <source>&amp;Write Models and Settings To Tx</source>
         <translation>&amp;Zapsat modely a nastavení do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1679"/>
+        <location filename="../mainwindow.cpp" line="1680"/>
         <source>Write Models and Settings to transmitter</source>
         <translation>Zapsat modely a nastavení do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1682"/>
+        <location filename="../mainwindow.cpp" line="1683"/>
         <source>&amp;Read Models and Settings From Tx</source>
         <translation>&amp;Načíst modely a nastavení z rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1684"/>
+        <location filename="../mainwindow.cpp" line="1685"/>
         <source>Read Models and Settings from transmitter</source>
         <translation>Načíst modely a nastavení z rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
+        <location filename="../mainwindow.cpp" line="1688"/>
         <source>Write Firmware</source>
         <translation>Zapsat firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1688"/>
+        <location filename="../mainwindow.cpp" line="1689"/>
         <source>Write firmware to transmitter</source>
         <translation>Zapsat firmware do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1691"/>
+        <location filename="../mainwindow.cpp" line="1692"/>
         <source>Write Models and Settings from file to Tx</source>
         <translation>Zapsat modely a nastavení ze souboru do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1692"/>
+        <location filename="../mainwindow.cpp" line="1693"/>
         <source>Write Models and Settings from file to transmitter</source>
         <translation>Zapsat modely a nastavení ze souboru do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1695"/>
+        <location filename="../mainwindow.cpp" line="1696"/>
         <source>Save transmitter Models and Settings to file</source>
         <translation>Uložit modely a nastavení z rádia do souboru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1696"/>
+        <location filename="../mainwindow.cpp" line="1697"/>
         <source>Save the Models and Settings from the transmitter to a file</source>
         <translation>Uložit modely a nastavení z rádia do souboru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1699"/>
+        <location filename="../mainwindow.cpp" line="1700"/>
         <source>Read Firmware</source>
         <translation>Načíst firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1700"/>
+        <location filename="../mainwindow.cpp" line="1701"/>
         <source>Read firmware from transmitter</source>
         <translation>Načíst firmware z rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1704"/>
+        <location filename="../mainwindow.cpp" line="1705"/>
         <source>Configure software for reading from and writing to the transmitter</source>
         <translation>Nastavení softwaru pro čtení a zápis do rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1820"/>
+        <location filename="../mainwindow.cpp" line="1821"/>
         <source>&amp;Read/Write</source>
         <translation>Čtení/&amp;Zápis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1916"/>
+        <location filename="../mainwindow.cpp" line="1917"/>
         <source>Write</source>
         <translation>Zápis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
         <source>Invalid Models and Settings File %1</source>
         <translation>Neplatný soubor modelů a nastavení %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation>Neplatný binární soubor modelů a nastavení %1</translation>
     </message>
@@ -2025,7 +2065,7 @@ Chcete ho přesto zapsat ?</translation>
         <translation type="obsolete">&amp;Zapsat do EEPROM rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1678"/>
+        <location filename="../mainwindow.cpp" line="1679"/>
         <source>Ctrl+Alt+W</source>
         <translation></translation>
     </message>
@@ -2038,7 +2078,7 @@ Chcete ho přesto zapsat ?</translation>
         <translation type="obsolete">&amp;Načíst EEPROM z rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1683"/>
+        <location filename="../mainwindow.cpp" line="1684"/>
         <source>Ctrl+Alt+R</source>
         <translation></translation>
     </message>
@@ -2079,7 +2119,7 @@ Chcete ho přesto zapsat ?</translation>
         <translation type="obsolete">Načíst paměť FLASH z rádia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1703"/>
+        <location filename="../mainwindow.cpp" line="1704"/>
         <source>&amp;Configure...</source>
         <translation>&amp;Konfigurace...</translation>
     </message>
@@ -2088,154 +2128,154 @@ Chcete ho přesto zapsat ?</translation>
         <translation type="obsolete">Konfigurace programátoru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1708"/>
+        <location filename="../mainwindow.cpp" line="1709"/>
         <source>&amp;List programmers</source>
         <translation>&amp;Seznam programátorů</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1709"/>
+        <location filename="../mainwindow.cpp" line="1710"/>
         <source>List available programmers</source>
         <translation>Seznam použitelných programátorů</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1712"/>
+        <location filename="../mainwindow.cpp" line="1713"/>
         <source>&amp;Fuses...</source>
         <translation>Pojistky &amp;mikrokontroléru...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1713"/>
+        <location filename="../mainwindow.cpp" line="1714"/>
         <source>Show fuses dialog</source>
         <translation>Zobrazit dialog nastavení pojistek mikrokontroléru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1716"/>
+        <location filename="../mainwindow.cpp" line="1717"/>
         <source>&amp;Simulate</source>
         <translation>&amp;Simulátor</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1717"/>
+        <location filename="../mainwindow.cpp" line="1718"/>
         <source>Alt+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1718"/>
+        <location filename="../mainwindow.cpp" line="1719"/>
         <source>Simulate selected model.</source>
         <translation>Simulovat vybraný model.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1722"/>
+        <location filename="../mainwindow.cpp" line="1723"/>
         <source>&amp;Print</source>
         <translation>&amp;Tisk</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1723"/>
+        <location filename="../mainwindow.cpp" line="1724"/>
         <source>Ctrl+P</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location filename="../mainwindow.cpp" line="1725"/>
         <source>Print current model.</source>
         <translation>Vytisknout aktuální model.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1728"/>
+        <location filename="../mainwindow.cpp" line="1729"/>
         <source>Cl&amp;ose</source>
         <translation>&amp;Zavřít</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1729"/>
+        <location filename="../mainwindow.cpp" line="1730"/>
         <source>Close the active window</source>
         <translation>Zavřít aktivní okno</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1733"/>
+        <location filename="../mainwindow.cpp" line="1734"/>
         <source>Close &amp;All</source>
         <translation>Zavřít &amp;Vše</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1734"/>
+        <location filename="../mainwindow.cpp" line="1735"/>
         <source>Close all the windows</source>
         <translation>Zavřít všechna okna</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1738"/>
+        <location filename="../mainwindow.cpp" line="1739"/>
         <source>&amp;Tile</source>
         <translation>D&amp;laždice</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1739"/>
+        <location filename="../mainwindow.cpp" line="1740"/>
         <source>Tile the windows</source>
         <translation>Uspořádat okna jako dlaždice</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1742"/>
+        <location filename="../mainwindow.cpp" line="1743"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Kaskáda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1743"/>
+        <location filename="../mainwindow.cpp" line="1744"/>
         <source>Cascade the windows</source>
         <translation>Uspořádat okna do kaskády</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
+        <location filename="../mainwindow.cpp" line="1747"/>
         <source>Ne&amp;xt</source>
         <translation>&amp;Další</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1748"/>
+        <location filename="../mainwindow.cpp" line="1749"/>
         <source>Move the focus to the next window</source>
         <translation>Aktivovat následující okno</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1752"/>
+        <location filename="../mainwindow.cpp" line="1753"/>
         <source>Pre&amp;vious</source>
         <translation>&amp;Předchozí</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1754"/>
+        <location filename="../mainwindow.cpp" line="1755"/>
         <source>Move the focus to the previous window</source>
         <translation>Aktivovat předchozí okno</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1762"/>
+        <location filename="../mainwindow.cpp" line="1763"/>
         <source>&amp;About</source>
         <translation>&amp;O aplikaci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1763"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
         <source>Show the application&apos;s About box</source>
         <translation>O aplikaci companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1766"/>
+        <location filename="../mainwindow.cpp" line="1767"/>
         <source>Switch layout direction</source>
         <translation>Přepnout styl panelu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1767"/>
+        <location filename="../mainwindow.cpp" line="1768"/>
         <source>Switch layout Left/Right</source>
         <translation>Přepnout styl rozložení panelu vlevo/vpravo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1787"/>
-        <location filename="../mainwindow.cpp" line="1881"/>
+        <location filename="../mainwindow.cpp" line="1788"/>
+        <location filename="../mainwindow.cpp" line="1882"/>
         <source>Recent Files</source>
         <translation>Nedávné soubory</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1788"/>
-        <location filename="../mainwindow.cpp" line="1891"/>
+        <location filename="../mainwindow.cpp" line="1789"/>
+        <location filename="../mainwindow.cpp" line="1892"/>
         <source>Firmware Profiles</source>
         <translation>Profily firmwaru</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1790"/>
+        <location filename="../mainwindow.cpp" line="1791"/>
         <source>&amp;File</source>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1815"/>
+        <location filename="../mainwindow.cpp" line="1816"/>
         <source>&amp;Edit</source>
         <translation>&amp;Úpravy</translation>
     </message>
@@ -2244,22 +2284,22 @@ Chcete ho přesto zapsat ?</translation>
         <translation type="obsolete">&amp;Programátor</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1838"/>
+        <location filename="../mainwindow.cpp" line="1839"/>
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1844"/>
+        <location filename="../mainwindow.cpp" line="1845"/>
         <source>&amp;Help</source>
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1874"/>
+        <location filename="../mainwindow.cpp" line="1875"/>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1911"/>
+        <location filename="../mainwindow.cpp" line="1912"/>
         <source>Edit</source>
         <translation>Úpravy</translation>
     </message>
@@ -2268,17 +2308,17 @@ Chcete ho přesto zapsat ?</translation>
         <translation type="obsolete">Programátor</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1928"/>
+        <location filename="../mainwindow.cpp" line="1929"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location filename="../mainwindow.cpp" line="1936"/>
         <source>Ready</source>
         <translation>Připraven</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2066"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
         <source>Unable to find file %1!</source>
         <translation>Nemohu nalézt soubor %1!</translation>
     </message>
@@ -2287,7 +2327,7 @@ Chcete ho přesto zapsat ?</translation>
         <translation type="obsolete">Neplatný soubor EEPROM %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2124"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
         <source>Error reading file %1:
 %2.</source>
         <translation>Chyba při otevírání souboru %1:
@@ -2396,15 +2436,15 @@ Chcete ho přesto zapsat ?</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="182"/>
-        <location filename="../mdichild.cpp" line="187"/>
-        <location filename="../mdichild.cpp" line="470"/>
-        <source>companion9x</source>
-        <translation></translation>
+        <source>Do you want to use model wizard? </source>
+        <translation>Chcete použít průvodce nastavením modelu?</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="182"/>
-        <source>Do you want to use model wizard? </source>
-        <translation>Chcete použít průvodce nastavením modelu?</translation>
+        <location filename="../mdichild.cpp" line="187"/>
+        <location filename="../mdichild.cpp" line="470"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="187"/>
@@ -7772,18 +7812,26 @@ Formát ukládání obrázku loga v nastavení předvoleb se změnil.
 Zkontrolujte si nastavení loga v předvolbách.</translation>
     </message>
     <message>
-        <location filename="../warnings.h" line="5"/>
         <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
 
 We are really sensible to that!
 
 The openTX/C9X Team.</source>
-        <translation>Děkujeme všem za příspěvky, dobré nápady a přátelské emaily k chystenému modelu financování openTX/C9x.
+        <translation type="obsolete">Děkujeme všem za příspěvky, dobré nápady a přátelské emaily k chystenému modelu financování openTX/C9x.
 
 Vážíme si toho a nasloucháme!
 
 Tým OpenTX/C9X.</translation>
     </message>
+    <message>
+        <location filename="../warnings.h" line="5"/>
+        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
+
+We are really appreciative for that!
+
+The OpenTX/Companion Team.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>avrOutputDialog</name>
@@ -8146,8 +8194,8 @@ m2560 pro V4 desky</translation>
     <message>
         <location filename="../burnconfigdialog.cpp" line="328"/>
         <location filename="../burnconfigdialog.cpp" line="397"/>
-        <source>companion9x</source>
-        <translation></translation>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="329"/>
@@ -8251,6 +8299,11 @@ m2560 pro V4 desky</translation>
         <source>Browse for file</source>
         <translation>Procházet ...</translation>
     </message>
+    <message>
+        <location filename="../burndialog.ui" line="276"/>
+        <source>Allows Companion to write to older version of the firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burndialog.ui" line="289"/>
         <source>Backup and restore Models and Settings</source>
@@ -8262,9 +8315,8 @@ m2560 pro V4 desky</translation>
         <translation>Logo nastavené v předvolbách</translation>
     </message>
     <message>
-        <location filename="../burndialog.ui" line="276"/>
         <source>Allows companion9x to write to older version of the firmware</source>
-        <translation>Povolí zápis do starší verze firmware</translation>
+        <translation type="obsolete">Povolí zápis do starší verze firmware</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="279"/>
@@ -9147,29 +9199,39 @@ m2560 pro V4 desky</translation>
     <message>
         <location filename="../contributorsdialog.cpp" line="29"/>
         <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
+of course. Also to Erez Raviv (er9x) and the fantastic eePe program 
+which was the staring point for OpenTX Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contributorsdialog.cpp" line="46"/>
+        <source>Companion Release Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
 of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
 companion9x was forked out.</source>
-        <translation>Speciální poděkování patří Rafalu Tomczakovi (RadioClone),
+        <translation type="obsolete">Speciální poděkování patří Rafalu Tomczakovi (RadioClone),
 Thomasi Husteterovi (th9x) a také Erazovi Ravivovi(er9x) a jeho fantastickému eePe,
 na jehož základech companion9x vznikl.</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="31"/>
+        <location filename="../contributorsdialog.cpp" line="32"/>
         <source>Thank you all !!!</source>
         <translation>Děkujeme vám všem !!!</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="34"/>
+        <location filename="../contributorsdialog.cpp" line="35"/>
         <source>Contributors</source>
         <translation>Přispěvatelé</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="45"/>
         <source>Companion9x Release Notes</source>
-        <translation>Poznámky k vydání Companion9x</translation>
+        <translation type="obsolete">Poznámky k vydání Companion9x</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="50"/>
+        <location filename="../contributorsdialog.cpp" line="51"/>
         <source>OpenTX Release Notes</source>
         <translation>Poznámky k vydání OpenTX</translation>
     </message>
@@ -9324,8 +9386,8 @@ Obsahuje firmware podporu loga?</translation>
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="54"/>
-        <source>companion9x</source>
-        <translation></translation>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="55"/>
@@ -9668,9 +9730,13 @@ Tlačítkem Zrušit přerušíte kalibraci</translation>
 <context>
     <name>logsDialog</name>
     <message>
-        <location filename="../logsdialog.ui" line="14"/>
         <source>Companion9x log viewer</source>
-        <translation>Companion9x - zobrazení logu</translation>
+        <translation type="obsolete">Companion9x - zobrazení logu</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.ui" line="14"/>
+        <source>Companion Log Viewer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../logsdialog.ui" line="29"/>
@@ -9683,47 +9749,59 @@ Tlačítkem Zrušit přerušíte kalibraci</translation>
         <translation>Otevřít</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="131"/>
+        <location filename="../logsdialog.ui" line="94"/>
         <source>Zoom</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="138"/>
+        <location filename="../logsdialog.ui" line="101"/>
         <source>X</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="145"/>
+        <location filename="../logsdialog.ui" line="108"/>
         <source>Y</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="169"/>
+        <location filename="../logsdialog.ui" line="132"/>
         <source>Fly sessions</source>
         <translation>Lety</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="22"/>
+        <location filename="../logsdialog.cpp" line="27"/>
         <source>Telemetry logs</source>
         <translation>Logy telemetrie</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="23"/>
+        <location filename="../logsdialog.cpp" line="28"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="395"/>
+        <location filename="../logsdialog.cpp" line="252"/>
+        <source>Error</source>
+        <translation type="unfinished">Chyba</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="253"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation type="unfinished">Nelze zapsat soubor %1:
+%2.</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="582"/>
         <source>Select your log file</source>
         <translation>Vyberte soubor s logy</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="406"/>
+        <location filename="../logsdialog.cpp" line="593"/>
         <source>Available fields</source>
         <translation>Dostupná pole</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="501"/>
+        <location filename="../logsdialog.cpp" line="690"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation>Zvolený soubor logu obsahuje %1neplatných řádků z celkových %2</translation>
     </message>
@@ -10181,84 +10259,84 @@ Tlačítkem Zrušit přerušíte kalibraci</translation>
         <translation>Předvolby</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="80"/>
+        <location filename="../preferencesdialog.ui" line="93"/>
         <source>Check for selected Fw updates</source>
         <translation>Aktualizace vybraného firmware</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="92"/>
+        <location filename="../preferencesdialog.ui" line="105"/>
         <source>Ask use of wizard for new models</source>
         <translation>Zeptat se na použití průvodce pro nový model</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="141"/>
+        <location filename="../preferencesdialog.ui" line="154"/>
         <source>Invert Pixels</source>
         <translation>Invertovat</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="148"/>
-        <location filename="../preferencesdialog.ui" line="215"/>
+        <location filename="../preferencesdialog.ui" line="161"/>
+        <location filename="../preferencesdialog.ui" line="228"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="164"/>
+        <location filename="../preferencesdialog.ui" line="177"/>
         <source>Remember switches in simulator</source>
         <translation>Pamatovat si přepínače v simulátoru</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="295"/>
+        <location filename="../preferencesdialog.ui" line="439"/>
         <source>Enable</source>
         <translation>Povolit</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="312"/>
+        <location filename="../preferencesdialog.ui" line="456"/>
         <source>Calibrate</source>
         <translation>Kalibrovat</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="326"/>
-        <location filename="../preferencesdialog.ui" line="806"/>
-        <location filename="../preferencesdialog.ui" line="941"/>
-        <location filename="../preferencesdialog.ui" line="1008"/>
+        <location filename="../preferencesdialog.ui" line="470"/>
+        <location filename="../preferencesdialog.ui" line="662"/>
+        <location filename="../preferencesdialog.ui" line="837"/>
+        <location filename="../preferencesdialog.ui" line="972"/>
         <source>Open Folder</source>
         <translation>Vybrat složku</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="353"/>
+        <location filename="../preferencesdialog.ui" line="497"/>
         <source>FwInfo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="360"/>
+        <location filename="../preferencesdialog.ui" line="504"/>
         <source>Check for updates</source>
         <translation>Zkontrolovat aktualizace</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="232"/>
+        <location filename="../preferencesdialog.ui" line="245"/>
         <source>Open Image</source>
         <translation>Načíst obrázek</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="908"/>
+        <location filename="../preferencesdialog.ui" line="939"/>
         <source>Language</source>
         <translation>  Jazyk</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="883"/>
-        <location filename="../preferencesdialog.ui" line="924"/>
+        <location filename="../preferencesdialog.ui" line="914"/>
+        <location filename="../preferencesdialog.ui" line="955"/>
         <source>Download</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="890"/>
+        <location filename="../preferencesdialog.ui" line="921"/>
         <source>Set language of voice.
 May be different from firmware language</source>
         <translation>Vyberte jazykovou verzi hlasu tts(voice).
 Může být jiná než verze firmwaru</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="870"/>
+        <location filename="../preferencesdialog.ui" line="901"/>
         <source>Voice</source>
         <translation>Hlas tts</translation>
     </message>
@@ -10309,63 +10387,63 @@ Může být jiná než verze firmwaru</translation>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="433"/>
+        <location filename="../preferencesdialog.ui" line="577"/>
         <source>Ask for flashing after Download</source>
         <translation>Po stažení firmwaru se zeptat, zda ho hned zapsat do rádia </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="454"/>
+        <location filename="../preferencesdialog.ui" line="598"/>
         <source>Export Profile</source>
         <translation>Exportovat profil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="478"/>
+        <location filename="../preferencesdialog.ui" line="622"/>
         <source>Import Profile</source>
         <translation>Importovat profil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="488"/>
+        <location filename="../preferencesdialog.ui" line="632"/>
         <source>Profile Name</source>
         <translation>Název profilu</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="846"/>
+        <location filename="../preferencesdialog.ui" line="877"/>
         <source>Automatically add version number to the filename after download</source>
         <translation>Přidat číslo verze do názvu souboru staženého firmwaru </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="461"/>
+        <location filename="../preferencesdialog.ui" line="605"/>
         <source>Save Profile</source>
         <translation>Uložit profil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="58"/>
+        <location filename="../preferencesdialog.ui" line="71"/>
         <source>Simu BackLight</source>
         <oldsource>BackLight Color</oldsource>
         <translation>Barva podsvětlení Simu</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="172"/>
+        <location filename="../preferencesdialog.ui" line="185"/>
         <source>Blue</source>
         <translation>Modrá</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="177"/>
+        <location filename="../preferencesdialog.ui" line="190"/>
         <source>Green</source>
         <translation>Zelená</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="182"/>
+        <location filename="../preferencesdialog.ui" line="195"/>
         <source>Red</source>
         <translation>Červená</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="187"/>
+        <location filename="../preferencesdialog.ui" line="200"/>
         <source>Orange</source>
         <translation>Oranžová</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="192"/>
+        <location filename="../preferencesdialog.ui" line="205"/>
         <source>Yellow</source>
         <translation>Žlutá</translation>
     </message>
@@ -10374,22 +10452,22 @@ Může být jiná než verze firmwaru</translation>
         <translation type="obsolete">Kontrolovat aktualizace vybraného firmwaru </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="70"/>
+        <location filename="../preferencesdialog.ui" line="83"/>
         <source>Check for updates on startup</source>
         <translation>Aktualizace při spuštění</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="506"/>
+        <location filename="../preferencesdialog.ui" line="650"/>
         <source>Language (requires restart)</source>
         <translation>Jazyk companion (vyžaduje restart)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="286"/>
+        <location filename="../preferencesdialog.ui" line="430"/>
         <source>Custom TX splash screen</source>
         <translation>Vlastní úvodní logo</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="525"/>
+        <location filename="../preferencesdialog.ui" line="292"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
@@ -10399,27 +10477,27 @@ Toto je použito šablonami k určení
 který kanál patří ke kterému výstupu.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="964"/>
+        <location filename="../preferencesdialog.ui" line="995"/>
         <source>Firmware</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="663"/>
+        <location filename="../preferencesdialog.ui" line="694"/>
         <source>Default Stick Mode</source>
         <translation>Výchozí mód vysílačky</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="676"/>
+        <location filename="../preferencesdialog.ui" line="707"/>
         <source>Default Channel Order</source>
         <translation>Výchozí pořadí kanálů</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="273"/>
+        <location filename="../preferencesdialog.ui" line="51"/>
         <source>Show Splash Screen</source>
         <translation>Zobrazit úvodní logo</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="375"/>
+        <location filename="../preferencesdialog.ui" line="519"/>
         <source>Personal splash library</source>
         <translation>Vlastní knihovna s logy</translation>
     </message>
@@ -10428,7 +10506,7 @@ který kanál patří ke kterému výstupu.</translation>
         <translation type="obsolete">Pamatovat polohu přepínačů</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="686"/>
+        <location filename="../preferencesdialog.ui" line="717"/>
         <source>Mode selection:
 
 Mode 1:
@@ -10469,57 +10547,57 @@ Mode 4:
 </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="711"/>
+        <location filename="../preferencesdialog.ui" line="742"/>
         <source>Mode 1 (RUD ELE THR AIL)</source>
         <translation>Mode 1 (Směr.Výšk.Plyn.Křid)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="716"/>
+        <location filename="../preferencesdialog.ui" line="747"/>
         <source>Mode 2 (RUD THR ELE AIL)</source>
         <translation>Mode 2 (Směr.Plyn.Výšk.Křid)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="721"/>
+        <location filename="../preferencesdialog.ui" line="752"/>
         <source>Mode 3 (AIL ELE THR RUD)</source>
         <translation>Mode 3 (Křid.Výšk.Plyn.Směr)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="726"/>
+        <location filename="../preferencesdialog.ui" line="757"/>
         <source>Mode 4 (AIL THR ELE RUD)</source>
         <translation>Mode 4 (Křid.Plyn.Výšk.Směr)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="740"/>
+        <location filename="../preferencesdialog.ui" line="771"/>
         <source>Joystick</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="754"/>
+        <location filename="../preferencesdialog.ui" line="785"/>
         <source>Include companion splashes</source>
         <translation>Zahrnout i výchozí loga</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="759"/>
+        <location filename="../preferencesdialog.ui" line="790"/>
         <source>Only user defined splashes</source>
         <translation>Jen vlastní loga</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="773"/>
+        <location filename="../preferencesdialog.ui" line="804"/>
         <source>Splash library behaviour</source>
         <translation>Chování knihovny s logy</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="790"/>
+        <location filename="../preferencesdialog.ui" line="821"/>
         <source>Automatic Backup Folder</source>
         <translation>Složka pro automatické zálohy</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="977"/>
+        <location filename="../preferencesdialog.ui" line="1008"/>
         <source>SD Structure path</source>
         <translation>Cesta k obsahu SD karty</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="987"/>
+        <location filename="../preferencesdialog.ui" line="1018"/>
         <source>Processor ID</source>
         <translation>ID procesoru</translation>
     </message>
@@ -10529,7 +10607,17 @@ Mode 4:
         <translation>Počet položek nedávné historie</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="783"/>
+        <location filename="../preferencesdialog.ui" line="1616"/>
+        <source>Find Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="1625"/>
+        <source>Google Earth Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="814"/>
         <source>Profile slot</source>
         <translation>Slot profilu</translation>
     </message>
@@ -10538,7 +10626,7 @@ Mode 4:
         <translation type="obsolete">Složka pro zálohy EEprom</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="813"/>
+        <location filename="../preferencesdialog.ui" line="844"/>
         <source>auto backup before write</source>
         <translation>zálohovat před zápisem</translation>
     </message>
@@ -10547,53 +10635,66 @@ Mode 4:
         <translation type="obsolete">Složka zvukových dat</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="996"/>
+        <location filename="../preferencesdialog.ui" line="1027"/>
         <source>Simulator capture folder</source>
         <translation>Složka pro snímky obrazovky Simu</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="1025"/>
+        <location filename="../preferencesdialog.ui" line="679"/>
         <source>Use clipboard only</source>
         <translation>Kopírovat pouze do schránky</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="227"/>
+        <location filename="../preferencesdialog.cpp" line="233"/>
         <source>Last downloaded release: %1</source>
         <translation>Naposledy stažené vydání: %1</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="236"/>
         <source>The selected firmware has never been downloaded by companion9x.</source>
-        <translation>Zvolený firmware ještě nebyl stažen pomocí companion9x.</translation>
+        <translation type="obsolete">Zvolený firmware ještě nebyl stažen pomocí companion9x.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="240"/>
         <source>The selected firmware cannot be downloaded by companion9x.</source>
-        <translation>Companion9x nemůže stáhnout zvolený firmware.</translation>
+        <translation type="obsolete">Companion9x nemůže stáhnout zvolený firmware.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="447"/>
+        <location filename="../preferencesdialog.cpp" line="242"/>
+        <source>The selected firmware has never been downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="246"/>
+        <source>The selected firmware cannot be downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="461"/>
         <source>Image stored in settings</source>
         <translation>Logo nastavené v předvolbách</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="458"/>
-        <location filename="../preferencesdialog.cpp" line="780"/>
+        <location filename="../preferencesdialog.cpp" line="472"/>
+        <location filename="../preferencesdialog.cpp" line="804"/>
         <source>No joysticks found</source>
         <translation>Joystick nenalezen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="569"/>
+        <location filename="../preferencesdialog.cpp" line="583"/>
         <source>Select your Models and Settings backup folder</source>
         <translation>Zvolte složku pro automatické zálohy modelů a nastavení</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="597"/>
+        <location filename="../preferencesdialog.cpp" line="594"/>
+        <source>Select Google Earth executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="620"/>
         <source>Select the folder replicating your SD structure</source>
         <translation>Vyberte složku která představuje obsah SD karty rádia</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="641"/>
+        <location filename="../preferencesdialog.cpp" line="664"/>
         <source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
         <translation>Název profilu je prázdný, slot %1 bude smazán.&lt;br&gt;Jste si jist ?</translation>
     </message>
@@ -10660,7 +10761,7 @@ zatim ve zkušební verzi</translation>
         <translation type="obsolete">Podpora DSM2 modulů s použitím PPM místo sériového protokolu</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="532"/>
+        <location filename="../preferencesdialog.cpp" line="546"/>
         <source>Select your library folder</source>
         <oldsource>Support for SD memory card</oldsource>
         <translation>Vyberte složkus s logy</translation>
@@ -10739,7 +10840,7 @@ nutno zastavět hlasový modul</translation>
         <translation type="obsolete">Bez uživatelsky definovatelných křivek</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="542"/>
+        <location filename="../preferencesdialog.cpp" line="556"/>
         <source>Select your snapshot folder</source>
         <translation>Vyberte složku pro snímky obrazovky simulátoru</translation>
     </message>
@@ -10748,14 +10849,14 @@ nutno zastavět hlasový modul</translation>
         <translation type="obsolete">Vyber složku pro zálohování eeprom</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Cannot load %1.</source>
         <translation>Nemohu načíst %1.</translation>
     </message>
@@ -10768,27 +10869,27 @@ nutno zastavět hlasový modul</translation>
         <translation type="obsolete">Název profilu je prázdný, slot %1 bude odstraněn.&lt;br&gt;Souhlasíte ?</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="677"/>
+        <location filename="../preferencesdialog.cpp" line="701"/>
         <source>Export profile As</source>
         <translation>Exportovat profil jako</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="699"/>
+        <location filename="../preferencesdialog.cpp" line="723"/>
         <source>Profile slot is not empty, profile slot %1 will we overwritten.&lt;br&gt;Are you sure ?</source>
         <translation>Slot profilu není prázdný, slot %1 bude přepsán.&lt;br&gt;Jste si jist ?</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="705"/>
+        <location filename="../preferencesdialog.cpp" line="729"/>
         <source>Open Profile to import</source>
         <translation>Zvolte profil k importu</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Open Image to load</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Images (%1)</source>
         <translation>obrázky (%1)</translation>
     </message>
@@ -11397,9 +11498,13 @@ nutno zastavět hlasový modul</translation>
 <context>
     <name>simulatorDialog</name>
     <message>
-        <location filename="../simulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation>Companion9x Simulátor</translation>
+        <translation type="obsolete">Companion9x Simulátor</translation>
+    </message>
+    <message>
+        <location filename="../simulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../simulatordialog.ui" line="80"/>
@@ -11514,157 +11619,157 @@ nutno zastavět hlasový modul</translation>
         <translation>9x Simulátor</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1239"/>
+        <location filename="../simulatordialog.ui" line="1240"/>
         <source>Outputs</source>
         <translation>Výstupy</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1265"/>
+        <location filename="../simulatordialog.ui" line="1266"/>
         <source>CS1</source>
         <translation>VS1</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1296"/>
+        <location filename="../simulatordialog.ui" line="1297"/>
         <source>CS2</source>
         <translation>VS2</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1327"/>
+        <location filename="../simulatordialog.ui" line="1328"/>
         <source>CS3</source>
         <translation>VS3</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1358"/>
+        <location filename="../simulatordialog.ui" line="1359"/>
         <source>CS4</source>
         <translation>VS4</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1389"/>
+        <location filename="../simulatordialog.ui" line="1390"/>
         <source>CS5</source>
         <translation>VS5</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1420"/>
+        <location filename="../simulatordialog.ui" line="1421"/>
         <source>CS6</source>
         <translation>VS6</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1451"/>
+        <location filename="../simulatordialog.ui" line="1452"/>
         <source>CS7</source>
         <translation>VS7</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1482"/>
+        <location filename="../simulatordialog.ui" line="1483"/>
         <source>CS8</source>
         <translation>VS8</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1513"/>
+        <location filename="../simulatordialog.ui" line="1514"/>
         <source>CS9</source>
         <translation>VS9</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1544"/>
+        <location filename="../simulatordialog.ui" line="1545"/>
         <source>CSA</source>
         <translation>VSA</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1575"/>
+        <location filename="../simulatordialog.ui" line="1576"/>
         <source>CSB</source>
         <translation>VSB</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1606"/>
+        <location filename="../simulatordialog.ui" line="1607"/>
         <source>CSC</source>
         <translation>VSC</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1637"/>
+        <location filename="../simulatordialog.ui" line="1638"/>
         <source>CSD</source>
         <translation>VSD</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1668"/>
+        <location filename="../simulatordialog.ui" line="1669"/>
         <source>CSE</source>
         <translation>VSE</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1699"/>
+        <location filename="../simulatordialog.ui" line="1700"/>
         <source>CSF</source>
         <translation>VSF</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1730"/>
+        <location filename="../simulatordialog.ui" line="1731"/>
         <source>CSG</source>
         <translation>VSG</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1761"/>
+        <location filename="../simulatordialog.ui" line="1762"/>
         <source>CSH</source>
         <translation>VSH</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1792"/>
+        <location filename="../simulatordialog.ui" line="1793"/>
         <source>CSI</source>
         <translation>VSI</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1823"/>
+        <location filename="../simulatordialog.ui" line="1825"/>
         <source>CSJ</source>
         <translation>VSJ</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1885"/>
+        <location filename="../simulatordialog.ui" line="1887"/>
         <source>CSL</source>
         <translation>VSL</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1916"/>
+        <location filename="../simulatordialog.ui" line="1918"/>
         <source>CSM</source>
         <translation>VSM</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1947"/>
+        <location filename="../simulatordialog.ui" line="1949"/>
         <source>CSN</source>
         <translation>VSN</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1978"/>
+        <location filename="../simulatordialog.ui" line="1980"/>
         <source>CSO</source>
         <translation>VSO</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2009"/>
+        <location filename="../simulatordialog.ui" line="2011"/>
         <source>CSP</source>
         <translation>VSP</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2040"/>
+        <location filename="../simulatordialog.ui" line="2042"/>
         <source>CSQ</source>
         <translation>VSQ</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2071"/>
+        <location filename="../simulatordialog.ui" line="2073"/>
         <source>CSR</source>
         <translation>VSR</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2102"/>
+        <location filename="../simulatordialog.ui" line="2104"/>
         <source>CSS</source>
         <translation>VSS</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2133"/>
+        <location filename="../simulatordialog.ui" line="2135"/>
         <source>CST</source>
         <translation>VST</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2164"/>
+        <location filename="../simulatordialog.ui" line="2166"/>
         <source>CSU</source>
         <translation>VSU</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2195"/>
+        <location filename="../simulatordialog.ui" line="2197"/>
         <source>CSV</source>
         <translation>VSV</translation>
     </message>
@@ -11750,7 +11855,7 @@ nutno zastavět hlasový modul</translation>
         <translation type="obsolete">VSJ</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1854"/>
+        <location filename="../simulatordialog.ui" line="1856"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation>VSK</translation>
@@ -11800,108 +11905,108 @@ nutno zastavět hlasový modul</translation>
         <translation type="obsolete">VSV</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2226"/>
+        <location filename="../simulatordialog.ui" line="2228"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation>VSW</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2307"/>
+        <location filename="../simulatordialog.ui" line="2310"/>
         <source>CH1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2326"/>
-        <location filename="../simulatordialog.ui" line="2348"/>
-        <location filename="../simulatordialog.ui" line="2506"/>
-        <location filename="../simulatordialog.ui" line="2528"/>
-        <location filename="../simulatordialog.ui" line="2686"/>
-        <location filename="../simulatordialog.ui" line="2708"/>
-        <location filename="../simulatordialog.ui" line="2866"/>
-        <location filename="../simulatordialog.ui" line="2888"/>
-        <location filename="../simulatordialog.ui" line="3040"/>
-        <location filename="../simulatordialog.ui" line="3062"/>
-        <location filename="../simulatordialog.ui" line="3165"/>
-        <location filename="../simulatordialog.ui" line="3187"/>
-        <location filename="../simulatordialog.ui" line="3345"/>
-        <location filename="../simulatordialog.ui" line="3367"/>
-        <location filename="../simulatordialog.ui" line="3525"/>
-        <location filename="../simulatordialog.ui" line="3547"/>
+        <location filename="../simulatordialog.ui" line="2329"/>
+        <location filename="../simulatordialog.ui" line="2351"/>
+        <location filename="../simulatordialog.ui" line="2509"/>
+        <location filename="../simulatordialog.ui" line="2531"/>
+        <location filename="../simulatordialog.ui" line="2689"/>
+        <location filename="../simulatordialog.ui" line="2711"/>
+        <location filename="../simulatordialog.ui" line="2869"/>
+        <location filename="../simulatordialog.ui" line="2891"/>
+        <location filename="../simulatordialog.ui" line="3043"/>
+        <location filename="../simulatordialog.ui" line="3065"/>
+        <location filename="../simulatordialog.ui" line="3168"/>
+        <location filename="../simulatordialog.ui" line="3190"/>
+        <location filename="../simulatordialog.ui" line="3348"/>
+        <location filename="../simulatordialog.ui" line="3370"/>
+        <location filename="../simulatordialog.ui" line="3528"/>
+        <location filename="../simulatordialog.ui" line="3550"/>
         <source>-100.1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2419"/>
+        <location filename="../simulatordialog.ui" line="2422"/>
         <source>CH9</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2432"/>
+        <location filename="../simulatordialog.ui" line="2435"/>
         <source>CH2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2599"/>
+        <location filename="../simulatordialog.ui" line="2602"/>
         <source>CH10</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2612"/>
+        <location filename="../simulatordialog.ui" line="2615"/>
         <source>CH3</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2779"/>
+        <location filename="../simulatordialog.ui" line="2782"/>
         <source>CH11</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2792"/>
+        <location filename="../simulatordialog.ui" line="2795"/>
         <source>CH4</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2959"/>
+        <location filename="../simulatordialog.ui" line="2962"/>
         <source>CH12</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2972"/>
+        <location filename="../simulatordialog.ui" line="2975"/>
         <source>CH5</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3133"/>
+        <location filename="../simulatordialog.ui" line="3136"/>
         <source>CH13</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3146"/>
+        <location filename="../simulatordialog.ui" line="3149"/>
         <source>CH6</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3258"/>
+        <location filename="../simulatordialog.ui" line="3261"/>
         <source>CH14</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3271"/>
+        <location filename="../simulatordialog.ui" line="3274"/>
         <source>CH7</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3438"/>
+        <location filename="../simulatordialog.ui" line="3441"/>
         <source>CH15</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3451"/>
+        <location filename="../simulatordialog.ui" line="3454"/>
         <source>CH8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3618"/>
+        <location filename="../simulatordialog.ui" line="3621"/>
         <source>CH16</source>
         <translation></translation>
     </message>
@@ -11983,9 +12088,8 @@ nutno zastavět hlasový modul</translation>
 <context>
     <name>xsimulatorDialog</name>
     <message>
-        <location filename="../xsimulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation>Companion9x Simulátor</translation>
+        <translation type="obsolete">Companion9x Simulátor</translation>
     </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1089"/>
@@ -12223,6 +12327,11 @@ nutno zastavět hlasový modul</translation>
         <source>Taranis Simulator</source>
         <translation>Taranis Simulátor</translation>
     </message>
+    <message>
+        <location filename="../xsimulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1570"/>
         <location filename="../xsimulatordialog.ui" line="1592"/>
@@ -12230,16 +12339,16 @@ nutno zastavět hlasový modul</translation>
         <location filename="../xsimulatordialog.ui" line="1772"/>
         <location filename="../xsimulatordialog.ui" line="1930"/>
         <location filename="../xsimulatordialog.ui" line="1952"/>
-        <location filename="../xsimulatordialog.ui" line="2110"/>
-        <location filename="../xsimulatordialog.ui" line="2132"/>
-        <location filename="../xsimulatordialog.ui" line="2284"/>
-        <location filename="../xsimulatordialog.ui" line="2306"/>
-        <location filename="../xsimulatordialog.ui" line="2409"/>
-        <location filename="../xsimulatordialog.ui" line="2431"/>
-        <location filename="../xsimulatordialog.ui" line="2589"/>
-        <location filename="../xsimulatordialog.ui" line="2611"/>
-        <location filename="../xsimulatordialog.ui" line="2769"/>
-        <location filename="../xsimulatordialog.ui" line="2791"/>
+        <location filename="../xsimulatordialog.ui" line="2111"/>
+        <location filename="../xsimulatordialog.ui" line="2133"/>
+        <location filename="../xsimulatordialog.ui" line="2285"/>
+        <location filename="../xsimulatordialog.ui" line="2307"/>
+        <location filename="../xsimulatordialog.ui" line="2410"/>
+        <location filename="../xsimulatordialog.ui" line="2432"/>
+        <location filename="../xsimulatordialog.ui" line="2590"/>
+        <location filename="../xsimulatordialog.ui" line="2612"/>
+        <location filename="../xsimulatordialog.ui" line="2770"/>
+        <location filename="../xsimulatordialog.ui" line="2792"/>
         <source>-100.1</source>
         <translation></translation>
     </message>
@@ -12274,207 +12383,207 @@ nutno zastavět hlasový modul</translation>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2203"/>
+        <location filename="../xsimulatordialog.ui" line="2204"/>
         <source>CH12</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2216"/>
+        <location filename="../xsimulatordialog.ui" line="2217"/>
         <source>CH5</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2377"/>
+        <location filename="../xsimulatordialog.ui" line="2378"/>
         <source>CH13</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2390"/>
+        <location filename="../xsimulatordialog.ui" line="2391"/>
         <source>CH6</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2502"/>
+        <location filename="../xsimulatordialog.ui" line="2503"/>
         <source>CH14</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2515"/>
+        <location filename="../xsimulatordialog.ui" line="2516"/>
         <source>CH7</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2682"/>
+        <location filename="../xsimulatordialog.ui" line="2683"/>
         <source>CH15</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2695"/>
+        <location filename="../xsimulatordialog.ui" line="2696"/>
         <source>CH8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2862"/>
+        <location filename="../xsimulatordialog.ui" line="2863"/>
         <source>CH16</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2896"/>
+        <location filename="../xsimulatordialog.ui" line="2897"/>
         <source>CSK</source>
         <translation>VSK</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2927"/>
+        <location filename="../xsimulatordialog.ui" line="2928"/>
         <source>CSC</source>
         <translation>VSC</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2958"/>
+        <location filename="../xsimulatordialog.ui" line="2959"/>
         <source>CSD</source>
         <translation>VSD</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2989"/>
+        <location filename="../xsimulatordialog.ui" line="2990"/>
         <source>CS7</source>
         <translation>VS7</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3020"/>
+        <location filename="../xsimulatordialog.ui" line="3021"/>
         <source>CSL</source>
         <translation>VSL</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3051"/>
+        <location filename="../xsimulatordialog.ui" line="3052"/>
         <source>CSB</source>
         <translation>VSB</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3082"/>
+        <location filename="../xsimulatordialog.ui" line="3083"/>
         <source>CS1</source>
         <translation>VS1</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3113"/>
+        <location filename="../xsimulatordialog.ui" line="3114"/>
         <source>CSH</source>
         <translation>VSH</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3144"/>
+        <location filename="../xsimulatordialog.ui" line="3145"/>
         <source>CSG</source>
         <translation>VSG</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3175"/>
+        <location filename="../xsimulatordialog.ui" line="3176"/>
         <source>CSE</source>
         <translation>VSE</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3206"/>
+        <location filename="../xsimulatordialog.ui" line="3207"/>
         <source>CSF</source>
         <translation>VSF</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3237"/>
+        <location filename="../xsimulatordialog.ui" line="3238"/>
         <source>CS8</source>
         <translation>VS8</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3268"/>
+        <location filename="../xsimulatordialog.ui" line="3269"/>
         <source>CS9</source>
         <translation>VS9</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3299"/>
+        <location filename="../xsimulatordialog.ui" line="3300"/>
         <source>CSA</source>
         <translation>VSA</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3330"/>
+        <location filename="../xsimulatordialog.ui" line="3331"/>
         <source>CSM</source>
         <translation>VSM</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3361"/>
+        <location filename="../xsimulatordialog.ui" line="3362"/>
         <source>CSJ</source>
         <translation>VSJ</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3392"/>
+        <location filename="../xsimulatordialog.ui" line="3393"/>
         <source>CSI</source>
         <translation>VSI</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3423"/>
+        <location filename="../xsimulatordialog.ui" line="3424"/>
         <source>CS4</source>
         <translation>VS4</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3454"/>
+        <location filename="../xsimulatordialog.ui" line="3455"/>
         <source>CS5</source>
         <translation>VS5</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3485"/>
+        <location filename="../xsimulatordialog.ui" line="3486"/>
         <source>CS2</source>
         <translation>VS2</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3516"/>
+        <location filename="../xsimulatordialog.ui" line="3517"/>
         <source>CS3</source>
         <translation>VS3</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3547"/>
+        <location filename="../xsimulatordialog.ui" line="3548"/>
         <source>CS6</source>
         <translation>VS6</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3578"/>
+        <location filename="../xsimulatordialog.ui" line="3579"/>
         <source>CSN</source>
         <translation>VSN</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3609"/>
+        <location filename="../xsimulatordialog.ui" line="3610"/>
         <source>CSO</source>
         <translation>VSO</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3640"/>
+        <location filename="../xsimulatordialog.ui" line="3641"/>
         <source>CSP</source>
         <translation>VSP</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3671"/>
+        <location filename="../xsimulatordialog.ui" line="3672"/>
         <source>CSQ</source>
         <translation>VSQ</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3702"/>
+        <location filename="../xsimulatordialog.ui" line="3703"/>
         <source>CSR</source>
         <translation>VSR</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3733"/>
+        <location filename="../xsimulatordialog.ui" line="3734"/>
         <source>CSS</source>
         <translation>VSS</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3764"/>
+        <location filename="../xsimulatordialog.ui" line="3765"/>
         <source>CST</source>
         <translation>VST</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3795"/>
+        <location filename="../xsimulatordialog.ui" line="3796"/>
         <source>CSU</source>
         <translation>VSU</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3826"/>
+        <location filename="../xsimulatordialog.ui" line="3827"/>
         <source>CSV</source>
         <translation>VSV</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3857"/>
+        <location filename="../xsimulatordialog.ui" line="3858"/>
         <source>CSW</source>
         <translation>VSW</translation>
     </message>
diff --git a/companion/src/translations/companion9x_de.ts b/companion/src/translations/companion_de.ts
similarity index 95%
rename from companion/src/translations/companion9x_de.ts
rename to companion/src/translations/companion_de.ts
index 23280e633..fd62aa4cd 100644
--- a/companion/src/translations/companion9x_de.ts
+++ b/companion/src/translations/companion_de.ts
@@ -1304,9 +1304,9 @@ Are you sure ?</source>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="147"/>
-        <location filename="../mainwindow.cpp" line="635"/>
-        <location filename="../mainwindow.cpp" line="669"/>
-        <location filename="../mainwindow.cpp" line="2161"/>
+        <location filename="../mainwindow.cpp" line="636"/>
+        <location filename="../mainwindow.cpp" line="670"/>
+        <location filename="../mainwindow.cpp" line="2162"/>
         <source>File loaded</source>
         <translation>Datei geladen</translation>
     </message>
@@ -1322,8 +1322,8 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="268"/>
         <location filename="../mainwindow.cpp" line="270"/>
         <location filename="../mainwindow.cpp" line="310"/>
-        <location filename="../mainwindow.cpp" line="570"/>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="571"/>
+        <location filename="../mainwindow.cpp" line="573"/>
         <source>Save As</source>
         <translation>Speichern unter</translation>
     </message>
@@ -1333,7 +1333,7 @@ Are you sure ?</source>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="285"/>
-        <location filename="../mainwindow.cpp" line="543"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>No updates available at this time.</source>
         <translation>Kein Update vorhanden.</translation>
     </message>
@@ -1341,8 +1341,8 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="246"/>
         <location filename="../mainwindow.cpp" line="289"/>
         <location filename="../mainwindow.cpp" line="467"/>
-        <location filename="../mainwindow.cpp" line="589"/>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="590"/>
+        <location filename="../mainwindow.cpp" line="594"/>
         <source>Unable to check for updates.</source>
         <translation>Kann nicht auf Updates überprüfen.</translation>
     </message>
@@ -1365,14 +1365,20 @@ Are you sure ?</source>
         <translation>Möchtest Du das Installationsprogramm starten ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="516"/>
+        <location filename="../mainwindow.cpp" line="359"/>
+        <location filename="../mainwindow.cpp" line="399"/>
+        <source>Compilation server requires registration, please check OpenTX web site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="517"/>
         <source>A new version of %1 firmware is available (current %2 - newer %3).
 Do you want to download it now ?</source>
         <translation>Eine neue Version der %1-Firmware ist verfügbar (aktuell %2 - neueste %3)..
 Möchten Sie sie jetzt herunterladen?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="623"/>
+        <location filename="../mainwindow.cpp" line="624"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
@@ -1381,8 +1387,8 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <translation type="obsolete">EEPROM Dateien (*.bin *.hex);;BIN Dateien (*.bin);;HEX Dateien (*.hex)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="644"/>
-        <location filename="../mainwindow.cpp" line="650"/>
+        <location filename="../mainwindow.cpp" line="645"/>
+        <location filename="../mainwindow.cpp" line="651"/>
         <source>File saved</source>
         <translation>Datei gespeichert</translation>
     </message>
@@ -1423,7 +1429,7 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <translation type="obsolete">Lese Flash und speichere in Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1492"/>
+        <location filename="../mainwindow.cpp" line="1493"/>
         <source>Copyright</source>
         <translation>Copyright</translation>
     </message>
@@ -1433,7 +1439,7 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <translation type="obsolete">Wenn Du dieses Programm und/oder die Firmware nützlich findest dann unterstütze uns durch</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1497"/>
+        <location filename="../mainwindow.cpp" line="1498"/>
         <source>donating</source>
         <translation>spenden</translation>
     </message>
@@ -1442,69 +1448,69 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <translation type="obsolete">Über eePe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1563"/>
-        <location filename="../mainwindow.cpp" line="2019"/>
-        <location filename="../mainwindow.cpp" line="2040"/>
+        <location filename="../mainwindow.cpp" line="1564"/>
+        <location filename="../mainwindow.cpp" line="2020"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1565"/>
+        <location filename="../mainwindow.cpp" line="1566"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
         <source>Create a new file</source>
         <translation>Neue Datei erstellen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1598"/>
         <source>&amp;Open...</source>
         <translation>Datei ö&amp;ffnen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
+        <location filename="../mainwindow.cpp" line="1600"/>
         <source>Open an existing file</source>
         <translation>Öffne eine bestehende Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1607"/>
         <source>&amp;Save</source>
         <translation>Datei &amp;speichern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1608"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Save the document to disk</source>
         <translation>Speichere das Dokument auf Festplatte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Save &amp;As...</source>
         <translation>Speichern &amp;unter...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1613"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
         <source>Save the document under a new name</source>
         <translation>Speichere das Dokument unter einem neuen Namen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
+        <location filename="../mainwindow.cpp" line="1622"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
+        <location filename="../mainwindow.cpp" line="1623"/>
         <source>Edit general preferences</source>
         <translation>Bearbeite generelle Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>&amp;Check for updates...</source>
         <translation>&amp;Überprüfe auf Updates...</translation>
     </message>
@@ -1518,44 +1524,38 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="260"/>
         <source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
         <translatorcomment>Wether in french, which form of address do you prefer? </translatorcomment>
-        <translation>Eine neue Version von companion9x ist verfügbar (version %1)&lt;br&gt;Möchten Sie sie herunterladen?</translation>
+        <translation type="obsolete">Eine neue Version von companion9x ist verfügbar (version %1)&lt;br&gt;Möchten Sie sie herunterladen?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="281"/>
         <source>New release available</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="281"/>
-        <source>A new release of companion is available please check the repository</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="337"/>
         <location filename="../mainwindow.cpp" line="366"/>
         <location filename="../mainwindow.cpp" line="377"/>
         <location filename="../mainwindow.cpp" line="406"/>
-        <location filename="../mainwindow.cpp" line="901"/>
-        <location filename="../mainwindow.cpp" line="2066"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
-        <location filename="../mainwindow.cpp" line="2124"/>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="338"/>
         <location filename="../mainwindow.cpp" line="378"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
         <source>Error opening file %1:
 %2.</source>
         <translation type="unfinished">Fehler beim Öffnen der Datei %1:
@@ -1571,6 +1571,31 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <source>Display previous message again at startup ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="106"/>
+        <location filename="../mainwindow.cpp" line="722"/>
+        <location filename="../mainwindow.cpp" line="742"/>
+        <source>Companion - Models and Settings Editor - %1 - profile %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="716"/>
+        <location filename="../mainwindow.cpp" line="733"/>
+        <location filename="../mainwindow.cpp" line="744"/>
+        <source>Companion - Models and Settings Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="260"/>
+        <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="281"/>
+        <source>A new release of Companion is available please check the repository</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="350"/>
         <source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
@@ -1587,12 +1612,6 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <source>Compilation server too busy, try later</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="359"/>
-        <location filename="../mainwindow.cpp" line="399"/>
-        <source>Compilation server requires registration, please check opentx web site</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="362"/>
         <location filename="../mainwindow.cpp" line="402"/>
@@ -1605,7 +1624,7 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="487"/>
+        <location filename="../mainwindow.cpp" line="488"/>
         <source>Firmware %1 does not seem to have ever been downloaded.
 Version %2 is available.
 Do you want to download it now ?</source>
@@ -1614,65 +1633,65 @@ Version %2 ist verfügbar.
 Möchten Sie sie jetzt herunterladen?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
-        <location filename="../mainwindow.cpp" line="517"/>
+        <location filename="../mainwindow.cpp" line="489"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>Yes</source>
         <translation type="unfinished">Ja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="489"/>
-        <location filename="../mainwindow.cpp" line="518"/>
+        <location filename="../mainwindow.cpp" line="490"/>
+        <location filename="../mainwindow.cpp" line="519"/>
         <source>No</source>
         <translation type="unfinished">Nein</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="491"/>
-        <location filename="../mainwindow.cpp" line="520"/>
+        <location filename="../mainwindow.cpp" line="492"/>
+        <location filename="../mainwindow.cpp" line="521"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="499"/>
-        <location filename="../mainwindow.cpp" line="529"/>
+        <location filename="../mainwindow.cpp" line="500"/>
+        <location filename="../mainwindow.cpp" line="530"/>
         <source>Do you want to download release %1 now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="556"/>
+        <location filename="../mainwindow.cpp" line="557"/>
         <source>Release notes contain very important informations. Do you want to see them now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Firmware updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Current firmware does not provide release notes informations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="903"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished">Kann Datei %1:
 %2 nicht schreiben.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Taranis radio not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
         <source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1685,16 +1704,16 @@ wurde nicht als gültige EEPROM Datei erkannt.
 Trotzdem brennen?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Backup is impossible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1703,8 +1722,8 @@ Trotzdem brennen?</translation>
         <translation type="obsolete">Sicherung EEPROM von Tx</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>Warning</source>
         <translation type="unfinished">Warnung</translation>
     </message>
@@ -1713,7 +1732,7 @@ Trotzdem brennen?</translation>
         <translation type="obsolete">Brenne Flash in den Tx</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Conversion failed</source>
         <translation>Umwandlung gescheitert</translation>
     </message>
@@ -1726,7 +1745,7 @@ Trotzdem brennen?</translation>
         <translation type="obsolete">EEPROM in Tx zurückspeichern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Restore failed</source>
         <translation>Zurückspeicherung gescheitert</translation>
     </message>
@@ -1743,7 +1762,7 @@ Trotzdem brennen?</translation>
         <translation type="obsolete">Flashen des Tx nicht möglich, ursprüngliche EEProm Dateil ist verfügbar unter: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Backup failed</source>
         <translation>Sicherung fehlgeschlagen</translation>
     </message>
@@ -1751,340 +1770,341 @@ Trotzdem brennen?</translation>
         <source>Cannot backup existing EEProm from TX, Flash process aborted</source>
         <translation type="obsolete">Sicherung des bestehenden EEEPROMs vom Tx gescheitert, Flash Prozess abgebrochen</translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="106"/>
-        <location filename="../mainwindow.cpp" line="721"/>
-        <location filename="../mainwindow.cpp" line="741"/>
-        <source>companion9x - Models and Settings Editor - %1 - profile %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="108"/>
-        <location filename="../mainwindow.cpp" line="715"/>
-        <location filename="../mainwindow.cpp" line="732"/>
-        <location filename="../mainwindow.cpp" line="743"/>
-        <source>companion9x - Models and Settings Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="430"/>
         <source>Do you want to write the firmware to the transmitter now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1051"/>
-        <location filename="../mainwindow.cpp" line="1058"/>
-        <location filename="../mainwindow.cpp" line="1427"/>
-        <location filename="../mainwindow.cpp" line="1434"/>
+        <location filename="../mainwindow.cpp" line="1052"/>
+        <location filename="../mainwindow.cpp" line="1059"/>
+        <location filename="../mainwindow.cpp" line="1428"/>
+        <location filename="../mainwindow.cpp" line="1435"/>
         <source>Read Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
+        <location filename="../mainwindow.cpp" line="1080"/>
         <source>Write Models and settings from %1 to the Tx?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1082"/>
+        <location filename="../mainwindow.cpp" line="1083"/>
         <source>The file %1
 has not been recognized as a valid Models and Settings file
 Write anyway ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1108"/>
-        <location filename="../mainwindow.cpp" line="1115"/>
-        <location filename="../mainwindow.cpp" line="1158"/>
-        <location filename="../mainwindow.cpp" line="1165"/>
-        <location filename="../mainwindow.cpp" line="1357"/>
-        <location filename="../mainwindow.cpp" line="1399"/>
+        <location filename="../mainwindow.cpp" line="1109"/>
+        <location filename="../mainwindow.cpp" line="1116"/>
+        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1166"/>
+        <location filename="../mainwindow.cpp" line="1358"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>Backup Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1131"/>
+        <location filename="../mainwindow.cpp" line="1132"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
         <source>The transmitter firmware belongs to another product family, check file and preferences!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>The transmitter firmware is outdated, please upgrade!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1180"/>
+        <location filename="../mainwindow.cpp" line="1181"/>
         <source>Write Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1363"/>
-        <location filename="../mainwindow.cpp" line="1406"/>
+        <location filename="../mainwindow.cpp" line="1364"/>
+        <location filename="../mainwindow.cpp" line="1407"/>
         <source>Write Firmware To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Cannot convert Models and Settings for use with this firmware, original data will be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1375"/>
         <source>Restore Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Could not restore Models and Settings to TX. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Firmware write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Could not write firmware to to transmitter. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Cannot backup existing Models and Settings from TX. Firmware write process aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1416"/>
+        <location filename="../mainwindow.cpp" line="1417"/>
         <source>Save transmitter Models and Settings to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Impossible to identify the radio on your system, please verify that the eeprom disk is connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1444"/>
+        <location filename="../mainwindow.cpp" line="1445"/>
         <source>Read Tx Firmware to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1493"/>
+        <location filename="../mainwindow.cpp" line="1494"/>
         <source>Version %1 (revision %2), %3</source>
         <translation>Version %1 (Revision %2), %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1494"/>
         <source>The companion9x project was originally forked from eePe</source>
-        <translation>Das &apos;companion9x&apos; Projekt ist ursprünglich aus eePe entstanden.</translation>
+        <translation type="obsolete">Das &apos;companion9x&apos; Projekt ist ursprünglich aus eePe entstanden.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1495"/>
+        <location filename="../mainwindow.cpp" line="1496"/>
         <source>If you&apos;ve found this program useful, please support by</source>
         <translation>Wenn Sie diese Programm hilfreich finden, bitte unterstützen Sie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1499"/>
         <source>About companion9x</source>
-        <translation>Über companion9x</translation>
+        <translation type="obsolete">Über companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>&amp;loadBackup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>Load backup from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Lo&amp;gs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Open log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
         <source>Check for new version of companion9x/er9x</source>
-        <translation>Überprüfe auf neue Version von companion9x/er9x</translation>
+        <translation type="obsolete">Überprüfe auf neue Version von companion9x/er9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Contributors &amp;List...</source>
         <translation>&amp;Mitwirkende...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Show companion9x contributors list</source>
-        <translation>Zeige die Liste der Mitwirkenden von &apos;companion9x&apos;</translation>
+        <translation type="obsolete">Zeige die Liste der Mitwirkenden von &apos;companion9x&apos;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>ChangeLog...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
-        <source>Show companion9x changelog</source>
+        <location filename="../mainwindow.cpp" line="1495"/>
+        <source>The Companion project was originally forked from eePe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
-        <source>Firmware ChangeLog...</source>
+        <location filename="../mainwindow.cpp" line="1500"/>
+        <source>About Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Check for new version of Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1631"/>
+        <source>Show Companion contributors list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1635"/>
+        <source>Show Companion changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1638"/>
+        <source>Firmware ChangeLog...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Show firmware changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Compare...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Compare models</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Customize your &amp;TX...</source>
         <translation>Passe Deinen &amp;TX an...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Customize the splash screen of your TX</source>
         <translation>Persönliche Anpassung des Tx Startbildschirmes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1653"/>
         <source>E&amp;xit</source>
         <translation>Be&amp;enden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1655"/>
         <source>Exit the application</source>
         <translation>Beendet die Anwendung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1659"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1661"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Scheidet die momentane Auwahl aus und kopiert den Inhalt in den Zwischenspeicher</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1667"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Kopiert die momentane Auswahl in den Zwischenspeicher </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1671"/>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1673"/>
         <source>Paste the clipboard&apos;s contents into the current selection</source>
         <translation>Fügt den Inhalt des Zwischenspeichers in die momentane Auswahl ein</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1677"/>
+        <location filename="../mainwindow.cpp" line="1678"/>
         <source>&amp;Write Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1679"/>
+        <location filename="../mainwindow.cpp" line="1680"/>
         <source>Write Models and Settings to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1682"/>
+        <location filename="../mainwindow.cpp" line="1683"/>
         <source>&amp;Read Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1684"/>
+        <location filename="../mainwindow.cpp" line="1685"/>
         <source>Read Models and Settings from transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
+        <location filename="../mainwindow.cpp" line="1688"/>
         <source>Write Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1688"/>
+        <location filename="../mainwindow.cpp" line="1689"/>
         <source>Write firmware to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1691"/>
+        <location filename="../mainwindow.cpp" line="1692"/>
         <source>Write Models and Settings from file to Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1692"/>
+        <location filename="../mainwindow.cpp" line="1693"/>
         <source>Write Models and Settings from file to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1695"/>
+        <location filename="../mainwindow.cpp" line="1696"/>
         <source>Save transmitter Models and Settings to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1696"/>
+        <location filename="../mainwindow.cpp" line="1697"/>
         <source>Save the Models and Settings from the transmitter to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1699"/>
+        <location filename="../mainwindow.cpp" line="1700"/>
         <source>Read Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1700"/>
+        <location filename="../mainwindow.cpp" line="1701"/>
         <source>Read firmware from transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1704"/>
+        <location filename="../mainwindow.cpp" line="1705"/>
         <source>Configure software for reading from and writing to the transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
         <source>Invalid Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2093,7 +2113,7 @@ Write anyway ?</source>
         <translation type="obsolete">&amp;Schreibe EEPROM in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1678"/>
+        <location filename="../mainwindow.cpp" line="1679"/>
         <source>Ctrl+Alt+W</source>
         <translation>Ctrl+Alt+W</translation>
     </message>
@@ -2106,7 +2126,7 @@ Write anyway ?</source>
         <translation type="obsolete">&amp;Lese EEPROM vom Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1683"/>
+        <location filename="../mainwindow.cpp" line="1684"/>
         <source>Ctrl+Alt+R</source>
         <translation>Ctrl+Alt+R</translation>
     </message>
@@ -2147,7 +2167,7 @@ Write anyway ?</source>
         <translation type="obsolete">Lese Flash Speicher und schreibe in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1703"/>
+        <location filename="../mainwindow.cpp" line="1704"/>
         <source>&amp;Configure...</source>
         <translation type="unfinished">&amp;Einstellungen...</translation>
     </message>
@@ -2156,143 +2176,143 @@ Write anyway ?</source>
         <translation type="obsolete">Einstellungen Brennsoftware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1708"/>
+        <location filename="../mainwindow.cpp" line="1709"/>
         <source>&amp;List programmers</source>
         <translation>&amp;Programmiergeräte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1709"/>
+        <location filename="../mainwindow.cpp" line="1710"/>
         <source>List available programmers</source>
         <translation>Programmiergeräte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1712"/>
+        <location filename="../mainwindow.cpp" line="1713"/>
         <source>&amp;Fuses...</source>
         <translation>&amp;Fuses...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1713"/>
+        <location filename="../mainwindow.cpp" line="1714"/>
         <source>Show fuses dialog</source>
         <translation>Zeige Fuses Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1716"/>
+        <location filename="../mainwindow.cpp" line="1717"/>
         <source>&amp;Simulate</source>
         <translation>&amp;Simulation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1717"/>
+        <location filename="../mainwindow.cpp" line="1718"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1718"/>
+        <location filename="../mainwindow.cpp" line="1719"/>
         <source>Simulate selected model.</source>
         <translation>Simuliert das ausgewählte Modell.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1722"/>
+        <location filename="../mainwindow.cpp" line="1723"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1723"/>
+        <location filename="../mainwindow.cpp" line="1724"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location filename="../mainwindow.cpp" line="1725"/>
         <source>Print current model.</source>
         <translation>Drucke momentane Modelleinstellungen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1728"/>
+        <location filename="../mainwindow.cpp" line="1729"/>
         <source>Cl&amp;ose</source>
         <translation>&amp;Schliessen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1729"/>
+        <location filename="../mainwindow.cpp" line="1730"/>
         <source>Close the active window</source>
         <translation>Schliesst das aktuelle Fenster</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1733"/>
+        <location filename="../mainwindow.cpp" line="1734"/>
         <source>Close &amp;All</source>
         <translation>Schliesse &amp;Alles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1734"/>
+        <location filename="../mainwindow.cpp" line="1735"/>
         <source>Close all the windows</source>
         <translation>Schliesst alle Fenster</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1738"/>
+        <location filename="../mainwindow.cpp" line="1739"/>
         <source>&amp;Tile</source>
         <translation>&amp;Anordnen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1739"/>
+        <location filename="../mainwindow.cpp" line="1740"/>
         <source>Tile the windows</source>
         <translation>Nebeneinander Ordnen von Fenstern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1742"/>
+        <location filename="../mainwindow.cpp" line="1743"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Kaskadieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1743"/>
+        <location filename="../mainwindow.cpp" line="1744"/>
         <source>Cascade the windows</source>
         <translation>Kaskadiere die Fenster</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
+        <location filename="../mainwindow.cpp" line="1747"/>
         <source>Ne&amp;xt</source>
         <translation>Nä&amp;chstes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1748"/>
+        <location filename="../mainwindow.cpp" line="1749"/>
         <source>Move the focus to the next window</source>
         <translation>Nächstes Fenster aufrufen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1752"/>
+        <location filename="../mainwindow.cpp" line="1753"/>
         <source>Pre&amp;vious</source>
         <translation>Vor&amp;hergehendes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1754"/>
+        <location filename="../mainwindow.cpp" line="1755"/>
         <source>Move the focus to the previous window</source>
         <translation>Vorhergehendes Fenster aufrufen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1762"/>
+        <location filename="../mainwindow.cpp" line="1763"/>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1763"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
         <source>Show the application&apos;s About box</source>
         <translation>Zeige das Infofenster</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1787"/>
-        <location filename="../mainwindow.cpp" line="1881"/>
+        <location filename="../mainwindow.cpp" line="1788"/>
+        <location filename="../mainwindow.cpp" line="1882"/>
         <source>Recent Files</source>
         <translation>Letzte Dateien</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1820"/>
+        <location filename="../mainwindow.cpp" line="1821"/>
         <source>&amp;Read/Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1916"/>
+        <location filename="../mainwindow.cpp" line="1917"/>
         <source>Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2066"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
         <source>Unable to find file %1!</source>
         <translation type="unfinished">Kann die Datei %1 nicht finden !</translation>
     </message>
@@ -2301,7 +2321,7 @@ Write anyway ?</source>
         <translation type="obsolete">Ungültige EEPROM Datei %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2124"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
         <source>Error reading file %1:
 %2.</source>
         <translation type="unfinished">Fehler beim Lesen der Datei %1:
@@ -2320,23 +2340,23 @@ Write anyway ?</source>
         <translation type="obsolete">Zeige die er9x/eePe Mitwirkende</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1767"/>
+        <location filename="../mainwindow.cpp" line="1768"/>
         <source>Switch layout Left/Right</source>
         <translation>Schalte Layout um Rechts/Links</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1788"/>
-        <location filename="../mainwindow.cpp" line="1891"/>
+        <location filename="../mainwindow.cpp" line="1789"/>
+        <location filename="../mainwindow.cpp" line="1892"/>
         <source>Firmware Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1790"/>
+        <location filename="../mainwindow.cpp" line="1791"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1766"/>
+        <location filename="../mainwindow.cpp" line="1767"/>
         <source>Switch layout direction</source>
         <translation>Schalte Programmlayout um</translation>
     </message>
@@ -2350,7 +2370,7 @@ Write anyway ?</source>
         <translation>Überprüfe auf Updates</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>Ignore this version (r%1)?</source>
         <translation>Diese Version ignorieren (%1)?</translation>
     </message>
@@ -2359,7 +2379,7 @@ Write anyway ?</source>
         <translation type="obsolete">Eine neue Version von eePe ist vorhanden /r%1)&lt;br&gt;Möchtest Du diese herunterladen ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1815"/>
+        <location filename="../mainwindow.cpp" line="1816"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
@@ -2368,22 +2388,22 @@ Write anyway ?</source>
         <translation type="obsolete">B&amp;rennen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1838"/>
+        <location filename="../mainwindow.cpp" line="1839"/>
         <source>&amp;Window</source>
         <translation>&amp;Fenster</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1844"/>
+        <location filename="../mainwindow.cpp" line="1845"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1874"/>
+        <location filename="../mainwindow.cpp" line="1875"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1911"/>
+        <location filename="../mainwindow.cpp" line="1912"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
@@ -2392,12 +2412,12 @@ Write anyway ?</source>
         <translation type="obsolete">Brennen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1928"/>
+        <location filename="../mainwindow.cpp" line="1929"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location filename="../mainwindow.cpp" line="1936"/>
         <source>Ready</source>
         <translation>Fertig</translation>
     </message>
@@ -2562,6 +2582,13 @@ Möchtest Du die Änderungen speichern ?</translation>
         <source>Do you want to use model wizard? </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mdichild.cpp" line="182"/>
+        <location filename="../mdichild.cpp" line="187"/>
+        <location filename="../mdichild.cpp" line="470"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mdichild.cpp" line="187"/>
         <source>Ask this question again ? </source>
@@ -2646,11 +2673,8 @@ Möchtest Du die Änderungen speichern ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="182"/>
-        <location filename="../mdichild.cpp" line="187"/>
-        <location filename="../mdichild.cpp" line="470"/>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="471"/>
@@ -8253,11 +8277,11 @@ Right</source>
     </message>
     <message>
         <location filename="../warnings.h" line="5"/>
-        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
+        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
 
-We are really sensible to that!
+We are really appreciative for that!
 
-The openTX/C9X Team.</source>
+The OpenTX/Companion Team.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8640,8 +8664,12 @@ Bitte nutze dies nur wenn Du weißt was Du machst. Es gibt keine Plausibilitäts
     <message>
         <location filename="../burnconfigdialog.cpp" line="328"/>
         <location filename="../burnconfigdialog.cpp" line="397"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="329"/>
@@ -8768,6 +8796,11 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <source>Substitute image in firmware</source>
         <translation>Ersetze Bild in Firmware</translation>
     </message>
+    <message>
+        <location filename="../burndialog.ui" line="276"/>
+        <source>Allows Companion to write to older version of the firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burndialog.ui" line="289"/>
         <source>Backup and restore Models and Settings</source>
@@ -8800,11 +8833,6 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../burndialog.ui" line="276"/>
-        <source>Allows companion9x to write to older version of the firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../burndialog.ui" line="279"/>
         <source>Check Firmware compatibility</source>
@@ -9671,29 +9699,35 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../contributorsdialog.cpp" line="29"/>
         <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
+of course. Also to Erez Raviv (er9x) and the fantastic eePe program 
+which was the staring point for OpenTX Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contributorsdialog.cpp" line="46"/>
+        <source>Companion Release Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
 of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
 companion9x was forked out.</source>
-        <translation>Ehre gebührt Rafal Tomczak (RadioClone) und natürlich Thomas 
+        <translation type="obsolete">Ehre gebührt Rafal Tomczak (RadioClone) und natürlich Thomas 
 Husterer (th9x) und auch  Erez Raviv (er9x) und sein fantastisches
  eePe, worauf companion9x basiert.</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="31"/>
+        <location filename="../contributorsdialog.cpp" line="32"/>
         <source>Thank you all !!!</source>
         <translation>Besten Dank an alle!</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="34"/>
+        <location filename="../contributorsdialog.cpp" line="35"/>
         <source>Contributors</source>
         <translation>Mitwirkende</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="45"/>
-        <source>Companion9x Release Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contributorsdialog.cpp" line="50"/>
+        <location filename="../contributorsdialog.cpp" line="51"/>
         <source>OpenTX Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9858,8 +9892,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="54"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <source>eePe</source>
@@ -10279,7 +10317,7 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
     <name>logsDialog</name>
     <message>
         <location filename="../logsdialog.ui" line="14"/>
-        <source>Companion9x log viewer</source>
+        <source>Companion Log Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10293,47 +10331,59 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="131"/>
+        <location filename="../logsdialog.ui" line="94"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="138"/>
+        <location filename="../logsdialog.ui" line="101"/>
         <source>X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="145"/>
+        <location filename="../logsdialog.ui" line="108"/>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="169"/>
+        <location filename="../logsdialog.ui" line="132"/>
         <source>Fly sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="22"/>
+        <location filename="../logsdialog.cpp" line="27"/>
         <source>Telemetry logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="23"/>
+        <location filename="../logsdialog.cpp" line="28"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="395"/>
+        <location filename="../logsdialog.cpp" line="252"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="253"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation type="unfinished">Kann Datei %1:
+%2 nicht schreiben.</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="582"/>
         <source>Select your log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="406"/>
+        <location filename="../logsdialog.cpp" line="593"/>
         <source>Available fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="501"/>
+        <location filename="../logsdialog.cpp" line="690"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10791,7 +10841,7 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="506"/>
+        <location filename="../preferencesdialog.ui" line="650"/>
         <source>Language (requires restart)</source>
         <translation>Sprache (Benötigt Neustart)</translation>
     </message>
@@ -10804,7 +10854,7 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
         <translation type="obsolete">eePe</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="273"/>
+        <location filename="../preferencesdialog.ui" line="51"/>
         <source>Show Splash Screen</source>
         <translation>Startbild anzeigen</translation>
     </message>
@@ -10830,18 +10880,18 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
         <translation>Anzahl zuletzt geöffnete Dateien</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="883"/>
-        <location filename="../preferencesdialog.ui" line="924"/>
+        <location filename="../preferencesdialog.ui" line="914"/>
+        <location filename="../preferencesdialog.ui" line="955"/>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="676"/>
+        <location filename="../preferencesdialog.ui" line="707"/>
         <source>Default Channel Order</source>
         <translation>Standardeinstellung Kanalzuordnung</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="525"/>
+        <location filename="../preferencesdialog.ui" line="292"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
@@ -10850,12 +10900,12 @@ This is used by the templated to determine which channel goes to what number out
 Hier wird die Zuordnung der Kanäle zum Ausgang festgelegt.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="663"/>
+        <location filename="../preferencesdialog.ui" line="694"/>
         <source>Default Stick Mode</source>
         <translation>Standard Knüppelmodus</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="686"/>
+        <location filename="../preferencesdialog.ui" line="717"/>
         <source>Mode selection:
 
 Mode 1:
@@ -10900,117 +10950,117 @@ Mode 4:
         <translation type="obsolete">Prüfe ausgewählte Fw Updates</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="711"/>
+        <location filename="../preferencesdialog.ui" line="742"/>
         <source>Mode 1 (RUD ELE THR AIL)</source>
         <translation>Mode 1 (RUD ELE THR AIL)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="716"/>
+        <location filename="../preferencesdialog.ui" line="747"/>
         <source>Mode 2 (RUD THR ELE AIL)</source>
         <translation>Mode 2 (RUD THR ELE AIL)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="721"/>
+        <location filename="../preferencesdialog.ui" line="752"/>
         <source>Mode 3 (AIL ELE THR RUD)</source>
         <translation>Mode 3 (AIL ELE THR RUD)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="726"/>
+        <location filename="../preferencesdialog.ui" line="757"/>
         <source>Mode 4 (AIL THR ELE RUD)</source>
         <translation>Mode 4 (AIL THR ELE RUD)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="790"/>
+        <location filename="../preferencesdialog.ui" line="821"/>
         <source>Automatic Backup Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="846"/>
+        <location filename="../preferencesdialog.ui" line="877"/>
         <source>Automatically add version number to the filename after download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="870"/>
+        <location filename="../preferencesdialog.ui" line="901"/>
         <source>Voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="890"/>
+        <location filename="../preferencesdialog.ui" line="921"/>
         <source>Set language of voice.
 May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="964"/>
+        <location filename="../preferencesdialog.ui" line="995"/>
         <source>Firmware</source>
         <translation>Firmware</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="70"/>
+        <location filename="../preferencesdialog.ui" line="83"/>
         <source>Check for updates on startup</source>
         <translation>Überprüfe auf Aktualisierung beim Start</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="148"/>
-        <location filename="../preferencesdialog.ui" line="215"/>
+        <location filename="../preferencesdialog.ui" line="161"/>
+        <location filename="../preferencesdialog.ui" line="228"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="773"/>
+        <location filename="../preferencesdialog.ui" line="804"/>
         <source>Splash library behaviour</source>
         <translation>Verhalten Startbild Bibliothek</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="754"/>
+        <location filename="../preferencesdialog.ui" line="785"/>
         <source>Include companion splashes</source>
         <translation>&apos;companion&apos; Startbilder einschliessen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="759"/>
+        <location filename="../preferencesdialog.ui" line="790"/>
         <source>Only user defined splashes</source>
         <translation>Nur Benutzer Startbilder</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="286"/>
+        <location filename="../preferencesdialog.ui" line="430"/>
         <source>Custom TX splash screen</source>
         <translation>Benutzer Startbild</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="375"/>
+        <location filename="../preferencesdialog.ui" line="519"/>
         <source>Personal splash library</source>
         <translation>Benutzer Startbild Bibliothek</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="740"/>
+        <location filename="../preferencesdialog.ui" line="771"/>
         <source>Joystick</source>
         <translation>Joystick</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="326"/>
-        <location filename="../preferencesdialog.ui" line="806"/>
-        <location filename="../preferencesdialog.ui" line="941"/>
-        <location filename="../preferencesdialog.ui" line="1008"/>
+        <location filename="../preferencesdialog.ui" line="470"/>
+        <location filename="../preferencesdialog.ui" line="662"/>
+        <location filename="../preferencesdialog.ui" line="837"/>
+        <location filename="../preferencesdialog.ui" line="972"/>
         <source>Open Folder</source>
         <translation>Verzeichnis öffnen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="977"/>
+        <location filename="../preferencesdialog.ui" line="1008"/>
         <source>SD Structure path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="987"/>
+        <location filename="../preferencesdialog.ui" line="1018"/>
         <source>Processor ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="996"/>
+        <location filename="../preferencesdialog.ui" line="1027"/>
         <source>Simulator capture folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="1025"/>
+        <location filename="../preferencesdialog.ui" line="679"/>
         <source>Use clipboard only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11061,113 +11111,123 @@ May be different from firmware language</source>
         <translation>CheckBox</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="360"/>
+        <location filename="../preferencesdialog.ui" line="504"/>
         <source>Check for updates</source>
         <translation>Prüfe für Updates</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="908"/>
+        <location filename="../preferencesdialog.ui" line="939"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="488"/>
+        <location filename="../preferencesdialog.ui" line="632"/>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="454"/>
+        <location filename="../preferencesdialog.ui" line="598"/>
         <source>Export Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="461"/>
+        <location filename="../preferencesdialog.ui" line="605"/>
         <source>Save Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="478"/>
+        <location filename="../preferencesdialog.ui" line="622"/>
         <source>Import Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="58"/>
+        <location filename="../preferencesdialog.ui" line="71"/>
         <source>Simu BackLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="80"/>
+        <location filename="../preferencesdialog.ui" line="93"/>
         <source>Check for selected Fw updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="92"/>
+        <location filename="../preferencesdialog.ui" line="105"/>
         <source>Ask use of wizard for new models</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="164"/>
+        <location filename="../preferencesdialog.ui" line="177"/>
         <source>Remember switches in simulator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="172"/>
+        <location filename="../preferencesdialog.ui" line="185"/>
         <source>Blue</source>
         <oldsource>Blu</oldsource>
         <translation>blau</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="177"/>
+        <location filename="../preferencesdialog.ui" line="190"/>
         <source>Green</source>
         <translation>grün</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="182"/>
+        <location filename="../preferencesdialog.ui" line="195"/>
         <source>Red</source>
         <translation>rot</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="187"/>
+        <location filename="../preferencesdialog.ui" line="200"/>
         <source>Orange</source>
         <translation>orange</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="192"/>
+        <location filename="../preferencesdialog.ui" line="205"/>
         <source>Yellow</source>
         <translation>gelb</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="783"/>
+        <location filename="../preferencesdialog.ui" line="814"/>
         <source>Profile slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="813"/>
+        <location filename="../preferencesdialog.ui" line="844"/>
         <source>auto backup before write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="433"/>
+        <location filename="../preferencesdialog.ui" line="1616"/>
+        <source>Find Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="1625"/>
+        <source>Google Earth Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="577"/>
         <source>Ask for flashing after Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="295"/>
+        <location filename="../preferencesdialog.ui" line="439"/>
         <source>Enable</source>
         <translation>aktivieren</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="312"/>
+        <location filename="../preferencesdialog.ui" line="456"/>
         <source>Calibrate</source>
         <translation>kalibrieren</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="232"/>
+        <location filename="../preferencesdialog.ui" line="245"/>
         <source>Open Image</source>
         <translation>Bild öffnen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="141"/>
+        <location filename="../preferencesdialog.ui" line="154"/>
         <source>Invert Pixels</source>
         <translation>Pixel invertieren</translation>
     </message>
@@ -11176,63 +11236,66 @@ May be different from firmware language</source>
         <translation type="obsolete">HG Beleuchtung</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="353"/>
+        <location filename="../preferencesdialog.ui" line="497"/>
         <source>FwInfo</source>
         <translation>FwInfo</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="227"/>
+        <location filename="../preferencesdialog.cpp" line="233"/>
         <source>Last downloaded release: %1</source>
         <translation>Letzte geladene Version: %1</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="236"/>
         <source>The selected firmware has never been downloaded by companion9x.</source>
-        <translation>Die gewählte Firmware wurde noch nie von companion9x geladen.</translation>
+        <translation type="obsolete">Die gewählte Firmware wurde noch nie von companion9x geladen.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="240"/>
         <source>The selected firmware cannot be downloaded by companion9x.</source>
-        <translation>Die gewählte Firmware kann von companio9x nicht geladen werden.</translation>
+        <translation type="obsolete">Die gewählte Firmware kann von companio9x nicht geladen werden.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="447"/>
+        <location filename="../preferencesdialog.cpp" line="461"/>
         <source>Image stored in settings</source>
         <translation>Gewähltes Bild in Einstellungen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="458"/>
-        <location filename="../preferencesdialog.cpp" line="780"/>
+        <location filename="../preferencesdialog.cpp" line="472"/>
+        <location filename="../preferencesdialog.cpp" line="804"/>
         <source>No joysticks found</source>
         <translation>kein Joystick gefunden</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="569"/>
+        <location filename="../preferencesdialog.cpp" line="583"/>
         <source>Select your Models and Settings backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="597"/>
+        <location filename="../preferencesdialog.cpp" line="594"/>
+        <source>Select Google Earth executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="620"/>
         <source>Select the folder replicating your SD structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="641"/>
+        <location filename="../preferencesdialog.cpp" line="664"/>
         <source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="677"/>
+        <location filename="../preferencesdialog.cpp" line="701"/>
         <source>Export profile As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="699"/>
+        <location filename="../preferencesdialog.cpp" line="723"/>
         <source>Profile slot is not empty, profile slot %1 will we overwritten.&lt;br&gt;Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="705"/>
+        <location filename="../preferencesdialog.cpp" line="729"/>
         <source>Open Profile to import</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11241,34 +11304,44 @@ May be different from firmware language</source>
         <translation type="obsolete">Bitte Bibliothek Verzeichnis wählen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Open Image to load</source>
         <translation>Bilddatei öffnen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Images (%1)</source>
         <translation>Bilder (%1)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="532"/>
+        <location filename="../preferencesdialog.cpp" line="242"/>
+        <source>The selected firmware has never been downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="246"/>
+        <source>The selected firmware cannot be downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="546"/>
         <source>Select your library folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="542"/>
+        <location filename="../preferencesdialog.cpp" line="556"/>
         <source>Select your snapshot folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Cannot load %1.</source>
         <translation>Kann %1 nicht laden.</translation>
     </message>
@@ -12026,10 +12099,9 @@ May be different from firmware language</source>
 <context>
     <name>simulatorDialog</name>
     <message>
-        <location filename="../simulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
         <oldsource>ER9x Simulator</oldsource>
-        <translation>Companion9x Simulator</translation>
+        <translation type="obsolete">Companion9x Simulator</translation>
     </message>
     <message>
         <location filename="../simulatordialog.ui" line="844"/>
@@ -12165,7 +12237,7 @@ May be different from firmware language</source>
         <translation>9x Simulator</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1239"/>
+        <location filename="../simulatordialog.ui" line="1240"/>
         <source>Outputs</source>
         <translation>Ausgaben</translation>
     </message>
@@ -12205,264 +12277,269 @@ May be different from firmware language</source>
         <translation type="obsolete">SW12</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1854"/>
+        <location filename="../simulatordialog.ui" line="1856"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1265"/>
+        <location filename="../simulatordialog.ui" line="1266"/>
         <source>CS1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1296"/>
+        <location filename="../simulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../simulatordialog.ui" line="1297"/>
         <source>CS2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1327"/>
+        <location filename="../simulatordialog.ui" line="1328"/>
         <source>CS3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1358"/>
+        <location filename="../simulatordialog.ui" line="1359"/>
         <source>CS4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1389"/>
+        <location filename="../simulatordialog.ui" line="1390"/>
         <source>CS5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1420"/>
+        <location filename="../simulatordialog.ui" line="1421"/>
         <source>CS6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1451"/>
+        <location filename="../simulatordialog.ui" line="1452"/>
         <source>CS7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1482"/>
+        <location filename="../simulatordialog.ui" line="1483"/>
         <source>CS8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1513"/>
+        <location filename="../simulatordialog.ui" line="1514"/>
         <source>CS9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1544"/>
+        <location filename="../simulatordialog.ui" line="1545"/>
         <source>CSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1575"/>
+        <location filename="../simulatordialog.ui" line="1576"/>
         <source>CSB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1606"/>
+        <location filename="../simulatordialog.ui" line="1607"/>
         <source>CSC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1637"/>
+        <location filename="../simulatordialog.ui" line="1638"/>
         <source>CSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1668"/>
+        <location filename="../simulatordialog.ui" line="1669"/>
         <source>CSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1699"/>
+        <location filename="../simulatordialog.ui" line="1700"/>
         <source>CSF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1730"/>
+        <location filename="../simulatordialog.ui" line="1731"/>
         <source>CSG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1761"/>
+        <location filename="../simulatordialog.ui" line="1762"/>
         <source>CSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1792"/>
+        <location filename="../simulatordialog.ui" line="1793"/>
         <source>CSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1823"/>
+        <location filename="../simulatordialog.ui" line="1825"/>
         <source>CSJ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1885"/>
+        <location filename="../simulatordialog.ui" line="1887"/>
         <source>CSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1916"/>
+        <location filename="../simulatordialog.ui" line="1918"/>
         <source>CSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1947"/>
+        <location filename="../simulatordialog.ui" line="1949"/>
         <source>CSN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1978"/>
+        <location filename="../simulatordialog.ui" line="1980"/>
         <source>CSO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2009"/>
+        <location filename="../simulatordialog.ui" line="2011"/>
         <source>CSP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2040"/>
+        <location filename="../simulatordialog.ui" line="2042"/>
         <source>CSQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2071"/>
+        <location filename="../simulatordialog.ui" line="2073"/>
         <source>CSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2102"/>
+        <location filename="../simulatordialog.ui" line="2104"/>
         <source>CSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2133"/>
+        <location filename="../simulatordialog.ui" line="2135"/>
         <source>CST</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2164"/>
+        <location filename="../simulatordialog.ui" line="2166"/>
         <source>CSU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2195"/>
+        <location filename="../simulatordialog.ui" line="2197"/>
         <source>CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2226"/>
+        <location filename="../simulatordialog.ui" line="2228"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2307"/>
+        <location filename="../simulatordialog.ui" line="2310"/>
         <source>CH1</source>
         <translation>CH1</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2419"/>
+        <location filename="../simulatordialog.ui" line="2422"/>
         <source>CH9</source>
         <translation>CH9</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2432"/>
+        <location filename="../simulatordialog.ui" line="2435"/>
         <source>CH2</source>
         <translation>CH2</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2599"/>
+        <location filename="../simulatordialog.ui" line="2602"/>
         <source>CH10</source>
         <translation>CH10</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2612"/>
+        <location filename="../simulatordialog.ui" line="2615"/>
         <source>CH3</source>
         <translation>CH3</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2779"/>
+        <location filename="../simulatordialog.ui" line="2782"/>
         <source>CH11</source>
         <translation>CH11</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2792"/>
+        <location filename="../simulatordialog.ui" line="2795"/>
         <source>CH4</source>
         <translation>CH4</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2959"/>
+        <location filename="../simulatordialog.ui" line="2962"/>
         <source>CH12</source>
         <translation>CH12</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2972"/>
+        <location filename="../simulatordialog.ui" line="2975"/>
         <source>CH5</source>
         <translation>CH5</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3133"/>
+        <location filename="../simulatordialog.ui" line="3136"/>
         <source>CH13</source>
         <translation>CH13</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3146"/>
+        <location filename="../simulatordialog.ui" line="3149"/>
         <source>CH6</source>
         <translation>CH6</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3258"/>
+        <location filename="../simulatordialog.ui" line="3261"/>
         <source>CH14</source>
         <translation>CH14</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3271"/>
+        <location filename="../simulatordialog.ui" line="3274"/>
         <source>CH7</source>
         <translation>CH7</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3438"/>
+        <location filename="../simulatordialog.ui" line="3441"/>
         <source>CH15</source>
         <translation>CH15</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3451"/>
+        <location filename="../simulatordialog.ui" line="3454"/>
         <source>CH8</source>
         <translation>CH8</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3618"/>
+        <location filename="../simulatordialog.ui" line="3621"/>
         <source>CH16</source>
         <translation>CH16</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2326"/>
-        <location filename="../simulatordialog.ui" line="2348"/>
-        <location filename="../simulatordialog.ui" line="2506"/>
-        <location filename="../simulatordialog.ui" line="2528"/>
-        <location filename="../simulatordialog.ui" line="2686"/>
-        <location filename="../simulatordialog.ui" line="2708"/>
-        <location filename="../simulatordialog.ui" line="2866"/>
-        <location filename="../simulatordialog.ui" line="2888"/>
-        <location filename="../simulatordialog.ui" line="3040"/>
-        <location filename="../simulatordialog.ui" line="3062"/>
-        <location filename="../simulatordialog.ui" line="3165"/>
-        <location filename="../simulatordialog.ui" line="3187"/>
-        <location filename="../simulatordialog.ui" line="3345"/>
-        <location filename="../simulatordialog.ui" line="3367"/>
-        <location filename="../simulatordialog.ui" line="3525"/>
-        <location filename="../simulatordialog.ui" line="3547"/>
+        <location filename="../simulatordialog.ui" line="2329"/>
+        <location filename="../simulatordialog.ui" line="2351"/>
+        <location filename="../simulatordialog.ui" line="2509"/>
+        <location filename="../simulatordialog.ui" line="2531"/>
+        <location filename="../simulatordialog.ui" line="2689"/>
+        <location filename="../simulatordialog.ui" line="2711"/>
+        <location filename="../simulatordialog.ui" line="2869"/>
+        <location filename="../simulatordialog.ui" line="2891"/>
+        <location filename="../simulatordialog.ui" line="3043"/>
+        <location filename="../simulatordialog.ui" line="3065"/>
+        <location filename="../simulatordialog.ui" line="3168"/>
+        <location filename="../simulatordialog.ui" line="3190"/>
+        <location filename="../simulatordialog.ui" line="3348"/>
+        <location filename="../simulatordialog.ui" line="3370"/>
+        <location filename="../simulatordialog.ui" line="3528"/>
+        <location filename="../simulatordialog.ui" line="3550"/>
         <source>-100.1</source>
         <translation>-100.1</translation>
     </message>
@@ -12544,9 +12621,8 @@ May be different from firmware language</source>
 <context>
     <name>xsimulatorDialog</name>
     <message>
-        <location filename="../xsimulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation type="unfinished">Companion9x Simulator</translation>
+        <translation type="obsolete">Companion9x Simulator</translation>
     </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1089"/>
@@ -12655,7 +12731,7 @@ May be different from firmware language</source>
         <translation type="unfinished">Ausgaben</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2896"/>
+        <location filename="../xsimulatordialog.ui" line="2897"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation type="unfinished"></translation>
@@ -12723,6 +12799,11 @@ May be different from firmware language</source>
         <source>S2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../xsimulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="480"/>
         <location filename="../xsimulatordialog.ui" line="595"/>
@@ -12753,16 +12834,16 @@ May be different from firmware language</source>
         <location filename="../xsimulatordialog.ui" line="1772"/>
         <location filename="../xsimulatordialog.ui" line="1930"/>
         <location filename="../xsimulatordialog.ui" line="1952"/>
-        <location filename="../xsimulatordialog.ui" line="2110"/>
-        <location filename="../xsimulatordialog.ui" line="2132"/>
-        <location filename="../xsimulatordialog.ui" line="2284"/>
-        <location filename="../xsimulatordialog.ui" line="2306"/>
-        <location filename="../xsimulatordialog.ui" line="2409"/>
-        <location filename="../xsimulatordialog.ui" line="2431"/>
-        <location filename="../xsimulatordialog.ui" line="2589"/>
-        <location filename="../xsimulatordialog.ui" line="2611"/>
-        <location filename="../xsimulatordialog.ui" line="2769"/>
-        <location filename="../xsimulatordialog.ui" line="2791"/>
+        <location filename="../xsimulatordialog.ui" line="2111"/>
+        <location filename="../xsimulatordialog.ui" line="2133"/>
+        <location filename="../xsimulatordialog.ui" line="2285"/>
+        <location filename="../xsimulatordialog.ui" line="2307"/>
+        <location filename="../xsimulatordialog.ui" line="2410"/>
+        <location filename="../xsimulatordialog.ui" line="2432"/>
+        <location filename="../xsimulatordialog.ui" line="2590"/>
+        <location filename="../xsimulatordialog.ui" line="2612"/>
+        <location filename="../xsimulatordialog.ui" line="2770"/>
+        <location filename="../xsimulatordialog.ui" line="2792"/>
         <source>-100.1</source>
         <translation type="unfinished">-100.1</translation>
     </message>
@@ -12797,202 +12878,202 @@ May be different from firmware language</source>
         <translation type="unfinished">CH4</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2203"/>
+        <location filename="../xsimulatordialog.ui" line="2204"/>
         <source>CH12</source>
         <translation type="unfinished">CH12</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2216"/>
+        <location filename="../xsimulatordialog.ui" line="2217"/>
         <source>CH5</source>
         <translation type="unfinished">CH5</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2377"/>
+        <location filename="../xsimulatordialog.ui" line="2378"/>
         <source>CH13</source>
         <translation type="unfinished">CH13</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2390"/>
+        <location filename="../xsimulatordialog.ui" line="2391"/>
         <source>CH6</source>
         <translation type="unfinished">CH6</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2502"/>
+        <location filename="../xsimulatordialog.ui" line="2503"/>
         <source>CH14</source>
         <translation type="unfinished">CH14</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2515"/>
+        <location filename="../xsimulatordialog.ui" line="2516"/>
         <source>CH7</source>
         <translation type="unfinished">CH7</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2682"/>
+        <location filename="../xsimulatordialog.ui" line="2683"/>
         <source>CH15</source>
         <translation type="unfinished">CH15</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2695"/>
+        <location filename="../xsimulatordialog.ui" line="2696"/>
         <source>CH8</source>
         <translation type="unfinished">CH8</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2862"/>
+        <location filename="../xsimulatordialog.ui" line="2863"/>
         <source>CH16</source>
         <translation type="unfinished">CH16</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2927"/>
+        <location filename="../xsimulatordialog.ui" line="2928"/>
         <source>CSC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2958"/>
+        <location filename="../xsimulatordialog.ui" line="2959"/>
         <source>CSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2989"/>
+        <location filename="../xsimulatordialog.ui" line="2990"/>
         <source>CS7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3020"/>
+        <location filename="../xsimulatordialog.ui" line="3021"/>
         <source>CSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3051"/>
+        <location filename="../xsimulatordialog.ui" line="3052"/>
         <source>CSB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3082"/>
+        <location filename="../xsimulatordialog.ui" line="3083"/>
         <source>CS1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3113"/>
+        <location filename="../xsimulatordialog.ui" line="3114"/>
         <source>CSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3144"/>
+        <location filename="../xsimulatordialog.ui" line="3145"/>
         <source>CSG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3175"/>
+        <location filename="../xsimulatordialog.ui" line="3176"/>
         <source>CSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3206"/>
+        <location filename="../xsimulatordialog.ui" line="3207"/>
         <source>CSF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3237"/>
+        <location filename="../xsimulatordialog.ui" line="3238"/>
         <source>CS8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3268"/>
+        <location filename="../xsimulatordialog.ui" line="3269"/>
         <source>CS9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3299"/>
+        <location filename="../xsimulatordialog.ui" line="3300"/>
         <source>CSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3330"/>
+        <location filename="../xsimulatordialog.ui" line="3331"/>
         <source>CSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3361"/>
+        <location filename="../xsimulatordialog.ui" line="3362"/>
         <source>CSJ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3392"/>
+        <location filename="../xsimulatordialog.ui" line="3393"/>
         <source>CSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3423"/>
+        <location filename="../xsimulatordialog.ui" line="3424"/>
         <source>CS4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3454"/>
+        <location filename="../xsimulatordialog.ui" line="3455"/>
         <source>CS5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3485"/>
+        <location filename="../xsimulatordialog.ui" line="3486"/>
         <source>CS2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3516"/>
+        <location filename="../xsimulatordialog.ui" line="3517"/>
         <source>CS3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3547"/>
+        <location filename="../xsimulatordialog.ui" line="3548"/>
         <source>CS6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3578"/>
+        <location filename="../xsimulatordialog.ui" line="3579"/>
         <source>CSN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3609"/>
+        <location filename="../xsimulatordialog.ui" line="3610"/>
         <source>CSO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3640"/>
+        <location filename="../xsimulatordialog.ui" line="3641"/>
         <source>CSP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3671"/>
+        <location filename="../xsimulatordialog.ui" line="3672"/>
         <source>CSQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3702"/>
+        <location filename="../xsimulatordialog.ui" line="3703"/>
         <source>CSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3733"/>
+        <location filename="../xsimulatordialog.ui" line="3734"/>
         <source>CSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3764"/>
+        <location filename="../xsimulatordialog.ui" line="3765"/>
         <source>CST</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3795"/>
+        <location filename="../xsimulatordialog.ui" line="3796"/>
         <source>CSU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3826"/>
+        <location filename="../xsimulatordialog.ui" line="3827"/>
         <source>CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3857"/>
+        <location filename="../xsimulatordialog.ui" line="3858"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation type="unfinished"></translation>
diff --git a/companion/src/translations/companion9x_fr.ts b/companion/src/translations/companion_fr.ts
similarity index 94%
rename from companion/src/translations/companion9x_fr.ts
rename to companion/src/translations/companion_fr.ts
index 46f1297e4..d62d3e8c8 100644
--- a/companion/src/translations/companion9x_fr.ts
+++ b/companion/src/translations/companion_fr.ts
@@ -1202,7 +1202,7 @@ Are you sure ?</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
@@ -1211,17 +1211,17 @@ Are you sure ?</source>
         <translation type="obsolete">Flasher</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1659"/>
         <source>Cu&amp;t</source>
         <translation>C&amp;ouper</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1911"/>
+        <location filename="../mainwindow.cpp" line="1912"/>
         <source>Edit</source>
         <translation>Edition</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1874"/>
+        <location filename="../mainwindow.cpp" line="1875"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
@@ -1240,33 +1240,32 @@ Are you sure ?</source>
         <translation>Nouvelle version disponible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="281"/>
         <source>A new release of companion is available please check the repository</source>
-        <translation>Une nouvelle version de companion9x est disponible, veuillez vérifier dans l&apos;espace de téléchargement</translation>
+        <translation type="obsolete">Une nouvelle version de companion9x est disponible, veuillez vérifier dans l&apos;espace de téléchargement</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="337"/>
         <location filename="../mainwindow.cpp" line="366"/>
         <location filename="../mainwindow.cpp" line="377"/>
         <location filename="../mainwindow.cpp" line="406"/>
-        <location filename="../mainwindow.cpp" line="901"/>
-        <location filename="../mainwindow.cpp" line="2066"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
-        <location filename="../mainwindow.cpp" line="2124"/>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="338"/>
         <location filename="../mainwindow.cpp" line="378"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
         <source>Error opening file %1:
 %2.</source>
         <translation>Erreur à l&apos;ouverture du fichier %1:
@@ -1306,10 +1305,8 @@ Are you sure ?</source>
         <translation>Serveur de compilation trop occupé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="359"/>
-        <location filename="../mainwindow.cpp" line="399"/>
         <source>Compilation server requires registration, please check opentx web site</source>
-        <translation>Le serveur de compilation nécessite d&apos;être enregistré, veuillez vous référer au site web d&apos;openTx</translation>
+        <translation type="obsolete">Le serveur de compilation nécessite d&apos;être enregistré, veuillez vous référer au site web d&apos;openTx</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="362"/>
@@ -1322,70 +1319,70 @@ Are you sure ?</source>
         <translation type="obsolete">Voulez-vous flasher ce firmware maintenant ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
-        <location filename="../mainwindow.cpp" line="517"/>
+        <location filename="../mainwindow.cpp" line="489"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="489"/>
-        <location filename="../mainwindow.cpp" line="518"/>
+        <location filename="../mainwindow.cpp" line="490"/>
+        <location filename="../mainwindow.cpp" line="519"/>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="491"/>
-        <location filename="../mainwindow.cpp" line="520"/>
+        <location filename="../mainwindow.cpp" line="492"/>
+        <location filename="../mainwindow.cpp" line="521"/>
         <source>Release Notes</source>
         <translation>Release Notes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="499"/>
-        <location filename="../mainwindow.cpp" line="529"/>
+        <location filename="../mainwindow.cpp" line="500"/>
+        <location filename="../mainwindow.cpp" line="530"/>
         <source>Do you want to download release %1 now ?</source>
         <translation>Voulez-vous télécharger la release %1 ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="556"/>
+        <location filename="../mainwindow.cpp" line="557"/>
         <source>Release notes contain very important informations. Do you want to see them now ?</source>
         <translation>Les notes de version contiennent des informations très importantes. Voulez-vous les voir maintenant?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="623"/>
+        <location filename="../mainwindow.cpp" line="624"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Firmware updates</source>
         <translation>Mises à jour de firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Current firmware does not provide release notes informations.</source>
         <translation>Le firmware actuel ne contient pas de notes de version.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="903"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Ecriture fichier %1 impossible:
 %2.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Taranis radio not found</source>
         <translation>Radio Taranis non détectée</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
         <source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
         <translation>Impossible de trouver la radio, vérifiez qu&apos;elle est bien sous tension et connectée.</translation>
     </message>
@@ -1396,16 +1393,16 @@ Burn anyway ?</source>
         <translation type="obsolete">Le fichier %1 n&apos;est pas reconnu comme une EEPROM valide. Confirmer le transfert ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Backup is impossible</source>
         <translation>Sauvegarde impossible</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation>Le dossier de sauvegarde configuré dans les préférences n&apos;existe pas</translation>
     </message>
@@ -1418,8 +1415,8 @@ Burn anyway ?</source>
         <translation type="obsolete">Impossible de vérifier la compatibilité de l&apos;EEPROM! Continuer quand même?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
@@ -1440,7 +1437,7 @@ Burn anyway ?</source>
         <translation type="obsolete">Flasher l&apos;émetteur</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Conversion failed</source>
         <translation>La conversion a échoué</translation>
     </message>
@@ -1453,7 +1450,7 @@ Burn anyway ?</source>
         <translation type="obsolete">Restaurer l&apos;EEPROM vers l&apos;émetteur</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Restore failed</source>
         <translation>Erreur lors de la restauration</translation>
     </message>
@@ -1470,7 +1467,7 @@ Burn anyway ?</source>
         <translation type="obsolete">Impossible de flasher l&apos;émetteur, l&apos;EEPROM d&apos;origine se trouve dans : %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Backup failed</source>
         <translation>Erreur lors de la sauvegarde</translation>
     </message>
@@ -1479,87 +1476,86 @@ Burn anyway ?</source>
         <translation type="obsolete">Impossible de sauvegarder l&apos;EEPROM. Flashage annulé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1565"/>
+        <location filename="../mainwindow.cpp" line="1566"/>
         <source>%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>&amp;loadBackup...</source>
         <translation>c&amp;harger sauvegarde...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>Load backup from file</source>
         <translation>Charger une sauvegarde à partir du fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Lo&amp;gs</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Ctrl+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Open log file</source>
         <translation>Ouvrir fichier de log</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>ChangeLog...</source>
         <translation>Historique des changements...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
         <source>Show companion9x changelog</source>
-        <translation>Historique des changements de companion9x</translation>
+        <translation type="obsolete">Historique des changements de companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Firmware ChangeLog...</source>
         <translation>Historique des changements du firmware...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Show firmware changelog</source>
         <translation>Montrer l&apos;historique des changements du firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Compare...</source>
         <translation>Comparer...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Compare models</source>
         <translation>Comparer les modèles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1704"/>
+        <location filename="../mainwindow.cpp" line="1705"/>
         <source>Configure software for reading from and writing to the transmitter</source>
         <translation>Configure le programme pour communiquer correctement avec la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1713"/>
+        <location filename="../mainwindow.cpp" line="1714"/>
         <source>Show fuses dialog</source>
         <translation>Afficher les réglages des fusibles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1820"/>
+        <location filename="../mainwindow.cpp" line="1821"/>
         <source>&amp;Read/Write</source>
         <translation>&amp;Lire/Ecrire</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1916"/>
+        <location filename="../mainwindow.cpp" line="1917"/>
         <source>Write</source>
         <translation>Ecrire</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2066"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
         <source>Unable to find file %1!</source>
         <translation>Fichier %1 introuvable!</translation>
     </message>
@@ -1568,7 +1564,7 @@ Burn anyway ?</source>
         <translation type="obsolete">Fichier EEPROM %1 invalide</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2124"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
         <source>Error reading file %1:
 %2.</source>
         <translation>Fichier %1 corrompu:
@@ -1587,78 +1583,119 @@ Burn anyway ?</source>
         <translation type="obsolete">Fl&amp;asher</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1815"/>
+        <location filename="../mainwindow.cpp" line="1816"/>
         <source>&amp;Edit</source>
         <translation>Éditio&amp;n</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1790"/>
+        <location filename="../mainwindow.cpp" line="1791"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1844"/>
+        <location filename="../mainwindow.cpp" line="1845"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1607"/>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1738"/>
+        <location filename="../mainwindow.cpp" line="1739"/>
         <source>&amp;Tile</source>
         <translation>&amp;Mosaïque</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1653"/>
         <source>E&amp;xit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1717"/>
+        <location filename="../mainwindow.cpp" line="1718"/>
         <source>Alt+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1716"/>
+        <location filename="../mainwindow.cpp" line="1717"/>
         <source>&amp;Simulate</source>
         <translation>&amp;Simulation</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="106"/>
+        <location filename="../mainwindow.cpp" line="722"/>
+        <location filename="../mainwindow.cpp" line="742"/>
+        <source>Companion - Models and Settings Editor - %1 - profile %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="716"/>
+        <location filename="../mainwindow.cpp" line="733"/>
+        <location filename="../mainwindow.cpp" line="744"/>
+        <source>Companion - Models and Settings Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="260"/>
+        <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="281"/>
+        <source>A new release of Companion is available please check the repository</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="350"/>
         <source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
         <translation>Le firmware sélectionné est trop gros pour la mémoire de la radio, veuillez sélectionner moins d&apos;options</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="359"/>
+        <location filename="../mainwindow.cpp" line="399"/>
+        <source>Compilation server requires registration, please check OpenTX web site</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="390"/>
         <source>Firmware does not fit in the Tx, due to selected firmware options</source>
         <translation>Le firmware sélectionné est trop gros pour la mémoire de la radio, veuillez sélectionner moins d&apos;options</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
+        <location filename="../mainwindow.cpp" line="1080"/>
         <source>Write Models and settings from %1 to the Tx?</source>
         <translation>Ecrire les réglages et modèles de %1 dans la radio?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
+        <location filename="../mainwindow.cpp" line="1631"/>
+        <source>Show Companion contributors list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1635"/>
+        <source>Show Companion changelog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1747"/>
         <source>Ne&amp;xt</source>
         <translation>Sui&amp;vante</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1788"/>
-        <location filename="../mainwindow.cpp" line="1891"/>
+        <location filename="../mainwindow.cpp" line="1789"/>
+        <location filename="../mainwindow.cpp" line="1892"/>
         <source>Firmware Profiles</source>
         <translation>Profils de firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location filename="../mainwindow.cpp" line="1936"/>
         <source>Ready</source>
         <translation>Prêt</translation>
     </message>
@@ -1667,39 +1704,39 @@ Burn anyway ?</source>
         <translation type="obsolete">Enregistrer la mémoire Flash sous</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1763"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
         <source>Show the application&apos;s About box</source>
         <translation>Afficher la fenêtre &quot;A propos&quot; de l&apos;application</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1563"/>
-        <location filename="../mainwindow.cpp" line="2019"/>
-        <location filename="../mainwindow.cpp" line="2040"/>
+        <location filename="../mainwindow.cpp" line="1564"/>
+        <location filename="../mainwindow.cpp" line="2020"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
         <source>&amp;%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1762"/>
+        <location filename="../mainwindow.cpp" line="1763"/>
         <source>&amp;About</source>
         <translation>&amp;À Propos</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1671"/>
         <source>&amp;Paste</source>
         <translation>Co&amp;ller</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1722"/>
+        <location filename="../mainwindow.cpp" line="1723"/>
         <source>&amp;Print</source>
         <translation>Im&amp;primer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Save &amp;As...</source>
         <translation>Enregistrer &amp;Sous...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1743"/>
+        <location filename="../mainwindow.cpp" line="1744"/>
         <source>Cascade the windows</source>
         <translation>Disposer les fenêtres en cascade</translation>
     </message>
@@ -1708,32 +1745,32 @@ Burn anyway ?</source>
         <translation type="obsolete">Lire la mémoire Flash</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1673"/>
         <source>Paste the clipboard&apos;s contents into the current selection</source>
         <translation>Coller le contenu du presse-papier à l&apos;emplacement sélectionné</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
+        <location filename="../mainwindow.cpp" line="1600"/>
         <source>Open an existing file</source>
         <translation>Ouvrir un fichier existant</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1703"/>
+        <location filename="../mainwindow.cpp" line="1704"/>
         <source>&amp;Configure...</source>
         <translation>&amp;Configurer la communication...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1728"/>
+        <location filename="../mainwindow.cpp" line="1729"/>
         <source>Cl&amp;ose</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1723"/>
+        <location filename="../mainwindow.cpp" line="1724"/>
         <source>Ctrl+P</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location filename="../mainwindow.cpp" line="1725"/>
         <source>Print current model.</source>
         <translation>Imprimer les données du modèle sélectionné.</translation>
     </message>
@@ -1742,7 +1779,7 @@ Burn anyway ?</source>
         <translation type="obsolete">Charger l&apos;EEPROM de l&apos;émetteur</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1734"/>
+        <location filename="../mainwindow.cpp" line="1735"/>
         <source>Close all the windows</source>
         <translation>Fermer toutes les fenêtres</translation>
     </message>
@@ -1751,56 +1788,56 @@ Burn anyway ?</source>
         <translation type="obsolete">Écrire dans la mémoire Flash de l&apos;émetteur</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1497"/>
+        <location filename="../mainwindow.cpp" line="1498"/>
         <source>donating</source>
         <translation>don</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1598"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ouvrir...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
         <source>Create a new file</source>
         <translation>Créer un nouveau fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1729"/>
+        <location filename="../mainwindow.cpp" line="1730"/>
         <source>Close the active window</source>
         <translation>Fermer la fenêtre active</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="147"/>
-        <location filename="../mainwindow.cpp" line="635"/>
-        <location filename="../mainwindow.cpp" line="669"/>
-        <location filename="../mainwindow.cpp" line="2161"/>
+        <location filename="../mainwindow.cpp" line="636"/>
+        <location filename="../mainwindow.cpp" line="670"/>
+        <location filename="../mainwindow.cpp" line="2162"/>
         <source>File loaded</source>
         <translation>Fichier chargé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="644"/>
-        <location filename="../mainwindow.cpp" line="650"/>
+        <location filename="../mainwindow.cpp" line="645"/>
+        <location filename="../mainwindow.cpp" line="651"/>
         <source>File saved</source>
         <translation>Fichier sauvegardé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1766"/>
+        <location filename="../mainwindow.cpp" line="1767"/>
         <source>Switch layout direction</source>
         <translation>Inverser l&apos;interface</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1754"/>
+        <location filename="../mainwindow.cpp" line="1755"/>
         <source>Move the focus to the previous window</source>
         <translation>Activer la fenêtre précedente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1752"/>
+        <location filename="../mainwindow.cpp" line="1753"/>
         <source>Pre&amp;vious</source>
         <translation>P&amp;récédente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1655"/>
         <source>Exit the application</source>
         <translation>Quitter l&apos;application</translation>
     </message>
@@ -1809,32 +1846,32 @@ Burn anyway ?</source>
         <translation type="obsolete">Écrire la mémoire Flash</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1709"/>
+        <location filename="../mainwindow.cpp" line="1710"/>
         <source>List available programmers</source>
         <translation>Lister les programmateurs supportés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1608"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Save the document to disk</source>
         <translation>Enregistrer sur le disque</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1733"/>
+        <location filename="../mainwindow.cpp" line="1734"/>
         <source>Close &amp;All</source>
         <translation>Fermer To&amp;ut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1742"/>
+        <location filename="../mainwindow.cpp" line="1743"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Cascade</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1718"/>
+        <location filename="../mainwindow.cpp" line="1719"/>
         <source>Simulate selected model.</source>
         <translation>Simuler le modèle sélectionné</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1739"/>
+        <location filename="../mainwindow.cpp" line="1740"/>
         <source>Tile the windows</source>
         <translation>Disposer les fenêtres en mosaïque</translation>
     </message>
@@ -1843,47 +1880,46 @@ Burn anyway ?</source>
         <translation type="obsolete">Lire la mémoire Flash de l&apos;émetteur</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1613"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
         <source>Save the document under a new name</source>
         <translation>Enregistrer sous un nom différent</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1838"/>
+        <location filename="../mainwindow.cpp" line="1839"/>
         <source>&amp;Window</source>
         <translation>Fe&amp;nêtre</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
+        <location filename="../mainwindow.cpp" line="1623"/>
         <source>Edit general preferences</source>
         <translation>Définir les préférences générales</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
+        <location filename="../mainwindow.cpp" line="1622"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Préférences...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1499"/>
         <source>About companion9x</source>
-        <translation>À propos de companion9x</translation>
+        <translation type="obsolete">À propos de companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1712"/>
+        <location filename="../mainwindow.cpp" line="1713"/>
         <source>&amp;Fuses...</source>
         <translation>&amp;Fusibles...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1667"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Copier la sélection dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1748"/>
+        <location filename="../mainwindow.cpp" line="1749"/>
         <source>Move the focus to the next window</source>
         <translation>Activer la fenêtre suivante</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1708"/>
+        <location filename="../mainwindow.cpp" line="1709"/>
         <source>&amp;List programmers</source>
         <translation>&amp;Programmateurs supportés</translation>
     </message>
@@ -1892,17 +1928,17 @@ Burn anyway ?</source>
         <translation type="obsolete">Transférer l&apos;EEPROM vers l&apos;émetteur</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1661"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Couper la sélection et la copier dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1683"/>
+        <location filename="../mainwindow.cpp" line="1684"/>
         <source>Ctrl+Alt+R</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1678"/>
+        <location filename="../mainwindow.cpp" line="1679"/>
         <source>Ctrl+Alt+W</source>
         <translation></translation>
     </message>
@@ -1923,22 +1959,21 @@ Burn anyway ?</source>
         <translation type="obsolete">Enregistrer l&apos;EEPROM de l&apos;émetteur dans un fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1493"/>
+        <location filename="../mainwindow.cpp" line="1494"/>
         <source>Version %1 (revision %2), %3</source>
         <translation>Version %1 (révision %2), %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1494"/>
         <source>The companion9x project was originally forked from eePe</source>
-        <translation>Le projet companion9x a été créé à partir de eePe</translation>
+        <translation type="obsolete">Le projet companion9x a été créé à partir de eePe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Customize your &amp;TX...</source>
         <translation>&amp;Personnaliser votre émetteur...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Customize the splash screen of your TX</source>
         <translation>Personnaliser l&apos;écran de démarrage de votre émetteur</translation>
     </message>
@@ -1962,8 +1997,8 @@ Burn anyway ?</source>
         <location filename="../mainwindow.cpp" line="268"/>
         <location filename="../mainwindow.cpp" line="270"/>
         <location filename="../mainwindow.cpp" line="310"/>
-        <location filename="../mainwindow.cpp" line="570"/>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="571"/>
+        <location filename="../mainwindow.cpp" line="573"/>
         <source>Save As</source>
         <translation>Enregistrer Sous</translation>
     </message>
@@ -1974,7 +2009,7 @@ Burn anyway ?</source>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="285"/>
-        <location filename="../mainwindow.cpp" line="543"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>No updates available at this time.</source>
         <translation>Aucune mise à jour disponible.</translation>
     </message>
@@ -1982,8 +2017,8 @@ Burn anyway ?</source>
         <location filename="../mainwindow.cpp" line="246"/>
         <location filename="../mainwindow.cpp" line="289"/>
         <location filename="../mainwindow.cpp" line="467"/>
-        <location filename="../mainwindow.cpp" line="589"/>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="590"/>
+        <location filename="../mainwindow.cpp" line="594"/>
         <source>Unable to check for updates.</source>
         <translation>Impossible de rechercher des mises à jour.</translation>
     </message>
@@ -1993,7 +2028,7 @@ Burn anyway ?</source>
         <translation>Voulez-vous lancer l&apos;installation ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="516"/>
+        <location filename="../mainwindow.cpp" line="517"/>
         <source>A new version of %1 firmware is available (current %2 - newer %3).
 Do you want to download it now ?</source>
         <translation>Une nouvelle version du firmware %1 est disponible (courante %2 - nouvelle %3).
@@ -2004,32 +2039,31 @@ Voulez vous la télécharger maintenant ?</translation>
         <translation type="obsolete">Transférer %1 dans la mémoire EEPROM de l&apos;émetteur ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>&amp;Check for updates...</source>
         <translation>Re&amp;chercher des mises à jour...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
         <source>Check for new version of companion9x/er9x</source>
-        <translation>Vérifier l&apos;existence d&apos;une nouvelle version de companion9x et du firmware sélectionné</translation>
+        <translation type="obsolete">Vérifier l&apos;existence d&apos;une nouvelle version de companion9x et du firmware sélectionné</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1492"/>
+        <location filename="../mainwindow.cpp" line="1493"/>
         <source>Copyright</source>
         <translation>Copyright</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1767"/>
+        <location filename="../mainwindow.cpp" line="1768"/>
         <source>Switch layout Left/Right</source>
         <translation>Inverser l&apos;interface gauche/droite</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>Ignore this version (r%1)?</source>
         <translation>Ignorer cette version (r%1)?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1928"/>
+        <location filename="../mainwindow.cpp" line="1929"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
@@ -2039,24 +2073,16 @@ Voulez vous la télécharger maintenant ?</translation>
         <translation>Recherche de mises à jour</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="106"/>
-        <location filename="../mainwindow.cpp" line="721"/>
-        <location filename="../mainwindow.cpp" line="741"/>
         <source>companion9x - Models and Settings Editor - %1 - profile %2</source>
-        <translation>companion9x - Editeur de réglages et modèles - %1 - profil %2</translation>
+        <translation type="obsolete">companion9x - Editeur de réglages et modèles - %1 - profil %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="108"/>
-        <location filename="../mainwindow.cpp" line="715"/>
-        <location filename="../mainwindow.cpp" line="732"/>
-        <location filename="../mainwindow.cpp" line="743"/>
         <source>companion9x - Models and Settings Editor - %1</source>
-        <translation>companion9x - Editeur de réglages et modèles - %1</translation>
+        <translation type="obsolete">companion9x - Editeur de réglages et modèles - %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="260"/>
         <source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
-        <translation>Une nouvelle version de companion9x est disponible (r%1)&lt;br&gt;Voulez-vous la télécharger ?</translation>
+        <translation type="obsolete">Une nouvelle version de companion9x est disponible (r%1)&lt;br&gt;Voulez-vous la télécharger ?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="430"/>
@@ -2064,7 +2090,7 @@ Voulez vous la télécharger maintenant ?</translation>
         <translation>Voulez-vous vraiment flasher le firmware de la radio?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="487"/>
+        <location filename="../mainwindow.cpp" line="488"/>
         <source>Firmware %1 does not seem to have ever been downloaded.
 Version %2 is available.
 Do you want to download it now ?</source>
@@ -2073,15 +2099,15 @@ La version %2 est disponible.
 Voulez-vous la télécharger maintenant ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1051"/>
-        <location filename="../mainwindow.cpp" line="1058"/>
-        <location filename="../mainwindow.cpp" line="1427"/>
-        <location filename="../mainwindow.cpp" line="1434"/>
+        <location filename="../mainwindow.cpp" line="1052"/>
+        <location filename="../mainwindow.cpp" line="1059"/>
+        <location filename="../mainwindow.cpp" line="1428"/>
+        <location filename="../mainwindow.cpp" line="1435"/>
         <source>Read Models and Settings From Tx</source>
         <translation>Lire les réglages et modèles depuis la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1082"/>
+        <location filename="../mainwindow.cpp" line="1083"/>
         <source>The file %1
 has not been recognized as a valid Models and Settings file
 Write anyway ?</source>
@@ -2090,158 +2116,172 @@ n&apos;a pas été reconnu comme un fichier de réglage et modèles valide.
 Ecrire quand même?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1108"/>
-        <location filename="../mainwindow.cpp" line="1115"/>
-        <location filename="../mainwindow.cpp" line="1158"/>
-        <location filename="../mainwindow.cpp" line="1165"/>
-        <location filename="../mainwindow.cpp" line="1357"/>
-        <location filename="../mainwindow.cpp" line="1399"/>
+        <location filename="../mainwindow.cpp" line="1109"/>
+        <location filename="../mainwindow.cpp" line="1116"/>
+        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1166"/>
+        <location filename="../mainwindow.cpp" line="1358"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>Backup Models and Settings From Tx</source>
         <translation>Sauvegarder les réglages et modèles depuis la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1131"/>
+        <location filename="../mainwindow.cpp" line="1132"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation>Impossible de vérifier la compatibilité des réglages et modèles. Continuer quand même?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
         <source>The transmitter firmware belongs to another product family, check file and preferences!</source>
         <translation>Le firmware sélectionné est destiné à un différent type de radio, veuillez vérifier le fichier et les préférences!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>The transmitter firmware is outdated, please upgrade!</source>
         <translation>Le firmware de la radio est obsolète, veuillez mettre à jour!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1180"/>
+        <location filename="../mainwindow.cpp" line="1181"/>
         <source>Write Models and Settings To Tx</source>
         <translation>Ecrire les réglages et modèles dans la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1363"/>
-        <location filename="../mainwindow.cpp" line="1406"/>
+        <location filename="../mainwindow.cpp" line="1364"/>
+        <location filename="../mainwindow.cpp" line="1407"/>
         <source>Write Firmware To Tx</source>
         <translation>Flasher le firmware de la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Cannot convert Models and Settings for use with this firmware, original data will be used</source>
         <translation>Impossible de convertir les réglages et modèles pour ce firmware, les données originales vont être utilisées</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1375"/>
         <source>Restore Models and Settings To Tx</source>
         <translation>Restaurer une sauvegarde de réglages et modèles</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Could not restore Models and Settings to TX. The models and settings data file can be found at: %1</source>
         <translation>Impossible de restaurerles réglages et modèles. Une copie du fichier est placée ici: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Firmware write failed</source>
         <translation>L&apos;écriture du firmware a échoué.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Could not write firmware to to transmitter. The models and settings data file can be found at: %1</source>
         <translation>Impossible de flasher le firmware. Une copie du fichier de réglages et modèles est placée ici: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Cannot backup existing Models and Settings from TX. Firmware write process aborted</source>
         <translation>Impossible de sauvegarder les réglages et modèles de la radio. Le flashage est abandonné.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1416"/>
+        <location filename="../mainwindow.cpp" line="1417"/>
         <source>Save transmitter Models and Settings to File</source>
         <translation>Sauvegarder les réglages et modèles depuis la radio dans un fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Impossible to identify the radio on your system, please verify that the eeprom disk is connected.</source>
         <translation>Impossible de trouver la radio, veuillez vérifier que la radio est sous tension sur la page d&apos;accueil et connectée.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1444"/>
+        <location filename="../mainwindow.cpp" line="1445"/>
         <source>Read Tx Firmware to File</source>
         <translation>Sauvegarder le firmware de la radio dans un fichier</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1495"/>
+        <source>The Companion project was originally forked from eePe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1496"/>
         <source>If you&apos;ve found this program useful, please support by</source>
         <translation>Si vous trouvez ce programme utile, merci d&apos;apporter votre soutien en effectuant un</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
+        <location filename="../mainwindow.cpp" line="1500"/>
+        <source>About Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Check for new version of Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Contributors &amp;List...</source>
         <translation>&amp;Liste des contributeurs...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Show companion9x contributors list</source>
-        <translation>Lister les contributeurs de companion9x</translation>
+        <translation type="obsolete">Lister les contributeurs de companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1677"/>
+        <location filename="../mainwindow.cpp" line="1678"/>
         <source>&amp;Write Models and Settings To Tx</source>
         <translation>&amp;Transférer les réglages et modèles à la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1679"/>
+        <location filename="../mainwindow.cpp" line="1680"/>
         <source>Write Models and Settings to transmitter</source>
         <translation>Transférer les réglages et modèles à la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1682"/>
+        <location filename="../mainwindow.cpp" line="1683"/>
         <source>&amp;Read Models and Settings From Tx</source>
         <translation>&amp;Lire les réglages et modèles depuis la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1684"/>
+        <location filename="../mainwindow.cpp" line="1685"/>
         <source>Read Models and Settings from transmitter</source>
         <translation>Lire les réglages et modèles depuis la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
+        <location filename="../mainwindow.cpp" line="1688"/>
         <source>Write Firmware</source>
         <translation>Flasher le firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1688"/>
+        <location filename="../mainwindow.cpp" line="1689"/>
         <source>Write firmware to transmitter</source>
         <translation>Flasher le firmware de la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1691"/>
+        <location filename="../mainwindow.cpp" line="1692"/>
         <source>Write Models and Settings from file to Tx</source>
         <translation>Restaurer les réglages et modèles depuis un fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1692"/>
+        <location filename="../mainwindow.cpp" line="1693"/>
         <source>Write Models and Settings from file to transmitter</source>
         <translation>Restaurer les réglages et modèles depuis un fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1695"/>
+        <location filename="../mainwindow.cpp" line="1696"/>
         <source>Save transmitter Models and Settings to file</source>
         <translation>Sauvegarder les réglages et modèles dans un fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1696"/>
+        <location filename="../mainwindow.cpp" line="1697"/>
         <source>Save the Models and Settings from the transmitter to a file</source>
         <translation>Sauvegarder les réglages et modèles dans un fichier</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1699"/>
+        <location filename="../mainwindow.cpp" line="1700"/>
         <source>Read Firmware</source>
         <translation>Lire le firmware de la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1700"/>
+        <location filename="../mainwindow.cpp" line="1701"/>
         <source>Read firmware from transmitter</source>
         <translation>Lire le firmware de la radio</translation>
     </message>
@@ -2254,32 +2294,25 @@ Ecrire quand même?</translation>
         <translation type="obsolete">Configure le programme pour communiquer correctement avec la radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1787"/>
-        <location filename="../mainwindow.cpp" line="1881"/>
+        <location filename="../mainwindow.cpp" line="1788"/>
+        <location filename="../mainwindow.cpp" line="1882"/>
         <source>Recent Files</source>
         <translation>Derniers documents utilisés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
         <source>Invalid Models and Settings File %1</source>
         <translation>Fichier de réglages et modèles invalide: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation>Fichier binaire de réglages et modèles invalide: %1</translation>
     </message>
 </context>
 <context>
     <name>MdiChild</name>
-    <message>
-        <location filename="../mdichild.cpp" line="182"/>
-        <location filename="../mdichild.cpp" line="187"/>
-        <location filename="../mdichild.cpp" line="470"/>
-        <source>companion9x</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../mdichild.cpp" line="222"/>
         <location filename="../mdichild.cpp" line="230"/>
@@ -2373,6 +2406,13 @@ Ecrire quand même?</translation>
         <source>Do you want to use model wizard? </source>
         <translation>Voulez-vous utiliser l&apos;assistant de configuration de modèle ?</translation>
     </message>
+    <message>
+        <location filename="../mdichild.cpp" line="182"/>
+        <location filename="../mdichild.cpp" line="187"/>
+        <location filename="../mdichild.cpp" line="470"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mdichild.cpp" line="187"/>
         <source>Ask this question again ? </source>
@@ -7355,18 +7395,26 @@ Check your settings again.</source>
         <translation type="obsolete">Attention, le format de l&apos;écran d&apos;accueil personnalisé dans les préférences a changé. Veuillez le sélectionner à nouveau le cas échéant.</translation>
     </message>
     <message>
-        <location filename="../warnings.h" line="5"/>
         <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
 
 We are really sensible to that!
 
 The openTX/C9X Team.</source>
-        <translation>Merci pour vos donations, messages, bonnes idées, propositions constructives pour le nouveau système de financement d&apos;openTx.
+        <translation type="obsolete">Merci pour vos donations, messages, bonnes idées, propositions constructives pour le nouveau système de financement d&apos;openTx.
 
 Nous en sommes très reconnaissants!
 
 L&apos;équipe d&apos;openTx/C9X</translation>
     </message>
+    <message>
+        <location filename="../warnings.h" line="5"/>
+        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
+
+We are really appreciative for that!
+
+The OpenTX/Companion Team.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>avrOutputDialog</name>
@@ -7631,6 +7679,12 @@ Consulter la documentation du programmateur utilisé et celle d&apos;AVRDUDE pou
         <source>Select Location</source>
         <translation>Choisir l&apos;emplacement</translation>
     </message>
+    <message>
+        <location filename="../burnconfigdialog.cpp" line="328"/>
+        <location filename="../burnconfigdialog.cpp" line="397"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="329"/>
         <source>&lt;b&gt;&lt;u&gt;WARNING!&lt;/u&gt;&lt;/b&gt;&lt;br&gt;This will reset the fuses of  %1 to the factory settings.&lt;br&gt;Writing fuses can mess up your radio.&lt;br&gt;Do this only if you are sure they are wrong!&lt;br&gt;Are you sure you want to continue?</source>
@@ -7731,10 +7785,8 @@ m2560 for v4.1 boards</source>
         <translation>Port série de SAM-BA</translation>
     </message>
     <message>
-        <location filename="../burnconfigdialog.cpp" line="328"/>
-        <location filename="../burnconfigdialog.cpp" line="397"/>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
 </context>
 <context>
@@ -7784,6 +7836,11 @@ m2560 for v4.1 boards</source>
         <source>Browse for file</source>
         <translation>Parcourir...</translation>
     </message>
+    <message>
+        <location filename="../burndialog.ui" line="276"/>
+        <source>Allows Companion to write to older version of the firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burndialog.ui" line="289"/>
         <source>Backup and restore Models and Settings</source>
@@ -7831,9 +7888,8 @@ m2560 for v4.1 boards</source>
         <translation>Variante</translation>
     </message>
     <message>
-        <location filename="../burndialog.ui" line="276"/>
         <source>Allows companion9x to write to older version of the firmware</source>
-        <translation>Permet à companion9x de programmer des anciennes versions de firmware</translation>
+        <translation type="obsolete">Permet à companion9x de programmer des anciennes versions de firmware</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="279"/>
@@ -8607,28 +8663,38 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../contributorsdialog.cpp" line="29"/>
         <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
+of course. Also to Erez Raviv (er9x) and the fantastic eePe program 
+which was the staring point for OpenTX Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contributorsdialog.cpp" line="46"/>
+        <source>Companion Release Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
 of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
 companion9x was forked out.</source>
-        <translation>Un merci tout particulier à Rafal Tomczak (RadioClone) et Thomas Husterer (th9x) bien sûr.
+        <translation type="obsolete">Un merci tout particulier à Rafal Tomczak (RadioClone) et Thomas Husterer (th9x) bien sûr.
 Egalement à Erez Raviv (er9x) et son fantastique programme eePe d&apos;où est parti companion9x.</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="31"/>
+        <location filename="../contributorsdialog.cpp" line="32"/>
         <source>Thank you all !!!</source>
         <translation>Merci à tous !!!</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="34"/>
+        <location filename="../contributorsdialog.cpp" line="35"/>
         <source>Contributors</source>
         <translation>Contributeurs</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="45"/>
         <source>Companion9x Release Notes</source>
-        <translation>Notes de version de companion9x</translation>
+        <translation type="obsolete">Notes de version de companion9x</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="50"/>
+        <location filename="../contributorsdialog.cpp" line="51"/>
         <source>OpenTX Release Notes</source>
         <translation>Notes de version d&apos;openTx</translation>
     </message>
@@ -8778,8 +8844,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="54"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="55"/>
@@ -9132,9 +9202,13 @@ Press cancel to abort joystick calibration</source>
 <context>
     <name>logsDialog</name>
     <message>
-        <location filename="../logsdialog.ui" line="14"/>
         <source>Companion9x log viewer</source>
-        <translation>Visualiseur de log</translation>
+        <translation type="obsolete">Visualiseur de log</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.ui" line="14"/>
+        <source>Companion Log Viewer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../logsdialog.ui" line="29"/>
@@ -9147,47 +9221,59 @@ Press cancel to abort joystick calibration</source>
         <translation>Ouvrir fichier de log</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="131"/>
+        <location filename="../logsdialog.ui" line="94"/>
         <source>Zoom</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="138"/>
+        <location filename="../logsdialog.ui" line="101"/>
         <source>X</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="145"/>
+        <location filename="../logsdialog.ui" line="108"/>
         <source>Y</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="169"/>
+        <location filename="../logsdialog.ui" line="132"/>
         <source>Fly sessions</source>
         <translation>Sessions de vol</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="22"/>
+        <location filename="../logsdialog.cpp" line="27"/>
         <source>Telemetry logs</source>
         <translation>Enregistrements de télémesure</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="23"/>
+        <location filename="../logsdialog.cpp" line="28"/>
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="395"/>
+        <location filename="../logsdialog.cpp" line="252"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="253"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation type="unfinished">Ecriture fichier %1 impossible:
+%2.</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="582"/>
         <source>Select your log file</source>
         <translation>Sélectionnez votre fichier log</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="406"/>
+        <location filename="../logsdialog.cpp" line="593"/>
         <source>Available fields</source>
         <translation>Champs disponibles</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="501"/>
+        <location filename="../logsdialog.cpp" line="690"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation>Le fichier de log sélectionné contient %1 lignes invalides sur %2</translation>
     </message>
@@ -9642,17 +9728,17 @@ Press cancel to abort joystick calibration</source>
 <context>
     <name>preferencesDialog</name>
     <message>
-        <location filename="../preferencesdialog.ui" line="716"/>
+        <location filename="../preferencesdialog.ui" line="747"/>
         <source>Mode 2 (RUD THR ELE AIL)</source>
         <translation>Mode 2 (DIR GAZ PROF AIL)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="726"/>
+        <location filename="../preferencesdialog.ui" line="757"/>
         <source>Mode 4 (AIL THR ELE RUD)</source>
         <translation>Mode 4 (AIL GAZ PROF DIR)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="686"/>
+        <location filename="../preferencesdialog.ui" line="717"/>
         <source>Mode selection:
 
 Mode 1:
@@ -9693,88 +9779,88 @@ Manche Droit:  Profondeur, Direction
 </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="721"/>
+        <location filename="../preferencesdialog.ui" line="752"/>
         <source>Mode 3 (AIL ELE THR RUD)</source>
         <translation>Mode 3 (AIL PROF GAZ DIR)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="964"/>
+        <location filename="../preferencesdialog.ui" line="995"/>
         <source>Firmware</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="148"/>
-        <location filename="../preferencesdialog.ui" line="215"/>
+        <location filename="../preferencesdialog.ui" line="161"/>
+        <location filename="../preferencesdialog.ui" line="228"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="295"/>
+        <location filename="../preferencesdialog.ui" line="439"/>
         <source>Enable</source>
         <translation>Actif</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="312"/>
+        <location filename="../preferencesdialog.ui" line="456"/>
         <source>Calibrate</source>
         <translation>Calibrer</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="326"/>
-        <location filename="../preferencesdialog.ui" line="806"/>
-        <location filename="../preferencesdialog.ui" line="941"/>
-        <location filename="../preferencesdialog.ui" line="1008"/>
+        <location filename="../preferencesdialog.ui" line="470"/>
+        <location filename="../preferencesdialog.ui" line="662"/>
+        <location filename="../preferencesdialog.ui" line="837"/>
+        <location filename="../preferencesdialog.ui" line="972"/>
         <source>Open Folder</source>
         <translation>Ouvrir le répertoire</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="890"/>
+        <location filename="../preferencesdialog.ui" line="921"/>
         <source>Set language of voice.
 May be different from firmware language</source>
         <translation>Langue des voix.
 Peut être différente de la langue du firmware</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="454"/>
+        <location filename="../preferencesdialog.ui" line="598"/>
         <source>Export Profile</source>
         <translation>Exporter le profil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="478"/>
+        <location filename="../preferencesdialog.ui" line="622"/>
         <source>Import Profile</source>
         <translation>Importer le profil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="286"/>
+        <location filename="../preferencesdialog.ui" line="430"/>
         <source>Custom TX splash screen</source>
         <translation>Personnaliser l&apos;écran d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="790"/>
+        <location filename="../preferencesdialog.ui" line="821"/>
         <source>Automatic Backup Folder</source>
         <translation>Dossier de sauvegardes automatiques</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="846"/>
+        <location filename="../preferencesdialog.ui" line="877"/>
         <source>Automatically add version number to the filename after download</source>
         <translation>Ajouter le numéro de version au nom de fichier après téléchargement</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="977"/>
+        <location filename="../preferencesdialog.ui" line="1008"/>
         <source>SD Structure path</source>
         <translation>Chemin de la structure de la carte SD</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="987"/>
+        <location filename="../preferencesdialog.ui" line="1018"/>
         <source>Processor ID</source>
         <translation>ID du processeur</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="996"/>
+        <location filename="../preferencesdialog.ui" line="1027"/>
         <source>Simulator capture folder</source>
         <translation>Dossier de sauvegarde des captures d&apos;écran</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="1025"/>
+        <location filename="../preferencesdialog.ui" line="679"/>
         <source>Use clipboard only</source>
         <translation>Utiliser le presse-papiers</translation>
     </message>
@@ -9825,12 +9911,12 @@ Peut être différente de la langue du firmware</translation>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="360"/>
+        <location filename="../preferencesdialog.ui" line="504"/>
         <source>Check for updates</source>
         <translation>Vérifier les mises à jour</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="525"/>
+        <location filename="../preferencesdialog.ui" line="292"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
@@ -9838,138 +9924,148 @@ This is used by the templated to determine which channel goes to what number out
 Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de la création  d&apos;un modèle.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="908"/>
+        <location filename="../preferencesdialog.ui" line="939"/>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="870"/>
+        <location filename="../preferencesdialog.ui" line="901"/>
         <source>Voice</source>
         <translation>Voix</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="488"/>
+        <location filename="../preferencesdialog.ui" line="632"/>
         <source>Profile Name</source>
         <translation>Nom du profil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="461"/>
+        <location filename="../preferencesdialog.ui" line="605"/>
         <source>Save Profile</source>
         <translation>Sauvegarder profil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="58"/>
+        <location filename="../preferencesdialog.ui" line="71"/>
         <source>Simu BackLight</source>
         <translation>Rétroéclairage simu</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="80"/>
+        <location filename="../preferencesdialog.ui" line="93"/>
         <source>Check for selected Fw updates</source>
         <translation>Vérifier les mises à jour de firmwares au démarrage</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="92"/>
+        <location filename="../preferencesdialog.ui" line="105"/>
         <source>Ask use of wizard for new models</source>
         <translation>Utiliser l&apos;assistant de configuration de modèle</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="164"/>
+        <location filename="../preferencesdialog.ui" line="177"/>
         <source>Remember switches in simulator</source>
         <translation>Mémoriser les inters pour le simulateur</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="172"/>
+        <location filename="../preferencesdialog.ui" line="185"/>
         <source>Blue</source>
         <oldsource>Blu</oldsource>
         <translation>Bleu</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="177"/>
+        <location filename="../preferencesdialog.ui" line="190"/>
         <source>Green</source>
         <translation>Vert</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="182"/>
+        <location filename="../preferencesdialog.ui" line="195"/>
         <source>Red</source>
         <translation>Rouge</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="187"/>
+        <location filename="../preferencesdialog.ui" line="200"/>
         <source>Orange</source>
         <translation>Orange</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="192"/>
+        <location filename="../preferencesdialog.ui" line="205"/>
         <source>Yellow</source>
         <translation>Jaune</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="375"/>
+        <location filename="../preferencesdialog.ui" line="519"/>
         <source>Personal splash library</source>
         <translation>Bibliothèque de splashs personnalisés</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="783"/>
+        <location filename="../preferencesdialog.ui" line="814"/>
         <source>Profile slot</source>
         <translation>Numéro de profil</translation>
     </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="1616"/>
+        <source>Find Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="1625"/>
+        <source>Google Earth Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>eEprom backup folder</source>
         <translation type="obsolete">Dossier de sauvegarde de l&apos;EEPROM</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="813"/>
+        <location filename="../preferencesdialog.ui" line="844"/>
         <source>auto backup before write</source>
         <translation>Sauvegarde automatique avant programmation</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="433"/>
+        <location filename="../preferencesdialog.ui" line="577"/>
         <source>Ask for flashing after Download</source>
         <translation>Demander pour flasher après téléchargement</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="773"/>
+        <location filename="../preferencesdialog.ui" line="804"/>
         <source>Splash library behaviour</source>
         <translation>Utilisation de la bibliothèque de Splashes</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="754"/>
+        <location filename="../preferencesdialog.ui" line="785"/>
         <source>Include companion splashes</source>
         <translation>Inclure les écrans d&apos;accueil de companion9x</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="759"/>
+        <location filename="../preferencesdialog.ui" line="790"/>
         <source>Only user defined splashes</source>
         <translation>Seulement vos écrans d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="740"/>
+        <location filename="../preferencesdialog.ui" line="771"/>
         <source>Joystick</source>
         <translation>Joystick</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="232"/>
+        <location filename="../preferencesdialog.ui" line="245"/>
         <source>Open Image</source>
         <translation>Charger une image</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="141"/>
+        <location filename="../preferencesdialog.ui" line="154"/>
         <source>Invert Pixels</source>
         <translation>Inverser les couleurs</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="353"/>
+        <location filename="../preferencesdialog.ui" line="497"/>
         <source>FwInfo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="506"/>
+        <location filename="../preferencesdialog.ui" line="650"/>
         <source>Language (requires restart)</source>
         <translatorcomment>Version française par Pascal Dugué / Octobre 2010.</translatorcomment>
         <translation>Langue (nécessite un redémarrage de companion9x)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="676"/>
+        <location filename="../preferencesdialog.ui" line="707"/>
         <source>Default Channel Order</source>
         <translation>Ordre des voies par défaut</translation>
     </message>
@@ -9979,22 +10075,22 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="663"/>
+        <location filename="../preferencesdialog.ui" line="694"/>
         <source>Default Stick Mode</source>
         <translation>Mode par défaut</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="711"/>
+        <location filename="../preferencesdialog.ui" line="742"/>
         <source>Mode 1 (RUD ELE THR AIL)</source>
         <translation>Mode 1 (DIR PROF GAZ AIL)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="70"/>
+        <location filename="../preferencesdialog.ui" line="83"/>
         <source>Check for updates on startup</source>
         <translation>Vérifier les mises à jour au démarrage</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="273"/>
+        <location filename="../preferencesdialog.ui" line="51"/>
         <source>Show Splash Screen</source>
         <translation>Afficher l&apos;écran d&apos;accueil au démarrage</translation>
     </message>
@@ -10004,90 +10100,103 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation>Taille de l&apos;historique des derniers documents utilisés</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="883"/>
-        <location filename="../preferencesdialog.ui" line="924"/>
+        <location filename="../preferencesdialog.ui" line="914"/>
+        <location filename="../preferencesdialog.ui" line="955"/>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="227"/>
+        <location filename="../preferencesdialog.cpp" line="233"/>
         <source>Last downloaded release: %1</source>
         <translation>Dernière version téléchargée : %1</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="236"/>
         <source>The selected firmware has never been downloaded by companion9x.</source>
-        <translation>Le firmware sélectionné n&apos;a jamais été téléchargé par companion9x.</translation>
+        <translation type="obsolete">Le firmware sélectionné n&apos;a jamais été téléchargé par companion9x.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="240"/>
         <source>The selected firmware cannot be downloaded by companion9x.</source>
-        <translation>Le firmware sélectionné ne peut pas être téléchargé par companion9x.</translation>
+        <translation type="obsolete">Le firmware sélectionné ne peut pas être téléchargé par companion9x.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="447"/>
+        <location filename="../preferencesdialog.cpp" line="461"/>
         <source>Image stored in settings</source>
         <translation>Image enregistrée dans les paramètres</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="458"/>
-        <location filename="../preferencesdialog.cpp" line="780"/>
+        <location filename="../preferencesdialog.cpp" line="472"/>
+        <location filename="../preferencesdialog.cpp" line="804"/>
         <source>No joysticks found</source>
         <translation>Aucun joystick</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="569"/>
+        <location filename="../preferencesdialog.cpp" line="583"/>
         <source>Select your Models and Settings backup folder</source>
         <translation>Sélectionner le dossier dans lequel une sauvegarde des réglages et modèles sera placée automatiquement lors de chaque opération</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="597"/>
+        <location filename="../preferencesdialog.cpp" line="594"/>
+        <source>Select Google Earth executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="620"/>
         <source>Select the folder replicating your SD structure</source>
         <translation>Sélectionner un dossier contenant une copie des dossiers de la carte SD</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="641"/>
+        <location filename="../preferencesdialog.cpp" line="664"/>
         <source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
         <translation>Le nom du profil est vide, le profil %1 va être effacé.&lt;br&gt;Etes-vous sûr?</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="677"/>
+        <location filename="../preferencesdialog.cpp" line="701"/>
         <source>Export profile As</source>
         <translation>Exporter le profil sous</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="699"/>
+        <location filename="../preferencesdialog.cpp" line="723"/>
         <source>Profile slot is not empty, profile slot %1 will we overwritten.&lt;br&gt;Are you sure ?</source>
         <translation>L&apos;emplacement %1 n&apos;est pas vide, il va être écrasé. Continuer?</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="705"/>
+        <location filename="../preferencesdialog.cpp" line="729"/>
         <source>Open Profile to import</source>
         <translation>Ouvrir le profil à importer</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Open Image to load</source>
         <translation>Ouvre l&apos;image à charger</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Images (%1)</source>
         <translation>Images (%1)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="532"/>
+        <location filename="../preferencesdialog.cpp" line="242"/>
+        <source>The selected firmware has never been downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="246"/>
+        <source>The selected firmware cannot be downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="546"/>
         <source>Select your library folder</source>
         <translation>Sélectionner le dossier de bibliothèque</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="542"/>
+        <location filename="../preferencesdialog.cpp" line="556"/>
         <source>Select your snapshot folder</source>
         <translation>Sélectionner le dossier où stocker les captures d&apos;écran</translation>
     </message>
@@ -10096,8 +10205,8 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation type="obsolete">Sélectionner le dossier de sauvegarde d&apos;EEPROM</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Cannot load %1.</source>
         <translation>Impossible de charger %1.</translation>
     </message>
@@ -10625,59 +10734,59 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1854"/>
+        <location filename="../simulatordialog.ui" line="1856"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation>IPK</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2226"/>
+        <location filename="../simulatordialog.ui" line="2228"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation>IPW</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2307"/>
+        <location filename="../simulatordialog.ui" line="2310"/>
         <source>CH1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2432"/>
+        <location filename="../simulatordialog.ui" line="2435"/>
         <source>CH2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2612"/>
+        <location filename="../simulatordialog.ui" line="2615"/>
         <source>CH3</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2792"/>
+        <location filename="../simulatordialog.ui" line="2795"/>
         <source>CH4</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2972"/>
+        <location filename="../simulatordialog.ui" line="2975"/>
         <source>CH5</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3146"/>
+        <location filename="../simulatordialog.ui" line="3149"/>
         <source>CH6</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3271"/>
+        <location filename="../simulatordialog.ui" line="3274"/>
         <source>CH7</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3451"/>
+        <location filename="../simulatordialog.ui" line="3454"/>
         <source>CH8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2419"/>
+        <location filename="../simulatordialog.ui" line="2422"/>
         <source>CH9</source>
         <translation></translation>
     </message>
@@ -10742,187 +10851,192 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation>BIP</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1265"/>
+        <location filename="../simulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../simulatordialog.ui" line="1266"/>
         <source>CS1</source>
         <translation>IP1</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1296"/>
+        <location filename="../simulatordialog.ui" line="1297"/>
         <source>CS2</source>
         <translation>IP2</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1327"/>
+        <location filename="../simulatordialog.ui" line="1328"/>
         <source>CS3</source>
         <translation>IP3</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1358"/>
+        <location filename="../simulatordialog.ui" line="1359"/>
         <source>CS4</source>
         <translation>IP4</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1389"/>
+        <location filename="../simulatordialog.ui" line="1390"/>
         <source>CS5</source>
         <translation>IP5</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1420"/>
+        <location filename="../simulatordialog.ui" line="1421"/>
         <source>CS6</source>
         <translation>IP6</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1451"/>
+        <location filename="../simulatordialog.ui" line="1452"/>
         <source>CS7</source>
         <translation>IP7</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1482"/>
+        <location filename="../simulatordialog.ui" line="1483"/>
         <source>CS8</source>
         <translation>IP8</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1513"/>
+        <location filename="../simulatordialog.ui" line="1514"/>
         <source>CS9</source>
         <translation>IP9</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1544"/>
+        <location filename="../simulatordialog.ui" line="1545"/>
         <source>CSA</source>
         <translation>IPA</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1575"/>
+        <location filename="../simulatordialog.ui" line="1576"/>
         <source>CSB</source>
         <translation>IPB</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1606"/>
+        <location filename="../simulatordialog.ui" line="1607"/>
         <source>CSC</source>
         <translation>IPC</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1637"/>
+        <location filename="../simulatordialog.ui" line="1638"/>
         <source>CSD</source>
         <translation>IPD</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1668"/>
+        <location filename="../simulatordialog.ui" line="1669"/>
         <source>CSE</source>
         <translation>IPE</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1699"/>
+        <location filename="../simulatordialog.ui" line="1700"/>
         <source>CSF</source>
         <translation>IPF</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1730"/>
+        <location filename="../simulatordialog.ui" line="1731"/>
         <source>CSG</source>
         <translation>IPG</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1761"/>
+        <location filename="../simulatordialog.ui" line="1762"/>
         <source>CSH</source>
         <translation>IPH</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1792"/>
+        <location filename="../simulatordialog.ui" line="1793"/>
         <source>CSI</source>
         <translation>IPI</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1823"/>
+        <location filename="../simulatordialog.ui" line="1825"/>
         <source>CSJ</source>
         <translation>IPJ</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1885"/>
+        <location filename="../simulatordialog.ui" line="1887"/>
         <source>CSL</source>
         <translation>IPL</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1916"/>
+        <location filename="../simulatordialog.ui" line="1918"/>
         <source>CSM</source>
         <translation>IPM</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1947"/>
+        <location filename="../simulatordialog.ui" line="1949"/>
         <source>CSN</source>
         <translation>IPN</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1978"/>
+        <location filename="../simulatordialog.ui" line="1980"/>
         <source>CSO</source>
         <translation>IPO</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2009"/>
+        <location filename="../simulatordialog.ui" line="2011"/>
         <source>CSP</source>
         <translation>IPQ</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2040"/>
+        <location filename="../simulatordialog.ui" line="2042"/>
         <source>CSQ</source>
         <translation>IPR</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2071"/>
+        <location filename="../simulatordialog.ui" line="2073"/>
         <source>CSR</source>
         <translation>IPS</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2102"/>
+        <location filename="../simulatordialog.ui" line="2104"/>
         <source>CSS</source>
         <translation>IPS</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2133"/>
+        <location filename="../simulatordialog.ui" line="2135"/>
         <source>CST</source>
         <translation>IPT</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2164"/>
+        <location filename="../simulatordialog.ui" line="2166"/>
         <source>CSU</source>
         <translation>IPU</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2195"/>
+        <location filename="../simulatordialog.ui" line="2197"/>
         <source>CSV</source>
         <translation>IPV</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2599"/>
+        <location filename="../simulatordialog.ui" line="2602"/>
         <source>CH10</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2779"/>
+        <location filename="../simulatordialog.ui" line="2782"/>
         <source>CH11</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2959"/>
+        <location filename="../simulatordialog.ui" line="2962"/>
         <source>CH12</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3133"/>
+        <location filename="../simulatordialog.ui" line="3136"/>
         <source>CH13</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3258"/>
+        <location filename="../simulatordialog.ui" line="3261"/>
         <source>CH14</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3438"/>
+        <location filename="../simulatordialog.ui" line="3441"/>
         <source>CH15</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3618"/>
+        <location filename="../simulatordialog.ui" line="3621"/>
         <source>CH16</source>
         <translation></translation>
     </message>
@@ -10939,22 +11053,22 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation>Verrou Y</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2326"/>
-        <location filename="../simulatordialog.ui" line="2348"/>
-        <location filename="../simulatordialog.ui" line="2506"/>
-        <location filename="../simulatordialog.ui" line="2528"/>
-        <location filename="../simulatordialog.ui" line="2686"/>
-        <location filename="../simulatordialog.ui" line="2708"/>
-        <location filename="../simulatordialog.ui" line="2866"/>
-        <location filename="../simulatordialog.ui" line="2888"/>
-        <location filename="../simulatordialog.ui" line="3040"/>
-        <location filename="../simulatordialog.ui" line="3062"/>
-        <location filename="../simulatordialog.ui" line="3165"/>
-        <location filename="../simulatordialog.ui" line="3187"/>
-        <location filename="../simulatordialog.ui" line="3345"/>
-        <location filename="../simulatordialog.ui" line="3367"/>
-        <location filename="../simulatordialog.ui" line="3525"/>
-        <location filename="../simulatordialog.ui" line="3547"/>
+        <location filename="../simulatordialog.ui" line="2329"/>
+        <location filename="../simulatordialog.ui" line="2351"/>
+        <location filename="../simulatordialog.ui" line="2509"/>
+        <location filename="../simulatordialog.ui" line="2531"/>
+        <location filename="../simulatordialog.ui" line="2689"/>
+        <location filename="../simulatordialog.ui" line="2711"/>
+        <location filename="../simulatordialog.ui" line="2869"/>
+        <location filename="../simulatordialog.ui" line="2891"/>
+        <location filename="../simulatordialog.ui" line="3043"/>
+        <location filename="../simulatordialog.ui" line="3065"/>
+        <location filename="../simulatordialog.ui" line="3168"/>
+        <location filename="../simulatordialog.ui" line="3190"/>
+        <location filename="../simulatordialog.ui" line="3348"/>
+        <location filename="../simulatordialog.ui" line="3370"/>
+        <location filename="../simulatordialog.ui" line="3528"/>
+        <location filename="../simulatordialog.ui" line="3550"/>
         <source>-100.1</source>
         <translation></translation>
     </message>
@@ -10984,9 +11098,8 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation>Simulateur companion9x</translation>
+        <translation type="obsolete">Simulateur companion9x</translation>
     </message>
     <message>
         <location filename="../simulatordialog.ui" line="1046"/>
@@ -10994,7 +11107,7 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation>Simulateur 9x</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1239"/>
+        <location filename="../simulatordialog.ui" line="1240"/>
         <source>Outputs</source>
         <translation>Sorties</translation>
     </message>
@@ -11068,9 +11181,8 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
 <context>
     <name>xsimulatorDialog</name>
     <message>
-        <location filename="../xsimulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation>Simulateur companion9x</translation>
+        <translation type="obsolete">Simulateur companion9x</translation>
     </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1089"/>
@@ -11191,7 +11303,7 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation>Sorties</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2896"/>
+        <location filename="../xsimulatordialog.ui" line="2897"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation>IPK</translation>
@@ -11201,6 +11313,11 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <source>CH1</source>
         <translation>VOIE1</translation>
     </message>
+    <message>
+        <location filename="../xsimulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1269"/>
         <source>Taranis Simulator</source>
@@ -11213,16 +11330,16 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <location filename="../xsimulatordialog.ui" line="1772"/>
         <location filename="../xsimulatordialog.ui" line="1930"/>
         <location filename="../xsimulatordialog.ui" line="1952"/>
-        <location filename="../xsimulatordialog.ui" line="2110"/>
-        <location filename="../xsimulatordialog.ui" line="2132"/>
-        <location filename="../xsimulatordialog.ui" line="2284"/>
-        <location filename="../xsimulatordialog.ui" line="2306"/>
-        <location filename="../xsimulatordialog.ui" line="2409"/>
-        <location filename="../xsimulatordialog.ui" line="2431"/>
-        <location filename="../xsimulatordialog.ui" line="2589"/>
-        <location filename="../xsimulatordialog.ui" line="2611"/>
-        <location filename="../xsimulatordialog.ui" line="2769"/>
-        <location filename="../xsimulatordialog.ui" line="2791"/>
+        <location filename="../xsimulatordialog.ui" line="2111"/>
+        <location filename="../xsimulatordialog.ui" line="2133"/>
+        <location filename="../xsimulatordialog.ui" line="2285"/>
+        <location filename="../xsimulatordialog.ui" line="2307"/>
+        <location filename="../xsimulatordialog.ui" line="2410"/>
+        <location filename="../xsimulatordialog.ui" line="2432"/>
+        <location filename="../xsimulatordialog.ui" line="2590"/>
+        <location filename="../xsimulatordialog.ui" line="2612"/>
+        <location filename="../xsimulatordialog.ui" line="2770"/>
+        <location filename="../xsimulatordialog.ui" line="2792"/>
         <source>-100.1</source>
         <translation></translation>
     </message>
@@ -11257,202 +11374,202 @@ Indique l&apos;affectation voie / numéro de canal par défaut utilisée lors de
         <translation>VOIE4</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2203"/>
+        <location filename="../xsimulatordialog.ui" line="2204"/>
         <source>CH12</source>
         <translation>VOIE12</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2216"/>
+        <location filename="../xsimulatordialog.ui" line="2217"/>
         <source>CH5</source>
         <translation>VOIE5</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2377"/>
+        <location filename="../xsimulatordialog.ui" line="2378"/>
         <source>CH13</source>
         <translation>VOIE13</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2390"/>
+        <location filename="../xsimulatordialog.ui" line="2391"/>
         <source>CH6</source>
         <translation>VOIE6</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2502"/>
+        <location filename="../xsimulatordialog.ui" line="2503"/>
         <source>CH14</source>
         <translation>VOIE14</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2515"/>
+        <location filename="../xsimulatordialog.ui" line="2516"/>
         <source>CH7</source>
         <translation>VOIE7</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2682"/>
+        <location filename="../xsimulatordialog.ui" line="2683"/>
         <source>CH15</source>
         <translation>VOIE15</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2695"/>
+        <location filename="../xsimulatordialog.ui" line="2696"/>
         <source>CH8</source>
         <translation>VOIE8</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2862"/>
+        <location filename="../xsimulatordialog.ui" line="2863"/>
         <source>CH16</source>
         <translation>VOIE16</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2927"/>
+        <location filename="../xsimulatordialog.ui" line="2928"/>
         <source>CSC</source>
         <translation>IPC</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2958"/>
+        <location filename="../xsimulatordialog.ui" line="2959"/>
         <source>CSD</source>
         <translation>IPD</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2989"/>
+        <location filename="../xsimulatordialog.ui" line="2990"/>
         <source>CS7</source>
         <translation>IP7</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3020"/>
+        <location filename="../xsimulatordialog.ui" line="3021"/>
         <source>CSL</source>
         <translation>IPL</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3051"/>
+        <location filename="../xsimulatordialog.ui" line="3052"/>
         <source>CSB</source>
         <translation>IPB</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3082"/>
+        <location filename="../xsimulatordialog.ui" line="3083"/>
         <source>CS1</source>
         <translation>IP1</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3113"/>
+        <location filename="../xsimulatordialog.ui" line="3114"/>
         <source>CSH</source>
         <translation>IPH</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3144"/>
+        <location filename="../xsimulatordialog.ui" line="3145"/>
         <source>CSG</source>
         <translation>IPG</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3175"/>
+        <location filename="../xsimulatordialog.ui" line="3176"/>
         <source>CSE</source>
         <translation>IPE</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3206"/>
+        <location filename="../xsimulatordialog.ui" line="3207"/>
         <source>CSF</source>
         <translation>IPF</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3237"/>
+        <location filename="../xsimulatordialog.ui" line="3238"/>
         <source>CS8</source>
         <translation>IP8</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3268"/>
+        <location filename="../xsimulatordialog.ui" line="3269"/>
         <source>CS9</source>
         <translation>IP9</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3299"/>
+        <location filename="../xsimulatordialog.ui" line="3300"/>
         <source>CSA</source>
         <translation>IPA</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3330"/>
+        <location filename="../xsimulatordialog.ui" line="3331"/>
         <source>CSM</source>
         <translation>IPM</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3361"/>
+        <location filename="../xsimulatordialog.ui" line="3362"/>
         <source>CSJ</source>
         <translation>IPJ</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3392"/>
+        <location filename="../xsimulatordialog.ui" line="3393"/>
         <source>CSI</source>
         <translation>IPI</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3423"/>
+        <location filename="../xsimulatordialog.ui" line="3424"/>
         <source>CS4</source>
         <translation>IP4</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3454"/>
+        <location filename="../xsimulatordialog.ui" line="3455"/>
         <source>CS5</source>
         <translation>IP5</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3485"/>
+        <location filename="../xsimulatordialog.ui" line="3486"/>
         <source>CS2</source>
         <translation>IP2</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3516"/>
+        <location filename="../xsimulatordialog.ui" line="3517"/>
         <source>CS3</source>
         <translation>IP3</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3547"/>
+        <location filename="../xsimulatordialog.ui" line="3548"/>
         <source>CS6</source>
         <translation>IP6</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3578"/>
+        <location filename="../xsimulatordialog.ui" line="3579"/>
         <source>CSN</source>
         <translation>IPN</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3609"/>
+        <location filename="../xsimulatordialog.ui" line="3610"/>
         <source>CSO</source>
         <translation>IPO</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3640"/>
+        <location filename="../xsimulatordialog.ui" line="3641"/>
         <source>CSP</source>
         <translation>IPQ</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3671"/>
+        <location filename="../xsimulatordialog.ui" line="3672"/>
         <source>CSQ</source>
         <translation>IPR</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3702"/>
+        <location filename="../xsimulatordialog.ui" line="3703"/>
         <source>CSR</source>
         <translation>IPS</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3733"/>
+        <location filename="../xsimulatordialog.ui" line="3734"/>
         <source>CSS</source>
         <translation>IPS</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3764"/>
+        <location filename="../xsimulatordialog.ui" line="3765"/>
         <source>CST</source>
         <translation>IPT</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3795"/>
+        <location filename="../xsimulatordialog.ui" line="3796"/>
         <source>CSU</source>
         <translation>IPU</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3826"/>
+        <location filename="../xsimulatordialog.ui" line="3827"/>
         <source>CSV</source>
         <translation>IPV</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3857"/>
+        <location filename="../xsimulatordialog.ui" line="3858"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation>IPW</translation>
diff --git a/companion/src/translations/companion9x_he.ts b/companion/src/translations/companion_he.ts
similarity index 94%
rename from companion/src/translations/companion9x_he.ts
rename to companion/src/translations/companion_he.ts
index c8d66f2f5..ddfaa4e3d 100644
--- a/companion/src/translations/companion9x_he.ts
+++ b/companion/src/translations/companion_he.ts
@@ -1149,29 +1149,24 @@ Are you sure ?</source>
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.cpp" line="147"/>
-        <location filename="../mainwindow.cpp" line="635"/>
-        <location filename="../mainwindow.cpp" line="669"/>
-        <location filename="../mainwindow.cpp" line="2161"/>
+        <location filename="../mainwindow.cpp" line="636"/>
+        <location filename="../mainwindow.cpp" line="670"/>
+        <location filename="../mainwindow.cpp" line="2162"/>
         <source>File loaded</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="260"/>
-        <source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="268"/>
         <location filename="../mainwindow.cpp" line="270"/>
         <location filename="../mainwindow.cpp" line="310"/>
-        <location filename="../mainwindow.cpp" line="570"/>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="571"/>
+        <location filename="../mainwindow.cpp" line="573"/>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="285"/>
-        <location filename="../mainwindow.cpp" line="543"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>No updates available at this time.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1179,26 +1174,11 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="246"/>
         <location filename="../mainwindow.cpp" line="289"/>
         <location filename="../mainwindow.cpp" line="467"/>
-        <location filename="../mainwindow.cpp" line="589"/>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="590"/>
+        <location filename="../mainwindow.cpp" line="594"/>
         <source>Unable to check for updates.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="106"/>
-        <location filename="../mainwindow.cpp" line="721"/>
-        <location filename="../mainwindow.cpp" line="741"/>
-        <source>companion9x - Models and Settings Editor - %1 - profile %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="108"/>
-        <location filename="../mainwindow.cpp" line="715"/>
-        <location filename="../mainwindow.cpp" line="732"/>
-        <location filename="../mainwindow.cpp" line="743"/>
-        <source>companion9x - Models and Settings Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="224"/>
         <source>Checking for updates</source>
@@ -1220,102 +1200,102 @@ Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="487"/>
+        <location filename="../mainwindow.cpp" line="488"/>
         <source>Firmware %1 does not seem to have ever been downloaded.
 Version %2 is available.
 Do you want to download it now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="623"/>
+        <location filename="../mainwindow.cpp" line="624"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="644"/>
-        <location filename="../mainwindow.cpp" line="650"/>
+        <location filename="../mainwindow.cpp" line="645"/>
+        <location filename="../mainwindow.cpp" line="651"/>
         <source>File saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1492"/>
+        <location filename="../mainwindow.cpp" line="1493"/>
         <source>Copyright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1497"/>
+        <location filename="../mainwindow.cpp" line="1498"/>
         <source>donating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1563"/>
-        <location filename="../mainwindow.cpp" line="2019"/>
-        <location filename="../mainwindow.cpp" line="2040"/>
+        <location filename="../mainwindow.cpp" line="1564"/>
+        <location filename="../mainwindow.cpp" line="2020"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
         <source>&amp;%1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1565"/>
+        <location filename="../mainwindow.cpp" line="1566"/>
         <source>%1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
         <source>Create a new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1598"/>
         <source>&amp;Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
+        <location filename="../mainwindow.cpp" line="1600"/>
         <source>Open an existing file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1607"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1608"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Save the document to disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Save &amp;As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1613"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
         <source>Save the document under a new name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
+        <location filename="../mainwindow.cpp" line="1622"/>
         <source>&amp;Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
+        <location filename="../mainwindow.cpp" line="1623"/>
         <source>Edit general preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>&amp;Check for updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1495"/>
+        <location filename="../mainwindow.cpp" line="1496"/>
         <source>If you&apos;ve found this program useful, please support by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1329,34 +1309,29 @@ Do you want to download it now ?</source>
         <source>New release available</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="281"/>
-        <source>A new release of companion is available please check the repository</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="337"/>
         <location filename="../mainwindow.cpp" line="366"/>
         <location filename="../mainwindow.cpp" line="377"/>
         <location filename="../mainwindow.cpp" line="406"/>
-        <location filename="../mainwindow.cpp" line="901"/>
-        <location filename="../mainwindow.cpp" line="2066"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
-        <location filename="../mainwindow.cpp" line="2124"/>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="338"/>
         <location filename="../mainwindow.cpp" line="378"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
         <source>Error opening file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -1387,12 +1362,6 @@ Do you want to download it now ?</source>
         <source>Compilation server too busy, try later</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="359"/>
-        <location filename="../mainwindow.cpp" line="399"/>
-        <source>Compilation server requires registration, please check opentx web site</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="362"/>
         <location filename="../mainwindow.cpp" line="402"/>
@@ -1405,640 +1374,671 @@ Do you want to download it now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
-        <location filename="../mainwindow.cpp" line="517"/>
+        <location filename="../mainwindow.cpp" line="489"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="489"/>
-        <location filename="../mainwindow.cpp" line="518"/>
+        <location filename="../mainwindow.cpp" line="490"/>
+        <location filename="../mainwindow.cpp" line="519"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="491"/>
-        <location filename="../mainwindow.cpp" line="520"/>
+        <location filename="../mainwindow.cpp" line="492"/>
+        <location filename="../mainwindow.cpp" line="521"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="499"/>
-        <location filename="../mainwindow.cpp" line="529"/>
+        <location filename="../mainwindow.cpp" line="500"/>
+        <location filename="../mainwindow.cpp" line="530"/>
         <source>Do you want to download release %1 now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="516"/>
+        <location filename="../mainwindow.cpp" line="517"/>
         <source>A new version of %1 firmware is available (current %2 - newer %3).
 Do you want to download it now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>Ignore this version (r%1)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="556"/>
+        <location filename="../mainwindow.cpp" line="557"/>
         <source>Release notes contain very important informations. Do you want to see them now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Firmware updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Current firmware does not provide release notes informations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="903"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Taranis radio not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
         <source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
+        <location filename="../mainwindow.cpp" line="1080"/>
         <source>Write Models and settings from %1 to the Tx?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Backup is impossible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Conversion failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Restore failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Backup failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1493"/>
+        <location filename="../mainwindow.cpp" line="1494"/>
         <source>Version %1 (revision %2), %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1494"/>
-        <source>The companion9x project was originally forked from eePe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1499"/>
-        <source>About companion9x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>&amp;loadBackup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>Load backup from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Lo&amp;gs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Open log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
-        <source>Check for new version of companion9x/er9x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Contributors &amp;List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
-        <source>Show companion9x contributors list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>ChangeLog...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
-        <source>Show companion9x changelog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Firmware ChangeLog...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Show firmware changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Compare...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Compare models</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Customize your &amp;TX...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Customize the splash screen of your TX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1653"/>
         <source>E&amp;xit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1655"/>
         <source>Exit the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1659"/>
         <source>Cu&amp;t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1661"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1667"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1671"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1673"/>
         <source>Paste the clipboard&apos;s contents into the current selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1678"/>
+        <location filename="../mainwindow.cpp" line="1679"/>
         <source>Ctrl+Alt+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1683"/>
+        <location filename="../mainwindow.cpp" line="1684"/>
         <source>Ctrl+Alt+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1703"/>
+        <location filename="../mainwindow.cpp" line="1704"/>
         <source>&amp;Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1704"/>
+        <location filename="../mainwindow.cpp" line="1705"/>
         <source>Configure software for reading from and writing to the transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1708"/>
+        <location filename="../mainwindow.cpp" line="1709"/>
         <source>&amp;List programmers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1709"/>
+        <location filename="../mainwindow.cpp" line="1710"/>
         <source>List available programmers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1712"/>
+        <location filename="../mainwindow.cpp" line="1713"/>
         <source>&amp;Fuses...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1713"/>
+        <location filename="../mainwindow.cpp" line="1714"/>
         <source>Show fuses dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1716"/>
+        <location filename="../mainwindow.cpp" line="1717"/>
         <source>&amp;Simulate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1717"/>
+        <location filename="../mainwindow.cpp" line="1718"/>
         <source>Alt+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1718"/>
+        <location filename="../mainwindow.cpp" line="1719"/>
         <source>Simulate selected model.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1722"/>
+        <location filename="../mainwindow.cpp" line="1723"/>
         <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1723"/>
+        <location filename="../mainwindow.cpp" line="1724"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location filename="../mainwindow.cpp" line="1725"/>
         <source>Print current model.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1728"/>
+        <location filename="../mainwindow.cpp" line="1729"/>
         <source>Cl&amp;ose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1729"/>
+        <location filename="../mainwindow.cpp" line="1730"/>
         <source>Close the active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1733"/>
+        <location filename="../mainwindow.cpp" line="1734"/>
         <source>Close &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1734"/>
+        <location filename="../mainwindow.cpp" line="1735"/>
         <source>Close all the windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1738"/>
+        <location filename="../mainwindow.cpp" line="1739"/>
         <source>&amp;Tile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1739"/>
+        <location filename="../mainwindow.cpp" line="1740"/>
         <source>Tile the windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1742"/>
+        <location filename="../mainwindow.cpp" line="1743"/>
         <source>&amp;Cascade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1743"/>
+        <location filename="../mainwindow.cpp" line="1744"/>
         <source>Cascade the windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
+        <location filename="../mainwindow.cpp" line="1747"/>
         <source>Ne&amp;xt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1748"/>
+        <location filename="../mainwindow.cpp" line="1749"/>
         <source>Move the focus to the next window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1752"/>
+        <location filename="../mainwindow.cpp" line="1753"/>
         <source>Pre&amp;vious</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1754"/>
+        <location filename="../mainwindow.cpp" line="1755"/>
         <source>Move the focus to the previous window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1762"/>
+        <location filename="../mainwindow.cpp" line="1763"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1763"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
         <source>Show the application&apos;s About box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1787"/>
-        <location filename="../mainwindow.cpp" line="1881"/>
+        <location filename="../mainwindow.cpp" line="1788"/>
+        <location filename="../mainwindow.cpp" line="1882"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1820"/>
+        <location filename="../mainwindow.cpp" line="1821"/>
         <source>&amp;Read/Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1916"/>
+        <location filename="../mainwindow.cpp" line="1917"/>
         <source>Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2066"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
         <source>Unable to find file %1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2124"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
         <source>Error reading file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1767"/>
+        <location filename="../mainwindow.cpp" line="1768"/>
         <source>Switch layout Left/Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1790"/>
+        <location filename="../mainwindow.cpp" line="1791"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1766"/>
+        <location filename="../mainwindow.cpp" line="1767"/>
         <source>Switch layout direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1051"/>
-        <location filename="../mainwindow.cpp" line="1058"/>
-        <location filename="../mainwindow.cpp" line="1427"/>
-        <location filename="../mainwindow.cpp" line="1434"/>
+        <location filename="../mainwindow.cpp" line="106"/>
+        <location filename="../mainwindow.cpp" line="722"/>
+        <location filename="../mainwindow.cpp" line="742"/>
+        <source>Companion - Models and Settings Editor - %1 - profile %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="716"/>
+        <location filename="../mainwindow.cpp" line="733"/>
+        <location filename="../mainwindow.cpp" line="744"/>
+        <source>Companion - Models and Settings Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="260"/>
+        <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="281"/>
+        <source>A new release of Companion is available please check the repository</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="359"/>
+        <location filename="../mainwindow.cpp" line="399"/>
+        <source>Compilation server requires registration, please check OpenTX web site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1052"/>
+        <location filename="../mainwindow.cpp" line="1059"/>
+        <location filename="../mainwindow.cpp" line="1428"/>
+        <location filename="../mainwindow.cpp" line="1435"/>
         <source>Read Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1082"/>
+        <location filename="../mainwindow.cpp" line="1083"/>
         <source>The file %1
 has not been recognized as a valid Models and Settings file
 Write anyway ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1108"/>
-        <location filename="../mainwindow.cpp" line="1115"/>
-        <location filename="../mainwindow.cpp" line="1158"/>
-        <location filename="../mainwindow.cpp" line="1165"/>
-        <location filename="../mainwindow.cpp" line="1357"/>
-        <location filename="../mainwindow.cpp" line="1399"/>
+        <location filename="../mainwindow.cpp" line="1109"/>
+        <location filename="../mainwindow.cpp" line="1116"/>
+        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1166"/>
+        <location filename="../mainwindow.cpp" line="1358"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>Backup Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1131"/>
+        <location filename="../mainwindow.cpp" line="1132"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
         <source>The transmitter firmware belongs to another product family, check file and preferences!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>The transmitter firmware is outdated, please upgrade!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1180"/>
+        <location filename="../mainwindow.cpp" line="1181"/>
         <source>Write Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1363"/>
-        <location filename="../mainwindow.cpp" line="1406"/>
+        <location filename="../mainwindow.cpp" line="1364"/>
+        <location filename="../mainwindow.cpp" line="1407"/>
         <source>Write Firmware To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Cannot convert Models and Settings for use with this firmware, original data will be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1375"/>
         <source>Restore Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Could not restore Models and Settings to TX. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Firmware write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Could not write firmware to to transmitter. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Cannot backup existing Models and Settings from TX. Firmware write process aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1416"/>
+        <location filename="../mainwindow.cpp" line="1417"/>
         <source>Save transmitter Models and Settings to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Impossible to identify the radio on your system, please verify that the eeprom disk is connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1444"/>
+        <location filename="../mainwindow.cpp" line="1445"/>
         <source>Read Tx Firmware to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1677"/>
+        <location filename="../mainwindow.cpp" line="1495"/>
+        <source>The Companion project was originally forked from eePe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1500"/>
+        <source>About Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Check for new version of Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1631"/>
+        <source>Show Companion contributors list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1635"/>
+        <source>Show Companion changelog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1678"/>
         <source>&amp;Write Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1679"/>
+        <location filename="../mainwindow.cpp" line="1680"/>
         <source>Write Models and Settings to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1682"/>
+        <location filename="../mainwindow.cpp" line="1683"/>
         <source>&amp;Read Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1684"/>
+        <location filename="../mainwindow.cpp" line="1685"/>
         <source>Read Models and Settings from transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
+        <location filename="../mainwindow.cpp" line="1688"/>
         <source>Write Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1688"/>
+        <location filename="../mainwindow.cpp" line="1689"/>
         <source>Write firmware to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1691"/>
+        <location filename="../mainwindow.cpp" line="1692"/>
         <source>Write Models and Settings from file to Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1692"/>
+        <location filename="../mainwindow.cpp" line="1693"/>
         <source>Write Models and Settings from file to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1695"/>
+        <location filename="../mainwindow.cpp" line="1696"/>
         <source>Save transmitter Models and Settings to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1696"/>
+        <location filename="../mainwindow.cpp" line="1697"/>
         <source>Save the Models and Settings from the transmitter to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1699"/>
+        <location filename="../mainwindow.cpp" line="1700"/>
         <source>Read Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1700"/>
+        <location filename="../mainwindow.cpp" line="1701"/>
         <source>Read firmware from transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1788"/>
-        <location filename="../mainwindow.cpp" line="1891"/>
+        <location filename="../mainwindow.cpp" line="1789"/>
+        <location filename="../mainwindow.cpp" line="1892"/>
         <source>Firmware Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1815"/>
+        <location filename="../mainwindow.cpp" line="1816"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
         <source>Invalid Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1838"/>
+        <location filename="../mainwindow.cpp" line="1839"/>
         <source>&amp;Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1844"/>
+        <location filename="../mainwindow.cpp" line="1845"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1874"/>
+        <location filename="../mainwindow.cpp" line="1875"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1911"/>
+        <location filename="../mainwindow.cpp" line="1912"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1928"/>
+        <location filename="../mainwindow.cpp" line="1929"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location filename="../mainwindow.cpp" line="1936"/>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2130,14 +2130,14 @@ Write anyway ?</source>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="182"/>
-        <location filename="../mdichild.cpp" line="187"/>
-        <location filename="../mdichild.cpp" line="470"/>
-        <source>companion9x</source>
+        <source>Do you want to use model wizard? </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="182"/>
-        <source>Do you want to use model wizard? </source>
+        <location filename="../mdichild.cpp" line="187"/>
+        <location filename="../mdichild.cpp" line="470"/>
+        <source>Companion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7026,18 +7026,6 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
         <source>th9x doesn&apos;t support curve with %1 point as curve%2 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../warnings.h" line="5"/>
-        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
-
-We are really sensible to that!
-
-The openTX/C9X Team.</source>
-        <oldsource>Warning!
-Telemetry channel order has been changed, please check function switches and telemetry settings!
-Expos settings have been changed, please verify before flight!</oldsource>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit.cpp" line="1421"/>
         <location filename="../modeledit.cpp" line="3687"/>
@@ -7073,6 +7061,15 @@ Expos settings have been changed, please verify before flight!</oldsource>
         <source>OpenTX doesn&apos;t allow this number of channels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../warnings.h" line="5"/>
+        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
+
+We are really appreciative for that!
+
+The OpenTX/Companion Team.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>avrOutputDialog</name>
@@ -7395,7 +7392,7 @@ Please only use this if you know what you are doing.  There are no error checks
     <message>
         <location filename="../burnconfigdialog.cpp" line="328"/>
         <location filename="../burnconfigdialog.cpp" line="397"/>
-        <source>companion9x</source>
+        <source>Companion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7466,6 +7463,11 @@ m2560 for v4.1 boards</source>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../burndialog.ui" line="276"/>
+        <source>Allows Companion to write to older version of the firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burndialog.ui" line="289"/>
         <source>Backup and restore Models and Settings</source>
@@ -7512,11 +7514,6 @@ m2560 for v4.1 boards</source>
         <source>Variant</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../burndialog.ui" line="276"/>
-        <source>Allows companion9x to write to older version of the firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../burndialog.ui" line="279"/>
         <source>Check Firmware compatibility</source>
@@ -8243,27 +8240,27 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../contributorsdialog.cpp" line="29"/>
         <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
-of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
-companion9x was forked out.</source>
+of course. Also to Erez Raviv (er9x) and the fantastic eePe program 
+which was the staring point for OpenTX Companion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="31"/>
+        <location filename="../contributorsdialog.cpp" line="46"/>
+        <source>Companion Release Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contributorsdialog.cpp" line="32"/>
         <source>Thank you all !!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="34"/>
+        <location filename="../contributorsdialog.cpp" line="35"/>
         <source>Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="45"/>
-        <source>Companion9x Release Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contributorsdialog.cpp" line="50"/>
+        <location filename="../contributorsdialog.cpp" line="51"/>
         <source>OpenTX Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8413,7 +8410,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="54"/>
-        <source>companion9x</source>
+        <source>Companion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8740,7 +8737,7 @@ Press cancel to abort joystick calibration</source>
     <name>logsDialog</name>
     <message>
         <location filename="../logsdialog.ui" line="14"/>
-        <source>Companion9x log viewer</source>
+        <source>Companion Log Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8754,47 +8751,58 @@ Press cancel to abort joystick calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="131"/>
+        <location filename="../logsdialog.ui" line="94"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="138"/>
+        <location filename="../logsdialog.ui" line="101"/>
         <source>X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="145"/>
+        <location filename="../logsdialog.ui" line="108"/>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="169"/>
+        <location filename="../logsdialog.ui" line="132"/>
         <source>Fly sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="22"/>
+        <location filename="../logsdialog.cpp" line="27"/>
         <source>Telemetry logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="23"/>
+        <location filename="../logsdialog.cpp" line="28"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="395"/>
+        <location filename="../logsdialog.cpp" line="252"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="253"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="582"/>
         <source>Select your log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="406"/>
+        <location filename="../logsdialog.cpp" line="593"/>
         <source>Available fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="501"/>
+        <location filename="../logsdialog.cpp" line="690"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9252,27 +9260,27 @@ Press cancel to abort joystick calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="506"/>
+        <location filename="../preferencesdialog.ui" line="650"/>
         <source>Language (requires restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="977"/>
+        <location filename="../preferencesdialog.ui" line="1008"/>
         <source>SD Structure path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="987"/>
+        <location filename="../preferencesdialog.ui" line="1018"/>
         <source>Processor ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="996"/>
+        <location filename="../preferencesdialog.ui" line="1027"/>
         <source>Simulator capture folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="1025"/>
+        <location filename="../preferencesdialog.ui" line="679"/>
         <source>Use clipboard only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9282,40 +9290,40 @@ Press cancel to abort joystick calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="883"/>
-        <location filename="../preferencesdialog.ui" line="924"/>
+        <location filename="../preferencesdialog.ui" line="914"/>
+        <location filename="../preferencesdialog.ui" line="955"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="676"/>
+        <location filename="../preferencesdialog.ui" line="707"/>
         <source>Default Channel Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="663"/>
+        <location filename="../preferencesdialog.ui" line="694"/>
         <source>Default Stick Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="525"/>
+        <location filename="../preferencesdialog.ui" line="292"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="353"/>
+        <location filename="../preferencesdialog.ui" line="497"/>
         <source>FwInfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="273"/>
+        <location filename="../preferencesdialog.ui" line="51"/>
         <source>Show Splash Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="686"/>
+        <location filename="../preferencesdialog.ui" line="717"/>
         <source>Mode selection:
 
 Mode 1:
@@ -9338,97 +9346,107 @@ Mode 4:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="711"/>
+        <location filename="../preferencesdialog.ui" line="742"/>
         <source>Mode 1 (RUD ELE THR AIL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="716"/>
+        <location filename="../preferencesdialog.ui" line="747"/>
         <source>Mode 2 (RUD THR ELE AIL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="721"/>
+        <location filename="../preferencesdialog.ui" line="752"/>
         <source>Mode 3 (AIL ELE THR RUD)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="726"/>
+        <location filename="../preferencesdialog.ui" line="757"/>
         <source>Mode 4 (AIL THR ELE RUD)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="790"/>
+        <location filename="../preferencesdialog.ui" line="821"/>
         <source>Automatic Backup Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="846"/>
+        <location filename="../preferencesdialog.ui" line="877"/>
         <source>Automatically add version number to the filename after download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="870"/>
+        <location filename="../preferencesdialog.ui" line="901"/>
         <source>Voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="890"/>
+        <location filename="../preferencesdialog.ui" line="921"/>
         <source>Set language of voice.
 May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="964"/>
+        <location filename="../preferencesdialog.ui" line="995"/>
         <source>Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="70"/>
+        <location filename="../preferencesdialog.ui" line="1616"/>
+        <source>Find Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="1625"/>
+        <source>Google Earth Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="83"/>
         <source>Check for updates on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="148"/>
-        <location filename="../preferencesdialog.ui" line="215"/>
+        <location filename="../preferencesdialog.ui" line="161"/>
+        <location filename="../preferencesdialog.ui" line="228"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="773"/>
+        <location filename="../preferencesdialog.ui" line="804"/>
         <source>Splash library behaviour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="754"/>
+        <location filename="../preferencesdialog.ui" line="785"/>
         <source>Include companion splashes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="759"/>
+        <location filename="../preferencesdialog.ui" line="790"/>
         <source>Only user defined splashes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="286"/>
+        <location filename="../preferencesdialog.ui" line="430"/>
         <source>Custom TX splash screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="375"/>
+        <location filename="../preferencesdialog.ui" line="519"/>
         <source>Personal splash library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="740"/>
+        <location filename="../preferencesdialog.ui" line="771"/>
         <source>Joystick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="326"/>
-        <location filename="../preferencesdialog.ui" line="806"/>
-        <location filename="../preferencesdialog.ui" line="941"/>
-        <location filename="../preferencesdialog.ui" line="1008"/>
+        <location filename="../preferencesdialog.ui" line="470"/>
+        <location filename="../preferencesdialog.ui" line="662"/>
+        <location filename="../preferencesdialog.ui" line="837"/>
+        <location filename="../preferencesdialog.ui" line="972"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9479,201 +9497,206 @@ May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="360"/>
+        <location filename="../preferencesdialog.ui" line="504"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="908"/>
+        <location filename="../preferencesdialog.ui" line="939"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="488"/>
+        <location filename="../preferencesdialog.ui" line="632"/>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="454"/>
+        <location filename="../preferencesdialog.ui" line="598"/>
         <source>Export Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="461"/>
+        <location filename="../preferencesdialog.ui" line="605"/>
         <source>Save Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="478"/>
+        <location filename="../preferencesdialog.ui" line="622"/>
         <source>Import Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="172"/>
+        <location filename="../preferencesdialog.ui" line="185"/>
         <source>Blue</source>
         <oldsource>Blu</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="58"/>
+        <location filename="../preferencesdialog.ui" line="71"/>
         <source>Simu BackLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="80"/>
+        <location filename="../preferencesdialog.ui" line="93"/>
         <source>Check for selected Fw updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="92"/>
+        <location filename="../preferencesdialog.ui" line="105"/>
         <source>Ask use of wizard for new models</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="164"/>
+        <location filename="../preferencesdialog.ui" line="177"/>
         <source>Remember switches in simulator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="177"/>
+        <location filename="../preferencesdialog.ui" line="190"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="182"/>
+        <location filename="../preferencesdialog.ui" line="195"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="187"/>
+        <location filename="../preferencesdialog.ui" line="200"/>
         <source>Orange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="192"/>
+        <location filename="../preferencesdialog.ui" line="205"/>
         <source>Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="783"/>
+        <location filename="../preferencesdialog.ui" line="814"/>
         <source>Profile slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="813"/>
+        <location filename="../preferencesdialog.ui" line="844"/>
         <source>auto backup before write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="433"/>
+        <location filename="../preferencesdialog.ui" line="577"/>
         <source>Ask for flashing after Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="295"/>
+        <location filename="../preferencesdialog.ui" line="439"/>
         <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="312"/>
+        <location filename="../preferencesdialog.ui" line="456"/>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="232"/>
+        <location filename="../preferencesdialog.ui" line="245"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="141"/>
+        <location filename="../preferencesdialog.ui" line="154"/>
         <source>Invert Pixels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="227"/>
+        <location filename="../preferencesdialog.cpp" line="233"/>
         <source>Last downloaded release: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="236"/>
-        <source>The selected firmware has never been downloaded by companion9x.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferencesdialog.cpp" line="240"/>
-        <source>The selected firmware cannot be downloaded by companion9x.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferencesdialog.cpp" line="447"/>
+        <location filename="../preferencesdialog.cpp" line="461"/>
         <source>Image stored in settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="458"/>
-        <location filename="../preferencesdialog.cpp" line="780"/>
+        <location filename="../preferencesdialog.cpp" line="472"/>
+        <location filename="../preferencesdialog.cpp" line="804"/>
         <source>No joysticks found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="569"/>
+        <location filename="../preferencesdialog.cpp" line="583"/>
         <source>Select your Models and Settings backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="597"/>
+        <location filename="../preferencesdialog.cpp" line="594"/>
+        <source>Select Google Earth executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="620"/>
         <source>Select the folder replicating your SD structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="641"/>
+        <location filename="../preferencesdialog.cpp" line="664"/>
         <source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="677"/>
+        <location filename="../preferencesdialog.cpp" line="701"/>
         <source>Export profile As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="699"/>
+        <location filename="../preferencesdialog.cpp" line="723"/>
         <source>Profile slot is not empty, profile slot %1 will we overwritten.&lt;br&gt;Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="705"/>
+        <location filename="../preferencesdialog.cpp" line="729"/>
         <source>Open Profile to import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Open Image to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Images (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="532"/>
+        <location filename="../preferencesdialog.cpp" line="242"/>
+        <source>The selected firmware has never been downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="246"/>
+        <source>The selected firmware cannot be downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="546"/>
         <source>Select your library folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="542"/>
+        <location filename="../preferencesdialog.cpp" line="556"/>
         <source>Select your snapshot folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Cannot load %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10174,12 +10197,6 @@ May be different from firmware language</source>
 </context>
 <context>
     <name>simulatorDialog</name>
-    <message>
-        <location filename="../simulatordialog.ui" line="26"/>
-        <source>Companion9x Simulator</source>
-        <oldsource>ER9x Simulator</oldsource>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../simulatordialog.ui" line="844"/>
         <source>P1</source>
@@ -10285,6 +10302,11 @@ May be different from firmware language</source>
         <source>Right Double Click to Reset</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../simulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../simulatordialog.ui" line="866"/>
         <location filename="../simulatordialog.ui" line="926"/>
@@ -10298,267 +10320,267 @@ May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1239"/>
+        <location filename="../simulatordialog.ui" line="1240"/>
         <source>Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1265"/>
+        <location filename="../simulatordialog.ui" line="1266"/>
         <source>CS1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1296"/>
+        <location filename="../simulatordialog.ui" line="1297"/>
         <source>CS2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1327"/>
+        <location filename="../simulatordialog.ui" line="1328"/>
         <source>CS3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1358"/>
+        <location filename="../simulatordialog.ui" line="1359"/>
         <source>CS4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1389"/>
+        <location filename="../simulatordialog.ui" line="1390"/>
         <source>CS5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1420"/>
+        <location filename="../simulatordialog.ui" line="1421"/>
         <source>CS6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1451"/>
+        <location filename="../simulatordialog.ui" line="1452"/>
         <source>CS7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1482"/>
+        <location filename="../simulatordialog.ui" line="1483"/>
         <source>CS8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1513"/>
+        <location filename="../simulatordialog.ui" line="1514"/>
         <source>CS9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1544"/>
+        <location filename="../simulatordialog.ui" line="1545"/>
         <source>CSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1575"/>
+        <location filename="../simulatordialog.ui" line="1576"/>
         <source>CSB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1606"/>
+        <location filename="../simulatordialog.ui" line="1607"/>
         <source>CSC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1637"/>
+        <location filename="../simulatordialog.ui" line="1638"/>
         <source>CSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1668"/>
+        <location filename="../simulatordialog.ui" line="1669"/>
         <source>CSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1699"/>
+        <location filename="../simulatordialog.ui" line="1700"/>
         <source>CSF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1730"/>
+        <location filename="../simulatordialog.ui" line="1731"/>
         <source>CSG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1761"/>
+        <location filename="../simulatordialog.ui" line="1762"/>
         <source>CSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1792"/>
+        <location filename="../simulatordialog.ui" line="1793"/>
         <source>CSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1823"/>
+        <location filename="../simulatordialog.ui" line="1825"/>
         <source>CSJ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1854"/>
+        <location filename="../simulatordialog.ui" line="1856"/>
         <source>CSK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1885"/>
+        <location filename="../simulatordialog.ui" line="1887"/>
         <source>CSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1916"/>
+        <location filename="../simulatordialog.ui" line="1918"/>
         <source>CSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1947"/>
+        <location filename="../simulatordialog.ui" line="1949"/>
         <source>CSN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1978"/>
+        <location filename="../simulatordialog.ui" line="1980"/>
         <source>CSO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2009"/>
+        <location filename="../simulatordialog.ui" line="2011"/>
         <source>CSP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2040"/>
+        <location filename="../simulatordialog.ui" line="2042"/>
         <source>CSQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2071"/>
+        <location filename="../simulatordialog.ui" line="2073"/>
         <source>CSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2102"/>
+        <location filename="../simulatordialog.ui" line="2104"/>
         <source>CSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2133"/>
+        <location filename="../simulatordialog.ui" line="2135"/>
         <source>CST</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2164"/>
+        <location filename="../simulatordialog.ui" line="2166"/>
         <source>CSU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2195"/>
+        <location filename="../simulatordialog.ui" line="2197"/>
         <source>CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2226"/>
+        <location filename="../simulatordialog.ui" line="2228"/>
         <source>CSW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2307"/>
+        <location filename="../simulatordialog.ui" line="2310"/>
         <source>CH1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2419"/>
+        <location filename="../simulatordialog.ui" line="2422"/>
         <source>CH9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2432"/>
+        <location filename="../simulatordialog.ui" line="2435"/>
         <source>CH2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2599"/>
+        <location filename="../simulatordialog.ui" line="2602"/>
         <source>CH10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2612"/>
+        <location filename="../simulatordialog.ui" line="2615"/>
         <source>CH3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2779"/>
+        <location filename="../simulatordialog.ui" line="2782"/>
         <source>CH11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2792"/>
+        <location filename="../simulatordialog.ui" line="2795"/>
         <source>CH4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2959"/>
+        <location filename="../simulatordialog.ui" line="2962"/>
         <source>CH12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2972"/>
+        <location filename="../simulatordialog.ui" line="2975"/>
         <source>CH5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3133"/>
+        <location filename="../simulatordialog.ui" line="3136"/>
         <source>CH13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3146"/>
+        <location filename="../simulatordialog.ui" line="3149"/>
         <source>CH6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3258"/>
+        <location filename="../simulatordialog.ui" line="3261"/>
         <source>CH14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3271"/>
+        <location filename="../simulatordialog.ui" line="3274"/>
         <source>CH7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3438"/>
+        <location filename="../simulatordialog.ui" line="3441"/>
         <source>CH15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3451"/>
+        <location filename="../simulatordialog.ui" line="3454"/>
         <source>CH8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3618"/>
+        <location filename="../simulatordialog.ui" line="3621"/>
         <source>CH16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2326"/>
-        <location filename="../simulatordialog.ui" line="2348"/>
-        <location filename="../simulatordialog.ui" line="2506"/>
-        <location filename="../simulatordialog.ui" line="2528"/>
-        <location filename="../simulatordialog.ui" line="2686"/>
-        <location filename="../simulatordialog.ui" line="2708"/>
-        <location filename="../simulatordialog.ui" line="2866"/>
-        <location filename="../simulatordialog.ui" line="2888"/>
-        <location filename="../simulatordialog.ui" line="3040"/>
-        <location filename="../simulatordialog.ui" line="3062"/>
-        <location filename="../simulatordialog.ui" line="3165"/>
-        <location filename="../simulatordialog.ui" line="3187"/>
-        <location filename="../simulatordialog.ui" line="3345"/>
-        <location filename="../simulatordialog.ui" line="3367"/>
-        <location filename="../simulatordialog.ui" line="3525"/>
-        <location filename="../simulatordialog.ui" line="3547"/>
+        <location filename="../simulatordialog.ui" line="2329"/>
+        <location filename="../simulatordialog.ui" line="2351"/>
+        <location filename="../simulatordialog.ui" line="2509"/>
+        <location filename="../simulatordialog.ui" line="2531"/>
+        <location filename="../simulatordialog.ui" line="2689"/>
+        <location filename="../simulatordialog.ui" line="2711"/>
+        <location filename="../simulatordialog.ui" line="2869"/>
+        <location filename="../simulatordialog.ui" line="2891"/>
+        <location filename="../simulatordialog.ui" line="3043"/>
+        <location filename="../simulatordialog.ui" line="3065"/>
+        <location filename="../simulatordialog.ui" line="3168"/>
+        <location filename="../simulatordialog.ui" line="3190"/>
+        <location filename="../simulatordialog.ui" line="3348"/>
+        <location filename="../simulatordialog.ui" line="3370"/>
+        <location filename="../simulatordialog.ui" line="3528"/>
+        <location filename="../simulatordialog.ui" line="3550"/>
         <source>-100.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10635,11 +10657,6 @@ May be different from firmware language</source>
 </context>
 <context>
     <name>xsimulatorDialog</name>
-    <message>
-        <location filename="../xsimulatordialog.ui" line="26"/>
-        <source>Companion9x Simulator</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="377"/>
         <location filename="../xsimulatordialog.ui" line="585"/>
@@ -10758,6 +10775,11 @@ May be different from firmware language</source>
         <source>LS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../xsimulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1269"/>
         <source>Taranis Simulator</source>
@@ -10775,16 +10797,16 @@ May be different from firmware language</source>
         <location filename="../xsimulatordialog.ui" line="1772"/>
         <location filename="../xsimulatordialog.ui" line="1930"/>
         <location filename="../xsimulatordialog.ui" line="1952"/>
-        <location filename="../xsimulatordialog.ui" line="2110"/>
-        <location filename="../xsimulatordialog.ui" line="2132"/>
-        <location filename="../xsimulatordialog.ui" line="2284"/>
-        <location filename="../xsimulatordialog.ui" line="2306"/>
-        <location filename="../xsimulatordialog.ui" line="2409"/>
-        <location filename="../xsimulatordialog.ui" line="2431"/>
-        <location filename="../xsimulatordialog.ui" line="2589"/>
-        <location filename="../xsimulatordialog.ui" line="2611"/>
-        <location filename="../xsimulatordialog.ui" line="2769"/>
-        <location filename="../xsimulatordialog.ui" line="2791"/>
+        <location filename="../xsimulatordialog.ui" line="2111"/>
+        <location filename="../xsimulatordialog.ui" line="2133"/>
+        <location filename="../xsimulatordialog.ui" line="2285"/>
+        <location filename="../xsimulatordialog.ui" line="2307"/>
+        <location filename="../xsimulatordialog.ui" line="2410"/>
+        <location filename="../xsimulatordialog.ui" line="2432"/>
+        <location filename="../xsimulatordialog.ui" line="2590"/>
+        <location filename="../xsimulatordialog.ui" line="2612"/>
+        <location filename="../xsimulatordialog.ui" line="2770"/>
+        <location filename="../xsimulatordialog.ui" line="2792"/>
         <source>-100.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10819,207 +10841,207 @@ May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2203"/>
+        <location filename="../xsimulatordialog.ui" line="2204"/>
         <source>CH12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2216"/>
+        <location filename="../xsimulatordialog.ui" line="2217"/>
         <source>CH5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2377"/>
+        <location filename="../xsimulatordialog.ui" line="2378"/>
         <source>CH13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2390"/>
+        <location filename="../xsimulatordialog.ui" line="2391"/>
         <source>CH6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2502"/>
+        <location filename="../xsimulatordialog.ui" line="2503"/>
         <source>CH14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2515"/>
+        <location filename="../xsimulatordialog.ui" line="2516"/>
         <source>CH7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2682"/>
+        <location filename="../xsimulatordialog.ui" line="2683"/>
         <source>CH15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2695"/>
+        <location filename="../xsimulatordialog.ui" line="2696"/>
         <source>CH8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2862"/>
+        <location filename="../xsimulatordialog.ui" line="2863"/>
         <source>CH16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2896"/>
+        <location filename="../xsimulatordialog.ui" line="2897"/>
         <source>CSK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2927"/>
+        <location filename="../xsimulatordialog.ui" line="2928"/>
         <source>CSC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2958"/>
+        <location filename="../xsimulatordialog.ui" line="2959"/>
         <source>CSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2989"/>
+        <location filename="../xsimulatordialog.ui" line="2990"/>
         <source>CS7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3020"/>
+        <location filename="../xsimulatordialog.ui" line="3021"/>
         <source>CSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3051"/>
+        <location filename="../xsimulatordialog.ui" line="3052"/>
         <source>CSB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3082"/>
+        <location filename="../xsimulatordialog.ui" line="3083"/>
         <source>CS1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3113"/>
+        <location filename="../xsimulatordialog.ui" line="3114"/>
         <source>CSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3144"/>
+        <location filename="../xsimulatordialog.ui" line="3145"/>
         <source>CSG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3175"/>
+        <location filename="../xsimulatordialog.ui" line="3176"/>
         <source>CSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3206"/>
+        <location filename="../xsimulatordialog.ui" line="3207"/>
         <source>CSF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3237"/>
+        <location filename="../xsimulatordialog.ui" line="3238"/>
         <source>CS8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3268"/>
+        <location filename="../xsimulatordialog.ui" line="3269"/>
         <source>CS9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3299"/>
+        <location filename="../xsimulatordialog.ui" line="3300"/>
         <source>CSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3330"/>
+        <location filename="../xsimulatordialog.ui" line="3331"/>
         <source>CSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3361"/>
+        <location filename="../xsimulatordialog.ui" line="3362"/>
         <source>CSJ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3392"/>
+        <location filename="../xsimulatordialog.ui" line="3393"/>
         <source>CSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3423"/>
+        <location filename="../xsimulatordialog.ui" line="3424"/>
         <source>CS4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3454"/>
+        <location filename="../xsimulatordialog.ui" line="3455"/>
         <source>CS5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3485"/>
+        <location filename="../xsimulatordialog.ui" line="3486"/>
         <source>CS2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3516"/>
+        <location filename="../xsimulatordialog.ui" line="3517"/>
         <source>CS3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3547"/>
+        <location filename="../xsimulatordialog.ui" line="3548"/>
         <source>CS6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3578"/>
+        <location filename="../xsimulatordialog.ui" line="3579"/>
         <source>CSN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3609"/>
+        <location filename="../xsimulatordialog.ui" line="3610"/>
         <source>CSO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3640"/>
+        <location filename="../xsimulatordialog.ui" line="3641"/>
         <source>CSP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3671"/>
+        <location filename="../xsimulatordialog.ui" line="3672"/>
         <source>CSQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3702"/>
+        <location filename="../xsimulatordialog.ui" line="3703"/>
         <source>CSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3733"/>
+        <location filename="../xsimulatordialog.ui" line="3734"/>
         <source>CSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3764"/>
+        <location filename="../xsimulatordialog.ui" line="3765"/>
         <source>CST</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3795"/>
+        <location filename="../xsimulatordialog.ui" line="3796"/>
         <source>CSU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3826"/>
+        <location filename="../xsimulatordialog.ui" line="3827"/>
         <source>CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3857"/>
+        <location filename="../xsimulatordialog.ui" line="3858"/>
         <source>CSW</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/companion/src/translations/companion9x_it.ts b/companion/src/translations/companion_it.ts
similarity index 94%
rename from companion/src/translations/companion9x_it.ts
rename to companion/src/translations/companion_it.ts
index 952477a89..d880d890b 100644
--- a/companion/src/translations/companion9x_it.ts
+++ b/companion/src/translations/companion_it.ts
@@ -1210,9 +1210,9 @@ Siete sicuri ?</translation>
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.cpp" line="147"/>
-        <location filename="../mainwindow.cpp" line="635"/>
-        <location filename="../mainwindow.cpp" line="669"/>
-        <location filename="../mainwindow.cpp" line="2161"/>
+        <location filename="../mainwindow.cpp" line="636"/>
+        <location filename="../mainwindow.cpp" line="670"/>
+        <location filename="../mainwindow.cpp" line="2162"/>
         <source>File loaded</source>
         <translation>Documento caricato</translation>
     </message>
@@ -1230,22 +1230,21 @@ Siete sicuri ?</translation>
         <location filename="../mainwindow.cpp" line="246"/>
         <location filename="../mainwindow.cpp" line="289"/>
         <location filename="../mainwindow.cpp" line="467"/>
-        <location filename="../mainwindow.cpp" line="589"/>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="590"/>
+        <location filename="../mainwindow.cpp" line="594"/>
         <source>Unable to check for updates.</source>
         <translation>Impossibile controllare gli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="260"/>
         <source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
-        <translation>Una nuova versione di companion9x è disponibile (versione %1)&lt;br&gt;Desiderate scaricarla ?</translation>
+        <translation type="obsolete">Una nuova versione di companion9x è disponibile (versione %1)&lt;br&gt;Desiderate scaricarla ?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="268"/>
         <location filename="../mainwindow.cpp" line="270"/>
         <location filename="../mainwindow.cpp" line="310"/>
-        <location filename="../mainwindow.cpp" line="570"/>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="571"/>
+        <location filename="../mainwindow.cpp" line="573"/>
         <source>Save As</source>
         <translation>Salva come</translation>
     </message>
@@ -1260,13 +1259,12 @@ Siete sicuri ?</translation>
         <translation>Nuova versione disponibile</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="281"/>
         <source>A new release of companion is available please check the repository</source>
-        <translation>Una nuova versione di companion9x è stata rilasciata, controllate il repository SVN</translation>
+        <translation type="obsolete">Una nuova versione di companion9x è stata rilasciata, controllate il repository SVN</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="285"/>
-        <location filename="../mainwindow.cpp" line="543"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>No updates available at this time.</source>
         <translation>Nessun aggiornamento disponibile.</translation>
     </message>
@@ -1278,9 +1276,9 @@ Siete sicuri ?</translation>
     <message>
         <location filename="../mainwindow.cpp" line="338"/>
         <location filename="../mainwindow.cpp" line="378"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
         <source>Error opening file %1:
 %2.</source>
         <translation>Errore durante l&apos;apertura del file %1:
@@ -1302,19 +1300,12 @@ Siete sicuri ?</translation>
         <translation>Il server di compilazione è occupato, provate più tardi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="106"/>
-        <location filename="../mainwindow.cpp" line="721"/>
-        <location filename="../mainwindow.cpp" line="741"/>
         <source>companion9x - Models and Settings Editor - %1 - profile %2</source>
-        <translation>Companion9x - EEPROM Editor - %1- profilo %2</translation>
+        <translation type="obsolete">Companion9x - EEPROM Editor - %1- profilo %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="108"/>
-        <location filename="../mainwindow.cpp" line="715"/>
-        <location filename="../mainwindow.cpp" line="732"/>
-        <location filename="../mainwindow.cpp" line="743"/>
         <source>companion9x - Models and Settings Editor - %1</source>
-        <translation>Companion9x - EEPROM Editor - %1</translation>
+        <translation type="obsolete">Companion9x - EEPROM Editor - %1</translation>
     </message>
     <message>
         <source>Firmware does not longer fit in program memory, due to selected firmware options</source>
@@ -1331,7 +1322,7 @@ Siete sicuri ?</translation>
         <translation type="obsolete">Volete scrivere il nuovo firmware sulla radio ora ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="487"/>
+        <location filename="../mainwindow.cpp" line="488"/>
         <source>Firmware %1 does not seem to have ever been downloaded.
 Version %2 is available.
 Do you want to download it now ?</source>
@@ -1340,25 +1331,25 @@ E&apos; disponibile la versione %2.
 Volete scaricarla adesso ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="516"/>
+        <location filename="../mainwindow.cpp" line="517"/>
         <source>A new version of %1 firmware is available (current %2 - newer %3).
 Do you want to download it now ?</source>
         <translation>Una nuova versione del firmware %1 è disponibile (attuale %2 - nuova %3).
 Volete scaricarla ora ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>Ignore this version (r%1)?</source>
         <translation>Ignorare questa versione (r%1) ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="623"/>
+        <location filename="../mainwindow.cpp" line="624"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="644"/>
-        <location filename="../mainwindow.cpp" line="650"/>
+        <location filename="../mainwindow.cpp" line="645"/>
+        <location filename="../mainwindow.cpp" line="651"/>
         <source>File saved</source>
         <translation>Documento salvato</translation>
     </message>
@@ -1367,15 +1358,15 @@ Volete scaricarla ora ?</translation>
         <location filename="../mainwindow.cpp" line="366"/>
         <location filename="../mainwindow.cpp" line="377"/>
         <location filename="../mainwindow.cpp" line="406"/>
-        <location filename="../mainwindow.cpp" line="901"/>
-        <location filename="../mainwindow.cpp" line="2066"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
-        <location filename="../mainwindow.cpp" line="2124"/>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
@@ -1402,10 +1393,8 @@ Volete scaricarla ora ?</translation>
         <translation>Guasto temporaneo del server di compilazione, riprovate più tardi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="359"/>
-        <location filename="../mainwindow.cpp" line="399"/>
         <source>Compilation server requires registration, please check opentx web site</source>
-        <translation>Il server di compilazione richiede una registrazione, controllate il sito di opentx</translation>
+        <translation type="obsolete">Il server di compilazione richiede una registrazione, controllate il sito di opentx</translation>
     </message>
     <message>
         <source>Firmware does not fit in program memory, due to selected firmware options</source>
@@ -1417,65 +1406,65 @@ Volete scaricarla ora ?</translation>
         <translation>Volete scrivere il nuovo firmware sulla radio ora ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
-        <location filename="../mainwindow.cpp" line="517"/>
+        <location filename="../mainwindow.cpp" line="489"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="489"/>
-        <location filename="../mainwindow.cpp" line="518"/>
+        <location filename="../mainwindow.cpp" line="490"/>
+        <location filename="../mainwindow.cpp" line="519"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="491"/>
-        <location filename="../mainwindow.cpp" line="520"/>
+        <location filename="../mainwindow.cpp" line="492"/>
+        <location filename="../mainwindow.cpp" line="521"/>
         <source>Release Notes</source>
         <translation>Note di aggiornamento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="499"/>
-        <location filename="../mainwindow.cpp" line="529"/>
+        <location filename="../mainwindow.cpp" line="500"/>
+        <location filename="../mainwindow.cpp" line="530"/>
         <source>Do you want to download release %1 now ?</source>
         <translation>Volete scaricare la versione %1 adesso ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="556"/>
+        <location filename="../mainwindow.cpp" line="557"/>
         <source>Release notes contain very important informations. Do you want to see them now ?</source>
         <translation>Le note di rilascio includono informazioni molto importanti. Volete vederle ora ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Firmware updates</source>
         <translation>Aggiornamenti firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Current firmware does not provide release notes informations.</source>
         <translation>Il firmware selezionato non fornisce note di aggiornamento.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="903"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Non posso scrivere il file %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Taranis radio not found</source>
         <translation>Radio taranis non trovata</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
         <source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
         <translation>Impossibile identificare la radio sul vostro sistema, verificate che il disco della eeprom sia connesso. </translation>
     </message>
@@ -1496,16 +1485,16 @@ non è stato riconosciuto come una EEProm valida
 Scriverlo ugualmente ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Backup is impossible</source>
         <translation>Impossibile effettuare il Backup</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation>La directory per i backup impostata in preferenze non esiste</translation>
     </message>
@@ -1518,8 +1507,8 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Non posso controllare la compatibilità delle impostazioni! Continuare ugualmente ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
@@ -1540,7 +1529,7 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Scrivi il fimware sulla radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Conversion failed</source>
         <translation>Conversione fallita</translation>
     </message>
@@ -1553,7 +1542,7 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Ripristina memoria sulla Radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Restore failed</source>
         <translation>Ripristino fallito</translation>
     </message>
@@ -1570,7 +1559,7 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Non posso aggiornare il firmware, la memoria dei settaggi originale può essere trovata in %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Backup failed</source>
         <translation>Salvataggio fallito</translation>
     </message>
@@ -1587,10 +1576,10 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Scrivi il firmware in un documento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1051"/>
-        <location filename="../mainwindow.cpp" line="1058"/>
-        <location filename="../mainwindow.cpp" line="1427"/>
-        <location filename="../mainwindow.cpp" line="1434"/>
+        <location filename="../mainwindow.cpp" line="1052"/>
+        <location filename="../mainwindow.cpp" line="1059"/>
+        <location filename="../mainwindow.cpp" line="1428"/>
+        <location filename="../mainwindow.cpp" line="1435"/>
         <source>Read Models and Settings From Tx</source>
         <translation>Leggi le impostazioni dalla radio</translation>
     </message>
@@ -1609,12 +1598,12 @@ Scriverlo ugualmente ?</translation>
         <translation>Il firmware richiesto è troppo grande per la radio a causa delle opzioni selezionate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
+        <location filename="../mainwindow.cpp" line="1080"/>
         <source>Write Models and settings from %1 to the Tx?</source>
         <translation>Scrivere le impostazioni sulla radio da %1?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1082"/>
+        <location filename="../mainwindow.cpp" line="1083"/>
         <source>The file %1
 has not been recognized as a valid Models and Settings file
 Write anyway ?</source>
@@ -1623,365 +1612,360 @@ non è stato riconosciuto come un file di impostazioni valido.
 Scriverlo ugualmente ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1108"/>
-        <location filename="../mainwindow.cpp" line="1115"/>
-        <location filename="../mainwindow.cpp" line="1158"/>
-        <location filename="../mainwindow.cpp" line="1165"/>
-        <location filename="../mainwindow.cpp" line="1357"/>
-        <location filename="../mainwindow.cpp" line="1399"/>
+        <location filename="../mainwindow.cpp" line="1109"/>
+        <location filename="../mainwindow.cpp" line="1116"/>
+        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1166"/>
+        <location filename="../mainwindow.cpp" line="1358"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>Backup Models and Settings From Tx</source>
         <translation>Salva impostazioni della radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1131"/>
+        <location filename="../mainwindow.cpp" line="1132"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation>Non posso controllare la compatibilità delle impostazioni! Continuare ugualmente ?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
         <source>The transmitter firmware belongs to another product family, check file and preferences!</source>
         <translation>Il firmware nella radio è di una famiglia differente\n rispetto a quello delle impostazioni che si stanno scrivendo.\n Controllare il documento e le preferenze!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>The transmitter firmware is outdated, please upgrade!</source>
         <translation>Il firmware della radio è obsoleto, pianificate un aggiornamento!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1180"/>
+        <location filename="../mainwindow.cpp" line="1181"/>
         <source>Write Models and Settings To Tx</source>
         <translation>Scrivi le impostazioni nella radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1363"/>
-        <location filename="../mainwindow.cpp" line="1406"/>
+        <location filename="../mainwindow.cpp" line="1364"/>
+        <location filename="../mainwindow.cpp" line="1407"/>
         <source>Write Firmware To Tx</source>
         <translation>Scrivi il fimware sulla radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Cannot convert Models and Settings for use with this firmware, original data will be used</source>
         <translation>Non posso convertire le impostazioni per questo firmware, verranno usate le impostazioni originali</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1375"/>
         <source>Restore Models and Settings To Tx</source>
         <translation>Ripristina le impostazioni sulla Radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Could not restore Models and Settings to TX. The models and settings data file can be found at: %1</source>
         <translation>Non posso ripristinare le impostazioni sulla radio, il file originale può essere trovato in %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Firmware write failed</source>
         <translation>Scrittura del firmware fallita</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Could not write firmware to to transmitter. The models and settings data file can be found at: %1</source>
         <translation>Non posso aggiornare il firmware, le impostazioni originali possono essere trovate nel file %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Cannot backup existing Models and Settings from TX. Firmware write process aborted</source>
         <translation>Non riesco a salvare le impostazioni della radio, l&apos;aggiornamento firmware viene annullato</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1416"/>
+        <location filename="../mainwindow.cpp" line="1417"/>
         <source>Save transmitter Models and Settings to File</source>
         <translation>Salva le impostazioni dalla radio e scrivile in un documento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Impossible to identify the radio on your system, please verify that the eeprom disk is connected.</source>
         <translation>Impossibile identificare la radio sul vostro sistema, verificate che il disco della eeprom sia connesso. </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1444"/>
+        <location filename="../mainwindow.cpp" line="1445"/>
         <source>Read Tx Firmware to File</source>
         <translation>Scrivi il firmware in un documento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1492"/>
+        <location filename="../mainwindow.cpp" line="1493"/>
         <source>Copyright</source>
         <translation>Copyright</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1493"/>
+        <location filename="../mainwindow.cpp" line="1494"/>
         <source>Version %1 (revision %2), %3</source>
         <translation>Versione %1 (revisione %2), %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1494"/>
         <source>The companion9x project was originally forked from eePe</source>
-        <translation>Il progetto companion9x è stato inizialmente derivato da eePe</translation>
+        <translation type="obsolete">Il progetto companion9x è stato inizialmente derivato da eePe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1495"/>
+        <location filename="../mainwindow.cpp" line="1496"/>
         <source>If you&apos;ve found this program useful, please support by</source>
         <translation>Se trovate questo programma utile, supportatelo mediante una </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1497"/>
+        <location filename="../mainwindow.cpp" line="1498"/>
         <source>donating</source>
         <translation>donazione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1499"/>
         <source>About companion9x</source>
-        <translation>Informazioni su companion9x</translation>
+        <translation type="obsolete">Informazioni su companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1563"/>
-        <location filename="../mainwindow.cpp" line="2019"/>
-        <location filename="../mainwindow.cpp" line="2040"/>
+        <location filename="../mainwindow.cpp" line="1564"/>
+        <location filename="../mainwindow.cpp" line="2020"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
         <source>&amp;%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1565"/>
+        <location filename="../mainwindow.cpp" line="1566"/>
         <source>%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
         <source>&amp;New</source>
         <translation>&amp;Nuovo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
         <source>Create a new file</source>
         <translation>Crea un nuovo documento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1598"/>
         <source>&amp;Open...</source>
         <translation>&amp;Apri...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
+        <location filename="../mainwindow.cpp" line="1600"/>
         <source>Open an existing file</source>
         <translation>Apri un documente esistente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>&amp;loadBackup...</source>
         <translation>carica&amp;Backup...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>Load backup from file</source>
         <translation>Carica backup da file</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1607"/>
         <source>&amp;Save</source>
         <translation>&amp;Salva</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1608"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Save the document to disk</source>
         <translation>Salva il documento su disco</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Save &amp;As...</source>
         <translation>S&amp;alva come...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1613"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
         <source>Save the document under a new name</source>
         <translation>Salva il documento con un nuovo nome</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Lo&amp;gs</source>
         <translation>Lo&amp;gs</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Ctrl+G</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Open log file</source>
         <translation>Apri file di log</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
+        <location filename="../mainwindow.cpp" line="1622"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferenze...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
+        <location filename="../mainwindow.cpp" line="1623"/>
         <source>Edit general preferences</source>
         <translation>Modifica preferenze</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>&amp;Check for updates...</source>
         <translation>&amp;Controlla aggiornamenti...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
         <source>Check for new version of companion9x/er9x</source>
-        <translation>Controlla per nuove versioni di companion9x</translation>
+        <translation type="obsolete">Controlla per nuove versioni di companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Contributors &amp;List...</source>
         <translation>E&amp;lenco collaboratori...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Show companion9x contributors list</source>
-        <translation>Mostra l&apos;elenco di quelli che hanno contribuito a companion9x</translation>
+        <translation type="obsolete">Mostra l&apos;elenco di quelli che hanno contribuito a companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>ChangeLog...</source>
         <translation>Cambiamenti...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
         <source>Show companion9x changelog</source>
-        <translation>Mostra l&apos;elenco dei cambiamenti in Companion9x</translation>
+        <translation type="obsolete">Mostra l&apos;elenco dei cambiamenti in Companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Firmware ChangeLog...</source>
         <translation>Cambiamenti del firmware...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Show firmware changelog</source>
         <translation>Mostra l&apos;elenco dei cambiamenti del firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Compare...</source>
         <translation>Confronta...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Compare models</source>
         <translation>Confronta due modelli</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Customize your &amp;TX...</source>
         <translation>Personalizza il &amp;TX...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Customize the splash screen of your TX</source>
         <translation>Personalizza la schermata di avvio della radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1653"/>
         <source>E&amp;xit</source>
         <translation>Es&amp;ci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1655"/>
         <source>Exit the application</source>
         <translation>Esci dall&apos;applicazione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1659"/>
         <source>Cu&amp;t</source>
         <translation>Ta&amp;glia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1661"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Taglia la selezione negli appunti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1667"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Copia la selezione negli appunti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1671"/>
         <source>&amp;Paste</source>
         <translation>&amp;Incolla</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1673"/>
         <source>Paste the clipboard&apos;s contents into the current selection</source>
         <translation>Incolla gli appunti nella selezione corrente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1677"/>
+        <location filename="../mainwindow.cpp" line="1678"/>
         <source>&amp;Write Models and Settings To Tx</source>
         <translation>Scri&amp;vi le impostazioni nella radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1679"/>
+        <location filename="../mainwindow.cpp" line="1680"/>
         <source>Write Models and Settings to transmitter</source>
         <translation>Scrivi le impostazioni nella radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1682"/>
+        <location filename="../mainwindow.cpp" line="1683"/>
         <source>&amp;Read Models and Settings From Tx</source>
         <translation>&amp;Leggi le impostazioni dalla radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1684"/>
+        <location filename="../mainwindow.cpp" line="1685"/>
         <source>Read Models and Settings from transmitter</source>
         <translation>Leggi le impostazioni dalla radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
+        <location filename="../mainwindow.cpp" line="1688"/>
         <source>Write Firmware</source>
         <translation>Scrivi il fimware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1688"/>
+        <location filename="../mainwindow.cpp" line="1689"/>
         <source>Write firmware to transmitter</source>
         <translation>Scrivi il firmware nella radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1691"/>
+        <location filename="../mainwindow.cpp" line="1692"/>
         <source>Write Models and Settings from file to Tx</source>
         <translation>Scrivi le impostazioni nella radio da un documento </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1692"/>
+        <location filename="../mainwindow.cpp" line="1693"/>
         <source>Write Models and Settings from file to transmitter</source>
         <translation>Scrivi le impostazioni nella radio da un documento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1695"/>
+        <location filename="../mainwindow.cpp" line="1696"/>
         <source>Save transmitter Models and Settings to file</source>
         <translation>Salva le impostazioni dalla radio e scrivile in un documento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1696"/>
+        <location filename="../mainwindow.cpp" line="1697"/>
         <source>Save the Models and Settings from the transmitter to a file</source>
         <translation>Leggi le impostazioni dalla radio e scrivile in un file</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1699"/>
+        <location filename="../mainwindow.cpp" line="1700"/>
         <source>Read Firmware</source>
         <translation>Leggi firmware</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1700"/>
+        <location filename="../mainwindow.cpp" line="1701"/>
         <source>Read firmware from transmitter</source>
         <translation>Leggi il firmware dalla radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1704"/>
+        <location filename="../mainwindow.cpp" line="1705"/>
         <source>Configure software for reading from and writing to the transmitter</source>
         <translation>Configura il software per la lettura/scrittura del microprocessore</translation>
     </message>
@@ -1994,23 +1978,23 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Configura il programmatore del microprocessore</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1820"/>
+        <location filename="../mainwindow.cpp" line="1821"/>
         <source>&amp;Read/Write</source>
         <translation>&amp;Leggi/Scrivi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1916"/>
+        <location filename="../mainwindow.cpp" line="1917"/>
         <source>Write</source>
         <translation>Scrivi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
         <source>Invalid Models and Settings File %1</source>
         <translation>File impostazioni non valido %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation>File binario delle impostazioni non valido %1</translation>
     </message>
@@ -2019,7 +2003,7 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">&amp;Scrivi la memoria nella radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1678"/>
+        <location filename="../mainwindow.cpp" line="1679"/>
         <source>Ctrl+Alt+W</source>
         <translation>Ctrl+Alt+W</translation>
     </message>
@@ -2032,7 +2016,7 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">&amp;Leggi la memoria dalla radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1683"/>
+        <location filename="../mainwindow.cpp" line="1684"/>
         <source>Ctrl+Alt+R</source>
         <translation>Ctrl+Alt+R</translation>
     </message>
@@ -2073,7 +2057,7 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Leggi il firmware dalla radio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1703"/>
+        <location filename="../mainwindow.cpp" line="1704"/>
         <source>&amp;Configure...</source>
         <translation>&amp;Configura...</translation>
     </message>
@@ -2082,154 +2066,210 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Configura il programmatore del microprocessore</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1708"/>
+        <location filename="../mainwindow.cpp" line="106"/>
+        <location filename="../mainwindow.cpp" line="722"/>
+        <location filename="../mainwindow.cpp" line="742"/>
+        <source>Companion - Models and Settings Editor - %1 - profile %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="716"/>
+        <location filename="../mainwindow.cpp" line="733"/>
+        <location filename="../mainwindow.cpp" line="744"/>
+        <source>Companion - Models and Settings Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="260"/>
+        <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="281"/>
+        <source>A new release of Companion is available please check the repository</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="359"/>
+        <location filename="../mainwindow.cpp" line="399"/>
+        <source>Compilation server requires registration, please check OpenTX web site</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1495"/>
+        <source>The Companion project was originally forked from eePe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1500"/>
+        <source>About Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Check for new version of Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1631"/>
+        <source>Show Companion contributors list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1635"/>
+        <source>Show Companion changelog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1709"/>
         <source>&amp;List programmers</source>
         <translation>E&amp;lenco programmatori</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1709"/>
+        <location filename="../mainwindow.cpp" line="1710"/>
         <source>List available programmers</source>
         <translation>Lista dei programmatori supportati</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1712"/>
+        <location filename="../mainwindow.cpp" line="1713"/>
         <source>&amp;Fuses...</source>
         <translation>&amp;Fuses...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1713"/>
+        <location filename="../mainwindow.cpp" line="1714"/>
         <source>Show fuses dialog</source>
         <translation>Mostra finestra di dialogo Fuses</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1716"/>
+        <location filename="../mainwindow.cpp" line="1717"/>
         <source>&amp;Simulate</source>
         <translation>Si&amp;mula</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1717"/>
+        <location filename="../mainwindow.cpp" line="1718"/>
         <source>Alt+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1718"/>
+        <location filename="../mainwindow.cpp" line="1719"/>
         <source>Simulate selected model.</source>
         <translation>Simula modello selezionato.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1722"/>
+        <location filename="../mainwindow.cpp" line="1723"/>
         <source>&amp;Print</source>
         <translation>Stam&amp;pa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1723"/>
+        <location filename="../mainwindow.cpp" line="1724"/>
         <source>Ctrl+P</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location filename="../mainwindow.cpp" line="1725"/>
         <source>Print current model.</source>
         <translation>Stampa modello corrente.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1728"/>
+        <location filename="../mainwindow.cpp" line="1729"/>
         <source>Cl&amp;ose</source>
         <translation>C&amp;hiudi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1729"/>
+        <location filename="../mainwindow.cpp" line="1730"/>
         <source>Close the active window</source>
         <translation>Chiudi finestra corrente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1733"/>
+        <location filename="../mainwindow.cpp" line="1734"/>
         <source>Close &amp;All</source>
         <translation>Chiudi &amp;Tutto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1734"/>
+        <location filename="../mainwindow.cpp" line="1735"/>
         <source>Close all the windows</source>
         <translation>Chiudi dutte le finestre</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1738"/>
+        <location filename="../mainwindow.cpp" line="1739"/>
         <source>&amp;Tile</source>
         <translation>Aff&amp;ianca</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1739"/>
+        <location filename="../mainwindow.cpp" line="1740"/>
         <source>Tile the windows</source>
         <translation>Affianca fineste</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1742"/>
+        <location filename="../mainwindow.cpp" line="1743"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Disponi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1743"/>
+        <location filename="../mainwindow.cpp" line="1744"/>
         <source>Cascade the windows</source>
         <translation>Disponi finestre a cascata</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
+        <location filename="../mainwindow.cpp" line="1747"/>
         <source>Ne&amp;xt</source>
         <translation>Successi&amp;va</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1748"/>
+        <location filename="../mainwindow.cpp" line="1749"/>
         <source>Move the focus to the next window</source>
         <translation>Sposta il fuoco sulla finestra seguente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1752"/>
+        <location filename="../mainwindow.cpp" line="1753"/>
         <source>Pre&amp;vious</source>
         <translation>P&amp;recedente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1754"/>
+        <location filename="../mainwindow.cpp" line="1755"/>
         <source>Move the focus to the previous window</source>
         <translation>Sposta il fuoco sulla finestra precedente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1762"/>
+        <location filename="../mainwindow.cpp" line="1763"/>
         <source>&amp;About</source>
         <translation>&amp;Informazioni su</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1763"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
         <source>Show the application&apos;s About box</source>
         <translation>Mostra la finestra Informazioni Su</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1766"/>
+        <location filename="../mainwindow.cpp" line="1767"/>
         <source>Switch layout direction</source>
         <translation>Cambia orientamento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1767"/>
+        <location filename="../mainwindow.cpp" line="1768"/>
         <source>Switch layout Left/Right</source>
         <translation>Cambia orientazione Sinistra/Destra</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1787"/>
-        <location filename="../mainwindow.cpp" line="1881"/>
+        <location filename="../mainwindow.cpp" line="1788"/>
+        <location filename="../mainwindow.cpp" line="1882"/>
         <source>Recent Files</source>
         <translation>Documenti Recenti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1788"/>
-        <location filename="../mainwindow.cpp" line="1891"/>
+        <location filename="../mainwindow.cpp" line="1789"/>
+        <location filename="../mainwindow.cpp" line="1892"/>
         <source>Firmware Profiles</source>
         <translation>Profili personalizzati </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1790"/>
+        <location filename="../mainwindow.cpp" line="1791"/>
         <source>&amp;File</source>
         <translation>&amp;Documento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1815"/>
+        <location filename="../mainwindow.cpp" line="1816"/>
         <source>&amp;Edit</source>
         <translation>&amp;Modifica</translation>
     </message>
@@ -2238,22 +2278,22 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">&amp;Programma</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1838"/>
+        <location filename="../mainwindow.cpp" line="1839"/>
         <source>&amp;Window</source>
         <translation>&amp;Finestra</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1844"/>
+        <location filename="../mainwindow.cpp" line="1845"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1874"/>
+        <location filename="../mainwindow.cpp" line="1875"/>
         <source>File</source>
         <translation>Documento</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1911"/>
+        <location filename="../mainwindow.cpp" line="1912"/>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
@@ -2262,17 +2302,17 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">Scrivi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1928"/>
+        <location filename="../mainwindow.cpp" line="1929"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location filename="../mainwindow.cpp" line="1936"/>
         <source>Ready</source>
         <translation>Pronto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2066"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
         <source>Unable to find file %1!</source>
         <translation>Impossibile trovare il file %1!</translation>
     </message>
@@ -2281,7 +2321,7 @@ Scriverlo ugualmente ?</translation>
         <translation type="obsolete">File impostazioni non valido %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2124"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
         <source>Error reading file %1:
 %2.</source>
         <translation>Error durante la lettura del file %1:
@@ -2304,6 +2344,13 @@ Scriverlo ugualmente ?</translation>
         <source>Do you want to use model wizard? </source>
         <translation>Utilizzare l&apos;assistente di configurazione dei modelli ?</translation>
     </message>
+    <message>
+        <location filename="../mdichild.cpp" line="182"/>
+        <location filename="../mdichild.cpp" line="187"/>
+        <location filename="../mdichild.cpp" line="470"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mdichild.cpp" line="187"/>
         <source>Ask this question again ? </source>
@@ -2466,11 +2513,8 @@ Scriverlo ugualmente ?</translation>
         <translation>File di backup binario non valido %1</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="182"/>
-        <location filename="../mdichild.cpp" line="187"/>
-        <location filename="../mdichild.cpp" line="470"/>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../mdichild.cpp" line="471"/>
@@ -7380,11 +7424,11 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati</translation>
     </message>
     <message>
         <location filename="../warnings.h" line="5"/>
-        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
+        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
 
-We are really sensible to that!
+We are really appreciative for that!
 
-The openTX/C9X Team.</source>
+The OpenTX/Companion Team.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7731,8 +7775,12 @@ utilizzatelo solo se sapete cosa state facendo.  Non viene fatto alcun controllo
     <message>
         <location filename="../burnconfigdialog.cpp" line="328"/>
         <location filename="../burnconfigdialog.cpp" line="397"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="329"/>
@@ -7808,6 +7856,11 @@ m2560 per le schede v4.1</translation>
         <source>Browse for file</source>
         <translation>Apri file</translation>
     </message>
+    <message>
+        <location filename="../burndialog.ui" line="276"/>
+        <source>Allows Companion to write to older version of the firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burndialog.ui" line="289"/>
         <source>Backup and restore Models and Settings</source>
@@ -7855,9 +7908,8 @@ m2560 per le schede v4.1</translation>
         <translation>Variante</translation>
     </message>
     <message>
-        <location filename="../burndialog.ui" line="276"/>
         <source>Allows companion9x to write to older version of the firmware</source>
-        <translation>Abilita companion a scrivere in versioni precedenti o diverse del firmware</translation>
+        <translation type="obsolete">Abilita companion a scrivere in versioni precedenti o diverse del firmware</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="279"/>
@@ -8625,29 +8677,39 @@ m2560 per le schede v4.1</translation>
     <message>
         <location filename="../contributorsdialog.cpp" line="29"/>
         <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
+of course. Also to Erez Raviv (er9x) and the fantastic eePe program 
+which was the staring point for OpenTX Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contributorsdialog.cpp" line="46"/>
+        <source>Companion Release Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
 of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
 companion9x was forked out.</source>
-        <translation>Sentiti ringraziamenti a Rafal Tomczak (RadioClone) e Thomas Husterer (th9x).
+        <translation type="obsolete">Sentiti ringraziamenti a Rafal Tomczak (RadioClone) e Thomas Husterer (th9x).
 Anche a Erez Raviv (er9x) e al fantastico eePe dal quale è stato derivato
 companion9x.  </translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="31"/>
+        <location filename="../contributorsdialog.cpp" line="32"/>
         <source>Thank you all !!!</source>
         <translation>Grazie a tutti !!!</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="34"/>
+        <location filename="../contributorsdialog.cpp" line="35"/>
         <source>Contributors</source>
         <translation>Amici e Programmatori </translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="45"/>
         <source>Companion9x Release Notes</source>
-        <translation>informazioni su aggiornamenti Companion9x</translation>
+        <translation type="obsolete">informazioni su aggiornamenti Companion9x</translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="50"/>
+        <location filename="../contributorsdialog.cpp" line="51"/>
         <source>OpenTX Release Notes</source>
         <translation>informazioni su aggiornamenti OpenTX</translation>
     </message>
@@ -8796,8 +8858,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="54"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="55"/>
@@ -9165,9 +9231,13 @@ Premere annulla per cancellare l&apos;operazione</translation>
 <context>
     <name>logsDialog</name>
     <message>
-        <location filename="../logsdialog.ui" line="14"/>
         <source>Companion9x log viewer</source>
-        <translation>Visualizzatore di file di log di Companion9x</translation>
+        <translation type="obsolete">Visualizzatore di file di log di Companion9x</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.ui" line="14"/>
+        <source>Companion Log Viewer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../logsdialog.ui" line="29"/>
@@ -9180,47 +9250,59 @@ Premere annulla per cancellare l&apos;operazione</translation>
         <translation>Apri file di log</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="131"/>
+        <location filename="../logsdialog.ui" line="94"/>
         <source>Zoom</source>
         <translation>Ingrandimento</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="138"/>
+        <location filename="../logsdialog.ui" line="101"/>
         <source>X</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="145"/>
+        <location filename="../logsdialog.ui" line="108"/>
         <source>Y</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="169"/>
+        <location filename="../logsdialog.ui" line="132"/>
         <source>Fly sessions</source>
         <translation>Sessioni di volo</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="22"/>
+        <location filename="../logsdialog.cpp" line="27"/>
         <source>Telemetry logs</source>
         <translation>Log telemetrici</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="23"/>
+        <location filename="../logsdialog.cpp" line="28"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="395"/>
+        <location filename="../logsdialog.cpp" line="252"/>
+        <source>Error</source>
+        <translation type="unfinished">Errore</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="253"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation type="unfinished">Non posso scrivere il file %1:
+%2.</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="582"/>
         <source>Select your log file</source>
         <translation>Selezionare il file di log</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="406"/>
+        <location filename="../logsdialog.cpp" line="593"/>
         <source>Available fields</source>
         <translation>Campi disponibili</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="501"/>
+        <location filename="../logsdialog.cpp" line="690"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation>Il file di log selezionato contiene %1 righe errate su un totale di %2 righe</translation>
     </message>
@@ -9678,27 +9760,27 @@ Premere annulla per cancellare l&apos;operazione</translation>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="506"/>
+        <location filename="../preferencesdialog.ui" line="650"/>
         <source>Language (requires restart)</source>
         <translation>Lingua (richiede il riavvio)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="964"/>
+        <location filename="../preferencesdialog.ui" line="995"/>
         <source>Firmware</source>
         <translation>Firmware</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="70"/>
+        <location filename="../preferencesdialog.ui" line="83"/>
         <source>Check for updates on startup</source>
         <translation>Controllo aggiornamenti all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="353"/>
+        <location filename="../preferencesdialog.ui" line="497"/>
         <source>FwInfo</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="273"/>
+        <location filename="../preferencesdialog.ui" line="51"/>
         <source>Show Splash Screen</source>
         <translation>Mostra schermata iniziale</translation>
     </message>
@@ -9708,18 +9790,18 @@ Premere annulla per cancellare l&apos;operazione</translation>
         <translation>File recenti</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="883"/>
-        <location filename="../preferencesdialog.ui" line="924"/>
+        <location filename="../preferencesdialog.ui" line="914"/>
+        <location filename="../preferencesdialog.ui" line="955"/>
         <source>Download</source>
         <translation>Scarica</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="676"/>
+        <location filename="../preferencesdialog.ui" line="707"/>
         <source>Default Channel Order</source>
         <translation>Ordine canali predefinito</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="525"/>
+        <location filename="../preferencesdialog.ui" line="292"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
@@ -9728,12 +9810,12 @@ This is used by the templated to determine which channel goes to what number out
 Utilizzato dai Modelli per stabilire quale uscita viene assegnata ai canali.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="663"/>
+        <location filename="../preferencesdialog.ui" line="694"/>
         <source>Default Stick Mode</source>
         <translation>Modalità Stick</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="686"/>
+        <location filename="../preferencesdialog.ui" line="717"/>
         <source>Mode selection:
 
 Mode 1:
@@ -9774,63 +9856,63 @@ Mode 4:
 </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="148"/>
-        <location filename="../preferencesdialog.ui" line="215"/>
+        <location filename="../preferencesdialog.ui" line="161"/>
+        <location filename="../preferencesdialog.ui" line="228"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="295"/>
+        <location filename="../preferencesdialog.ui" line="439"/>
         <source>Enable</source>
         <translation>Abilita</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="312"/>
+        <location filename="../preferencesdialog.ui" line="456"/>
         <source>Calibrate</source>
         <translation>Calibrazione</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="326"/>
-        <location filename="../preferencesdialog.ui" line="806"/>
-        <location filename="../preferencesdialog.ui" line="941"/>
-        <location filename="../preferencesdialog.ui" line="1008"/>
+        <location filename="../preferencesdialog.ui" line="470"/>
+        <location filename="../preferencesdialog.ui" line="662"/>
+        <location filename="../preferencesdialog.ui" line="837"/>
+        <location filename="../preferencesdialog.ui" line="972"/>
         <source>Open Folder</source>
         <translation>Apri Cartella</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="790"/>
+        <location filename="../preferencesdialog.ui" line="821"/>
         <source>Automatic Backup Folder</source>
         <translation>Cartella per backup</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="890"/>
+        <location filename="../preferencesdialog.ui" line="921"/>
         <source>Set language of voice.
 May be different from firmware language</source>
         <translation>Impostazione del linguaggio della voce.
 Può essere differente dalla lingua del firmware</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="870"/>
+        <location filename="../preferencesdialog.ui" line="901"/>
         <source>Voice</source>
         <translation>Voce</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="433"/>
+        <location filename="../preferencesdialog.ui" line="577"/>
         <source>Ask for flashing after Download</source>
         <translation>Scrivere dopo aggiornamento </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="454"/>
+        <location filename="../preferencesdialog.ui" line="598"/>
         <source>Export Profile</source>
         <translation>Esporta Profilo</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="478"/>
+        <location filename="../preferencesdialog.ui" line="622"/>
         <source>Import Profile</source>
         <translation>Importa Profilo</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="286"/>
+        <location filename="../preferencesdialog.ui" line="430"/>
         <source>Custom TX splash screen</source>
         <translation>Schermo personalizzato</translation>
     </message>
@@ -9839,32 +9921,32 @@ Può essere differente dalla lingua del firmware</translation>
         <translation type="obsolete">Cartella per backup</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="813"/>
+        <location filename="../preferencesdialog.ui" line="844"/>
         <source>auto backup before write</source>
         <translation>Esegui backup prima di ogni scrittura</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="846"/>
+        <location filename="../preferencesdialog.ui" line="877"/>
         <source>Automatically add version number to the filename after download</source>
         <translation>Aggiungi automaticamente il numero di versione al nome del file dopo il download</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="977"/>
+        <location filename="../preferencesdialog.ui" line="1008"/>
         <source>SD Structure path</source>
         <translation>Cartella Struttura Scheda SD </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="987"/>
+        <location filename="../preferencesdialog.ui" line="1018"/>
         <source>Processor ID</source>
         <translation>ID del processore</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="996"/>
+        <location filename="../preferencesdialog.ui" line="1027"/>
         <source>Simulator capture folder</source>
         <translation>Cartella per cattura schermate </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="1025"/>
+        <location filename="../preferencesdialog.ui" line="679"/>
         <source>Use clipboard only</source>
         <translation>Usa solo gli appunti</translation>
     </message>
@@ -9915,173 +9997,196 @@ Può essere differente dalla lingua del firmware</translation>
         <translation>CheckBox</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="360"/>
+        <location filename="../preferencesdialog.ui" line="504"/>
         <source>Check for updates</source>
         <translation>Verifica aggiornamenti</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="80"/>
+        <location filename="../preferencesdialog.ui" line="93"/>
         <source>Check for selected Fw updates</source>
         <translation>Controlla aggiornamenti Fw</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="92"/>
+        <location filename="../preferencesdialog.ui" line="105"/>
         <source>Ask use of wizard for new models</source>
         <translation>Chiedi l&apos;utilizzo dell&apos;assistente per i nuovi modelli</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="164"/>
+        <location filename="../preferencesdialog.ui" line="177"/>
         <source>Remember switches in simulator</source>
         <translation>Ricorda la posizione degli switches nel simulatore</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="711"/>
+        <location filename="../preferencesdialog.ui" line="742"/>
         <source>Mode 1 (RUD ELE THR AIL)</source>
         <translation>Modo 1 (DIR ELE MOT ALE)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="716"/>
+        <location filename="../preferencesdialog.ui" line="747"/>
         <source>Mode 2 (RUD THR ELE AIL)</source>
         <translation>Modo 2 (DIR MOTO ELE ALE)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="721"/>
+        <location filename="../preferencesdialog.ui" line="752"/>
         <source>Mode 3 (AIL ELE THR RUD)</source>
         <translation>Modo 3 (ALE ELE MOT DIR)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="726"/>
+        <location filename="../preferencesdialog.ui" line="757"/>
         <source>Mode 4 (AIL THR ELE RUD)</source>
         <translation>Modo 4 (ALE MOT ELE DIR)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="783"/>
+        <location filename="../preferencesdialog.ui" line="814"/>
         <source>Profile slot</source>
         <translation>Profilo personalizzato</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="488"/>
+        <location filename="../preferencesdialog.ui" line="1616"/>
+        <source>Find Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="1625"/>
+        <source>Google Earth Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="632"/>
         <source>Profile Name</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="461"/>
+        <location filename="../preferencesdialog.ui" line="605"/>
         <source>Save Profile</source>
         <translation>Salva Profilo</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="172"/>
+        <location filename="../preferencesdialog.ui" line="185"/>
         <source>Blue</source>
         <translation>Blu</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="908"/>
+        <location filename="../preferencesdialog.ui" line="939"/>
         <source>Language</source>
         <translation>Lingua</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="177"/>
+        <location filename="../preferencesdialog.ui" line="190"/>
         <source>Green</source>
         <translation>Verde</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="182"/>
+        <location filename="../preferencesdialog.ui" line="195"/>
         <source>Red</source>
         <translation>Rosso</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="187"/>
+        <location filename="../preferencesdialog.ui" line="200"/>
         <source>Orange</source>
         <translation>Arancione</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="192"/>
+        <location filename="../preferencesdialog.ui" line="205"/>
         <source>Yellow</source>
         <translation>Giallo</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="375"/>
+        <location filename="../preferencesdialog.ui" line="519"/>
         <source>Personal splash library</source>
         <translation>Libreria sfondi personale</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="773"/>
+        <location filename="../preferencesdialog.ui" line="804"/>
         <source>Splash library behaviour</source>
         <translation>Caratteristiche libreria sfondi</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="754"/>
+        <location filename="../preferencesdialog.ui" line="785"/>
         <source>Include companion splashes</source>
         <translation>Includi sfondi predefiniti</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="759"/>
+        <location filename="../preferencesdialog.ui" line="790"/>
         <source>Only user defined splashes</source>
         <translation>Solamente sfondi utente</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="740"/>
+        <location filename="../preferencesdialog.ui" line="771"/>
         <source>Joystick</source>
         <translation>Joystick</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="232"/>
+        <location filename="../preferencesdialog.ui" line="245"/>
         <source>Open Image</source>
         <translation>Apri immagine</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="141"/>
+        <location filename="../preferencesdialog.ui" line="154"/>
         <source>Invert Pixels</source>
         <translation>Negativo</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="58"/>
+        <location filename="../preferencesdialog.ui" line="71"/>
         <source>Simu BackLight</source>
         <translation>Colore Retroilluminazione</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="227"/>
+        <location filename="../preferencesdialog.cpp" line="233"/>
         <source>Last downloaded release: %1</source>
         <translation>Ultima versione scaricata: %1 </translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="236"/>
         <source>The selected firmware has never been downloaded by companion9x.</source>
-        <translation>Il firmware selezionato non è mai stato scaricato da companion9x.</translation>
+        <translation type="obsolete">Il firmware selezionato non è mai stato scaricato da companion9x.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="240"/>
         <source>The selected firmware cannot be downloaded by companion9x.</source>
-        <translation>Il firmware selezionato non può essere scaricato da companion9x.</translation>
+        <translation type="obsolete">Il firmware selezionato non può essere scaricato da companion9x.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="447"/>
+        <location filename="../preferencesdialog.cpp" line="461"/>
         <source>Image stored in settings</source>
         <translation>Immagine predefinita</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="458"/>
-        <location filename="../preferencesdialog.cpp" line="780"/>
+        <location filename="../preferencesdialog.cpp" line="472"/>
+        <location filename="../preferencesdialog.cpp" line="804"/>
         <source>No joysticks found</source>
         <translation>Nessun joystick trovato</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="569"/>
+        <location filename="../preferencesdialog.cpp" line="583"/>
         <source>Select your Models and Settings backup folder</source>
         <translation>Selezionare la cartella per i backup</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="641"/>
+        <location filename="../preferencesdialog.cpp" line="594"/>
+        <source>Select Google Earth executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="664"/>
         <source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
         <translation>La descrizione del profilo è vuota. Il profilo %1 sarà cancellato.&lt;br&gt;Siete sicuri ?</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="532"/>
+        <location filename="../preferencesdialog.cpp" line="546"/>
         <source>Select your library folder</source>
         <translation>Selezionare la cartella degli sfondi</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="542"/>
+        <location filename="../preferencesdialog.cpp" line="242"/>
+        <source>The selected firmware has never been downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="246"/>
+        <source>The selected firmware cannot be downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="556"/>
         <source>Select your snapshot folder</source>
         <translation>Selezionare la cartella per le schermate del simulatore</translation>
     </message>
@@ -10090,44 +10195,44 @@ Può essere differente dalla lingua del firmware</translation>
         <translation type="obsolete">Selezionare la cartella per i backup</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="597"/>
+        <location filename="../preferencesdialog.cpp" line="620"/>
         <source>Select the folder replicating your SD structure</source>
         <translation>Selezionare la cartella contenente la struttura della scheda SD</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="677"/>
+        <location filename="../preferencesdialog.cpp" line="701"/>
         <source>Export profile As</source>
         <translation>Esporta il profilo come</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="699"/>
+        <location filename="../preferencesdialog.cpp" line="723"/>
         <source>Profile slot is not empty, profile slot %1 will we overwritten.&lt;br&gt;Are you sure ?</source>
         <translation>La descrizione del profilo è vuota. Il profilo %1 sarà sovrascritto.&lt;br&gt;Siete sicuri ?</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="705"/>
+        <location filename="../preferencesdialog.cpp" line="729"/>
         <source>Open Profile to import</source>
         <translation>Apri il profile da importare</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Open Image to load</source>
         <translation>Apri l&apos;immagine da caricare</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Images (%1)</source>
         <translation>Immagini (%1)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Cannot load %1.</source>
         <translation>Non posso caricare %1.</translation>
     </message>
@@ -10633,9 +10738,8 @@ Può essere differente dalla lingua del firmware</translation>
 <context>
     <name>simulatorDialog</name>
     <message>
-        <location filename="../simulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../simulatordialog.ui" line="844"/>
@@ -10657,6 +10761,11 @@ Può essere differente dalla lingua del firmware</translation>
         <source>THR</source>
         <translation>THR</translation>
     </message>
+    <message>
+        <location filename="../simulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../simulatordialog.ui" line="80"/>
         <location filename="../simulatordialog.ui" line="396"/>
@@ -10750,157 +10859,157 @@ Può essere differente dalla lingua del firmware</translation>
         <translation>Simulatore 9x</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1239"/>
+        <location filename="../simulatordialog.ui" line="1240"/>
         <source>Outputs</source>
         <translation>Uscite</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1265"/>
+        <location filename="../simulatordialog.ui" line="1266"/>
         <source>CS1</source>
         <translation>CS1</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1296"/>
+        <location filename="../simulatordialog.ui" line="1297"/>
         <source>CS2</source>
         <translation>CS2</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1327"/>
+        <location filename="../simulatordialog.ui" line="1328"/>
         <source>CS3</source>
         <translation>CS3</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1358"/>
+        <location filename="../simulatordialog.ui" line="1359"/>
         <source>CS4</source>
         <translation>CS4</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1389"/>
+        <location filename="../simulatordialog.ui" line="1390"/>
         <source>CS5</source>
         <translation>CS5</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1420"/>
+        <location filename="../simulatordialog.ui" line="1421"/>
         <source>CS6</source>
         <translation>CS6</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1451"/>
+        <location filename="../simulatordialog.ui" line="1452"/>
         <source>CS7</source>
         <translation>CS7</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1482"/>
+        <location filename="../simulatordialog.ui" line="1483"/>
         <source>CS8</source>
         <translation>CS8</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1513"/>
+        <location filename="../simulatordialog.ui" line="1514"/>
         <source>CS9</source>
         <translation>CS9</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1544"/>
+        <location filename="../simulatordialog.ui" line="1545"/>
         <source>CSA</source>
         <translation>CSA</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1575"/>
+        <location filename="../simulatordialog.ui" line="1576"/>
         <source>CSB</source>
         <translation>CSB</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1606"/>
+        <location filename="../simulatordialog.ui" line="1607"/>
         <source>CSC</source>
         <translation>CSC</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1637"/>
+        <location filename="../simulatordialog.ui" line="1638"/>
         <source>CSD</source>
         <translation>CSD</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1668"/>
+        <location filename="../simulatordialog.ui" line="1669"/>
         <source>CSE</source>
         <translation>CSE</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1699"/>
+        <location filename="../simulatordialog.ui" line="1700"/>
         <source>CSF</source>
         <translation>CSF</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1730"/>
+        <location filename="../simulatordialog.ui" line="1731"/>
         <source>CSG</source>
         <translation>CSG</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1761"/>
+        <location filename="../simulatordialog.ui" line="1762"/>
         <source>CSH</source>
         <translation>CSH</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1792"/>
+        <location filename="../simulatordialog.ui" line="1793"/>
         <source>CSI</source>
         <translation>CSI</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1823"/>
+        <location filename="../simulatordialog.ui" line="1825"/>
         <source>CSJ</source>
         <translation>CSJ</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1885"/>
+        <location filename="../simulatordialog.ui" line="1887"/>
         <source>CSL</source>
         <translation>CSL</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1916"/>
+        <location filename="../simulatordialog.ui" line="1918"/>
         <source>CSM</source>
         <translation>CSM</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1947"/>
+        <location filename="../simulatordialog.ui" line="1949"/>
         <source>CSN</source>
         <translation>CSN</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1978"/>
+        <location filename="../simulatordialog.ui" line="1980"/>
         <source>CSO</source>
         <translation>CSO</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2009"/>
+        <location filename="../simulatordialog.ui" line="2011"/>
         <source>CSP</source>
         <translation>CSP</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2040"/>
+        <location filename="../simulatordialog.ui" line="2042"/>
         <source>CSQ</source>
         <translation>CSQ</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2071"/>
+        <location filename="../simulatordialog.ui" line="2073"/>
         <source>CSR</source>
         <translation>CSR</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2102"/>
+        <location filename="../simulatordialog.ui" line="2104"/>
         <source>CSS</source>
         <translation>CSS</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2133"/>
+        <location filename="../simulatordialog.ui" line="2135"/>
         <source>CST</source>
         <translation>CST</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2164"/>
+        <location filename="../simulatordialog.ui" line="2166"/>
         <source>CSU</source>
         <translation>CSU</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2195"/>
+        <location filename="../simulatordialog.ui" line="2197"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
@@ -10910,114 +11019,114 @@ Può essere differente dalla lingua del firmware</translation>
         <translation>SUONO</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1854"/>
+        <location filename="../simulatordialog.ui" line="1856"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation>CSK</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2226"/>
+        <location filename="../simulatordialog.ui" line="2228"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation>CSW</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2307"/>
+        <location filename="../simulatordialog.ui" line="2310"/>
         <source>CH1</source>
         <translation>CH1</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2419"/>
+        <location filename="../simulatordialog.ui" line="2422"/>
         <source>CH9</source>
         <translation>CH9</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2432"/>
+        <location filename="../simulatordialog.ui" line="2435"/>
         <source>CH2</source>
         <translation>CH2</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2599"/>
+        <location filename="../simulatordialog.ui" line="2602"/>
         <source>CH10</source>
         <translation>CH10</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2612"/>
+        <location filename="../simulatordialog.ui" line="2615"/>
         <source>CH3</source>
         <translation>CH3</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2779"/>
+        <location filename="../simulatordialog.ui" line="2782"/>
         <source>CH11</source>
         <translation>CH11</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2792"/>
+        <location filename="../simulatordialog.ui" line="2795"/>
         <source>CH4</source>
         <translation>CH4</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2959"/>
+        <location filename="../simulatordialog.ui" line="2962"/>
         <source>CH12</source>
         <translation>CH12</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2972"/>
+        <location filename="../simulatordialog.ui" line="2975"/>
         <source>CH5</source>
         <translation>CH5</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3133"/>
+        <location filename="../simulatordialog.ui" line="3136"/>
         <source>CH13</source>
         <translation>CH13</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3146"/>
+        <location filename="../simulatordialog.ui" line="3149"/>
         <source>CH6</source>
         <translation>CH6</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3258"/>
+        <location filename="../simulatordialog.ui" line="3261"/>
         <source>CH14</source>
         <translation>CH14</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3271"/>
+        <location filename="../simulatordialog.ui" line="3274"/>
         <source>CH7</source>
         <translation>CH7</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3438"/>
+        <location filename="../simulatordialog.ui" line="3441"/>
         <source>CH15</source>
         <translation>CH15</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3451"/>
+        <location filename="../simulatordialog.ui" line="3454"/>
         <source>CH8</source>
         <translation>CH8</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3618"/>
+        <location filename="../simulatordialog.ui" line="3621"/>
         <source>CH16</source>
         <translation>CH16</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2326"/>
-        <location filename="../simulatordialog.ui" line="2348"/>
-        <location filename="../simulatordialog.ui" line="2506"/>
-        <location filename="../simulatordialog.ui" line="2528"/>
-        <location filename="../simulatordialog.ui" line="2686"/>
-        <location filename="../simulatordialog.ui" line="2708"/>
-        <location filename="../simulatordialog.ui" line="2866"/>
-        <location filename="../simulatordialog.ui" line="2888"/>
-        <location filename="../simulatordialog.ui" line="3040"/>
-        <location filename="../simulatordialog.ui" line="3062"/>
-        <location filename="../simulatordialog.ui" line="3165"/>
-        <location filename="../simulatordialog.ui" line="3187"/>
-        <location filename="../simulatordialog.ui" line="3345"/>
-        <location filename="../simulatordialog.ui" line="3367"/>
-        <location filename="../simulatordialog.ui" line="3525"/>
-        <location filename="../simulatordialog.ui" line="3547"/>
+        <location filename="../simulatordialog.ui" line="2329"/>
+        <location filename="../simulatordialog.ui" line="2351"/>
+        <location filename="../simulatordialog.ui" line="2509"/>
+        <location filename="../simulatordialog.ui" line="2531"/>
+        <location filename="../simulatordialog.ui" line="2689"/>
+        <location filename="../simulatordialog.ui" line="2711"/>
+        <location filename="../simulatordialog.ui" line="2869"/>
+        <location filename="../simulatordialog.ui" line="2891"/>
+        <location filename="../simulatordialog.ui" line="3043"/>
+        <location filename="../simulatordialog.ui" line="3065"/>
+        <location filename="../simulatordialog.ui" line="3168"/>
+        <location filename="../simulatordialog.ui" line="3190"/>
+        <location filename="../simulatordialog.ui" line="3348"/>
+        <location filename="../simulatordialog.ui" line="3370"/>
+        <location filename="../simulatordialog.ui" line="3528"/>
+        <location filename="../simulatordialog.ui" line="3550"/>
         <source>-100.1</source>
         <translation>-100.1</translation>
     </message>
@@ -11095,9 +11204,8 @@ Può essere differente dalla lingua del firmware</translation>
 <context>
     <name>xsimulatorDialog</name>
     <message>
-        <location filename="../xsimulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1089"/>
@@ -11223,13 +11331,13 @@ Può essere differente dalla lingua del firmware</translation>
         <translation>Uscite</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2896"/>
+        <location filename="../xsimulatordialog.ui" line="2897"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation>CSK</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3857"/>
+        <location filename="../xsimulatordialog.ui" line="3858"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation>CSW</translation>
@@ -11239,6 +11347,11 @@ Può essere differente dalla lingua del firmware</translation>
         <source>CH1</source>
         <translation>CH1</translation>
     </message>
+    <message>
+        <location filename="../xsimulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1570"/>
         <location filename="../xsimulatordialog.ui" line="1592"/>
@@ -11246,16 +11359,16 @@ Può essere differente dalla lingua del firmware</translation>
         <location filename="../xsimulatordialog.ui" line="1772"/>
         <location filename="../xsimulatordialog.ui" line="1930"/>
         <location filename="../xsimulatordialog.ui" line="1952"/>
-        <location filename="../xsimulatordialog.ui" line="2110"/>
-        <location filename="../xsimulatordialog.ui" line="2132"/>
-        <location filename="../xsimulatordialog.ui" line="2284"/>
-        <location filename="../xsimulatordialog.ui" line="2306"/>
-        <location filename="../xsimulatordialog.ui" line="2409"/>
-        <location filename="../xsimulatordialog.ui" line="2431"/>
-        <location filename="../xsimulatordialog.ui" line="2589"/>
-        <location filename="../xsimulatordialog.ui" line="2611"/>
-        <location filename="../xsimulatordialog.ui" line="2769"/>
-        <location filename="../xsimulatordialog.ui" line="2791"/>
+        <location filename="../xsimulatordialog.ui" line="2111"/>
+        <location filename="../xsimulatordialog.ui" line="2133"/>
+        <location filename="../xsimulatordialog.ui" line="2285"/>
+        <location filename="../xsimulatordialog.ui" line="2307"/>
+        <location filename="../xsimulatordialog.ui" line="2410"/>
+        <location filename="../xsimulatordialog.ui" line="2432"/>
+        <location filename="../xsimulatordialog.ui" line="2590"/>
+        <location filename="../xsimulatordialog.ui" line="2612"/>
+        <location filename="../xsimulatordialog.ui" line="2770"/>
+        <location filename="../xsimulatordialog.ui" line="2792"/>
         <source>-100.1</source>
         <translation>-100.1</translation>
     </message>
@@ -11290,197 +11403,197 @@ Può essere differente dalla lingua del firmware</translation>
         <translation>CH4</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2203"/>
+        <location filename="../xsimulatordialog.ui" line="2204"/>
         <source>CH12</source>
         <translation>CH12</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2216"/>
+        <location filename="../xsimulatordialog.ui" line="2217"/>
         <source>CH5</source>
         <translation>CH5</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2377"/>
+        <location filename="../xsimulatordialog.ui" line="2378"/>
         <source>CH13</source>
         <translation>CH13</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2390"/>
+        <location filename="../xsimulatordialog.ui" line="2391"/>
         <source>CH6</source>
         <translation>CH6</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2502"/>
+        <location filename="../xsimulatordialog.ui" line="2503"/>
         <source>CH14</source>
         <translation>CH14</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2515"/>
+        <location filename="../xsimulatordialog.ui" line="2516"/>
         <source>CH7</source>
         <translation>CH7</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2682"/>
+        <location filename="../xsimulatordialog.ui" line="2683"/>
         <source>CH15</source>
         <translation>CH15</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2695"/>
+        <location filename="../xsimulatordialog.ui" line="2696"/>
         <source>CH8</source>
         <translation>CH8</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2862"/>
+        <location filename="../xsimulatordialog.ui" line="2863"/>
         <source>CH16</source>
         <translation>CH16</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2927"/>
+        <location filename="../xsimulatordialog.ui" line="2928"/>
         <source>CSC</source>
         <translation>CSC</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2958"/>
+        <location filename="../xsimulatordialog.ui" line="2959"/>
         <source>CSD</source>
         <translation>CSD</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2989"/>
+        <location filename="../xsimulatordialog.ui" line="2990"/>
         <source>CS7</source>
         <translation>CS7</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3020"/>
+        <location filename="../xsimulatordialog.ui" line="3021"/>
         <source>CSL</source>
         <translation>CSL</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3051"/>
+        <location filename="../xsimulatordialog.ui" line="3052"/>
         <source>CSB</source>
         <translation>CSB</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3082"/>
+        <location filename="../xsimulatordialog.ui" line="3083"/>
         <source>CS1</source>
         <translation>CS1</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3113"/>
+        <location filename="../xsimulatordialog.ui" line="3114"/>
         <source>CSH</source>
         <translation>CSH</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3144"/>
+        <location filename="../xsimulatordialog.ui" line="3145"/>
         <source>CSG</source>
         <translation>CSG</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3175"/>
+        <location filename="../xsimulatordialog.ui" line="3176"/>
         <source>CSE</source>
         <translation>CSE</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3206"/>
+        <location filename="../xsimulatordialog.ui" line="3207"/>
         <source>CSF</source>
         <translation>CSF</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3237"/>
+        <location filename="../xsimulatordialog.ui" line="3238"/>
         <source>CS8</source>
         <translation>CS8</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3268"/>
+        <location filename="../xsimulatordialog.ui" line="3269"/>
         <source>CS9</source>
         <translation>CS9</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3299"/>
+        <location filename="../xsimulatordialog.ui" line="3300"/>
         <source>CSA</source>
         <translation>CSA</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3330"/>
+        <location filename="../xsimulatordialog.ui" line="3331"/>
         <source>CSM</source>
         <translation>CSM</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3361"/>
+        <location filename="../xsimulatordialog.ui" line="3362"/>
         <source>CSJ</source>
         <translation>CSJ</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3392"/>
+        <location filename="../xsimulatordialog.ui" line="3393"/>
         <source>CSI</source>
         <translation>CSI</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3423"/>
+        <location filename="../xsimulatordialog.ui" line="3424"/>
         <source>CS4</source>
         <translation>CS4</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3454"/>
+        <location filename="../xsimulatordialog.ui" line="3455"/>
         <source>CS5</source>
         <translation>CS5</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3485"/>
+        <location filename="../xsimulatordialog.ui" line="3486"/>
         <source>CS2</source>
         <translation>CS2</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3516"/>
+        <location filename="../xsimulatordialog.ui" line="3517"/>
         <source>CS3</source>
         <translation>CS3</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3547"/>
+        <location filename="../xsimulatordialog.ui" line="3548"/>
         <source>CS6</source>
         <translation>CS6</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3578"/>
+        <location filename="../xsimulatordialog.ui" line="3579"/>
         <source>CSN</source>
         <translation>CSN</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3609"/>
+        <location filename="../xsimulatordialog.ui" line="3610"/>
         <source>CSO</source>
         <translation>CSO</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3640"/>
+        <location filename="../xsimulatordialog.ui" line="3641"/>
         <source>CSP</source>
         <translation>CSP</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3671"/>
+        <location filename="../xsimulatordialog.ui" line="3672"/>
         <source>CSQ</source>
         <translation>CSQ</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3702"/>
+        <location filename="../xsimulatordialog.ui" line="3703"/>
         <source>CSR</source>
         <translation>CSR</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3733"/>
+        <location filename="../xsimulatordialog.ui" line="3734"/>
         <source>CSS</source>
         <translation>CSS</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3764"/>
+        <location filename="../xsimulatordialog.ui" line="3765"/>
         <source>CST</source>
         <translation>CST</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3795"/>
+        <location filename="../xsimulatordialog.ui" line="3796"/>
         <source>CSU</source>
         <translation>CSU</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3826"/>
+        <location filename="../xsimulatordialog.ui" line="3827"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
diff --git a/companion/src/translations/companion9x_pt.ts b/companion/src/translations/companion_pt.ts
similarity index 94%
rename from companion/src/translations/companion9x_pt.ts
rename to companion/src/translations/companion_pt.ts
index de3d9bf28..97da176bb 100644
--- a/companion/src/translations/companion9x_pt.ts
+++ b/companion/src/translations/companion_pt.ts
@@ -1233,9 +1233,9 @@ Are you sure ?</source>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="147"/>
-        <location filename="../mainwindow.cpp" line="635"/>
-        <location filename="../mainwindow.cpp" line="669"/>
-        <location filename="../mainwindow.cpp" line="2161"/>
+        <location filename="../mainwindow.cpp" line="636"/>
+        <location filename="../mainwindow.cpp" line="670"/>
+        <location filename="../mainwindow.cpp" line="2162"/>
         <source>File loaded</source>
         <translation>Ficheiro carregado</translation>
     </message>
@@ -1247,8 +1247,8 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="268"/>
         <location filename="../mainwindow.cpp" line="270"/>
         <location filename="../mainwindow.cpp" line="310"/>
-        <location filename="../mainwindow.cpp" line="570"/>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="571"/>
+        <location filename="../mainwindow.cpp" line="573"/>
         <source>Save As</source>
         <translation type="unfinished">Gravar Como</translation>
     </message>
@@ -1258,7 +1258,7 @@ Are you sure ?</source>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="285"/>
-        <location filename="../mainwindow.cpp" line="543"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>No updates available at this time.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1266,8 +1266,8 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="246"/>
         <location filename="../mainwindow.cpp" line="289"/>
         <location filename="../mainwindow.cpp" line="467"/>
-        <location filename="../mainwindow.cpp" line="589"/>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="590"/>
+        <location filename="../mainwindow.cpp" line="594"/>
         <source>Unable to check for updates.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1286,13 +1286,13 @@ Are you sure ?</source>
         <translation type="obsolete">Ficheiros EEPROM (*.bin *.hex);;BIN files (*.bin);;HEX files (*.hex) </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="623"/>
+        <location filename="../mainwindow.cpp" line="624"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="644"/>
-        <location filename="../mainwindow.cpp" line="650"/>
+        <location filename="../mainwindow.cpp" line="645"/>
+        <location filename="../mainwindow.cpp" line="651"/>
         <source>File saved</source>
         <translation>Ficheiro gravado</translation>
     </message>
@@ -1313,15 +1313,10 @@ Are you sure ?</source>
         <translation type="obsolete">Ficheiros HEX (*.hex);;BIN files (*.bin);;FLASH files (*.bin *.hex) </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1492"/>
+        <location filename="../mainwindow.cpp" line="1493"/>
         <source>Copyright</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="260"/>
-        <source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="170"/>
         <source>Display previous warning again at startup ?</source>
@@ -1332,34 +1327,29 @@ Are you sure ?</source>
         <source>New release available</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="281"/>
-        <source>A new release of companion is available please check the repository</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="337"/>
         <location filename="../mainwindow.cpp" line="366"/>
         <location filename="../mainwindow.cpp" line="377"/>
         <location filename="../mainwindow.cpp" line="406"/>
-        <location filename="../mainwindow.cpp" line="901"/>
-        <location filename="../mainwindow.cpp" line="2066"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
-        <location filename="../mainwindow.cpp" line="2124"/>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Error</source>
         <translation type="unfinished">Erro</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="338"/>
         <location filename="../mainwindow.cpp" line="378"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
         <source>Error opening file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -1374,6 +1364,21 @@ Are you sure ?</source>
         <source>Display previous message again at startup ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="106"/>
+        <location filename="../mainwindow.cpp" line="722"/>
+        <location filename="../mainwindow.cpp" line="742"/>
+        <source>Companion - Models and Settings Editor - %1 - profile %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="716"/>
+        <location filename="../mainwindow.cpp" line="733"/>
+        <location filename="../mainwindow.cpp" line="744"/>
+        <source>Companion - Models and Settings Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="350"/>
         <source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
@@ -1390,12 +1395,6 @@ Are you sure ?</source>
         <source>Compilation server too busy, try later</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="359"/>
-        <location filename="../mainwindow.cpp" line="399"/>
-        <source>Compilation server requires registration, please check opentx web site</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="362"/>
         <location filename="../mainwindow.cpp" line="402"/>
@@ -1408,343 +1407,322 @@ Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
-        <location filename="../mainwindow.cpp" line="517"/>
+        <location filename="../mainwindow.cpp" line="489"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="489"/>
-        <location filename="../mainwindow.cpp" line="518"/>
+        <location filename="../mainwindow.cpp" line="490"/>
+        <location filename="../mainwindow.cpp" line="519"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="491"/>
-        <location filename="../mainwindow.cpp" line="520"/>
+        <location filename="../mainwindow.cpp" line="492"/>
+        <location filename="../mainwindow.cpp" line="521"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="499"/>
-        <location filename="../mainwindow.cpp" line="529"/>
+        <location filename="../mainwindow.cpp" line="500"/>
+        <location filename="../mainwindow.cpp" line="530"/>
         <source>Do you want to download release %1 now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="516"/>
+        <location filename="../mainwindow.cpp" line="517"/>
         <source>A new version of %1 firmware is available (current %2 - newer %3).
 Do you want to download it now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>Ignore this version (r%1)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="556"/>
+        <location filename="../mainwindow.cpp" line="557"/>
         <source>Release notes contain very important informations. Do you want to see them now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Firmware updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Current firmware does not provide release notes informations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="903"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Taranis radio not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
         <source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
+        <location filename="../mainwindow.cpp" line="1080"/>
         <source>Write Models and settings from %1 to the Tx?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Backup is impossible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>Warning</source>
         <translation type="unfinished">Aviso</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Conversion failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Restore failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Backup failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1493"/>
+        <location filename="../mainwindow.cpp" line="1494"/>
         <source>Version %1 (revision %2), %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1494"/>
-        <source>The companion9x project was originally forked from eePe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1495"/>
+        <location filename="../mainwindow.cpp" line="1496"/>
         <source>If you&apos;ve found this program useful, please support by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1497"/>
+        <location filename="../mainwindow.cpp" line="1498"/>
         <source>donating</source>
         <translation>doar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1499"/>
         <source>About companion9x</source>
-        <translation>Sobre o companion9x</translation>
+        <translation type="obsolete">Sobre o companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1563"/>
-        <location filename="../mainwindow.cpp" line="2019"/>
-        <location filename="../mainwindow.cpp" line="2040"/>
+        <location filename="../mainwindow.cpp" line="1564"/>
+        <location filename="../mainwindow.cpp" line="2020"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1565"/>
+        <location filename="../mainwindow.cpp" line="1566"/>
         <source>%1 %2</source>
         <translation>%1 %2 </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
         <source>&amp;New</source>
         <translation>&amp;Novo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
         <source>Create a new file</source>
         <translation>Criar um novo ficheiro</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1598"/>
         <source>&amp;Open...</source>
         <translation>&amp;Abrir...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
+        <location filename="../mainwindow.cpp" line="1600"/>
         <source>Open an existing file</source>
         <translation>Abrir um ficheiro existente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>&amp;loadBackup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>Load backup from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1607"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1608"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Save the document to disk</source>
         <translation>Gravar o documento no disco</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Save &amp;As...</source>
         <translation>Gravar &amp;Como...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1613"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
         <source>Save the document under a new name</source>
         <translation>Gravar o documento com um novo nome</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Lo&amp;gs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Open log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
+        <location filename="../mainwindow.cpp" line="1622"/>
         <source>&amp;Preferences...</source>
         <translation>&amp;Preferências</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
+        <location filename="../mainwindow.cpp" line="1623"/>
         <source>Edit general preferences</source>
         <translation>Editar preferências gerais</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>&amp;Check for updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
-        <source>Check for new version of companion9x/er9x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Contributors &amp;List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
-        <source>Show companion9x contributors list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>ChangeLog...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
-        <source>Show companion9x changelog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Firmware ChangeLog...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Show firmware changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Compare...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Compare models</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Customize your &amp;TX...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Customize the splash screen of your TX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1653"/>
         <source>E&amp;xit</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1655"/>
         <source>Exit the application</source>
         <translation>Sair da aplicação</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1659"/>
         <source>Cu&amp;t</source>
         <translation>Cor&amp;tar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1661"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Cortar a selecção corrente para a zona de transferência</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copiar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1667"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Copiar a selecção corrente para a zona de transferência</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1671"/>
         <source>&amp;Paste</source>
         <translation>Co&amp;lar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1673"/>
         <source>Paste the clipboard&apos;s contents into the current selection</source>
         <translation>Colar o conteúdo na zona de transferência para a selecção corrente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1704"/>
+        <location filename="../mainwindow.cpp" line="1705"/>
         <source>Configure software for reading from and writing to the transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
         <source>Invalid Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1753,7 +1731,7 @@ Do you want to download it now ?</source>
         <translation type="obsolete">&amp;Gravar EEPROM no Rádio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1678"/>
+        <location filename="../mainwindow.cpp" line="1679"/>
         <source>Ctrl+Alt+W</source>
         <translation>Ctrl+Alt+W</translation>
     </message>
@@ -1766,7 +1744,7 @@ Do you want to download it now ?</source>
         <translation type="obsolete">&amp;Ler EEPROM do Rádio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1683"/>
+        <location filename="../mainwindow.cpp" line="1684"/>
         <source>Ctrl+Alt+R</source>
         <translation>Ctrl-Alt-R</translation>
     </message>
@@ -1791,7 +1769,7 @@ Do you want to download it now ?</source>
         <translation type="obsolete">Ler memória Flash do Rádio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1703"/>
+        <location filename="../mainwindow.cpp" line="1704"/>
         <source>&amp;Configure...</source>
         <translation type="unfinished">&amp;Configurar...</translation>
     </message>
@@ -1800,148 +1778,148 @@ Do you want to download it now ?</source>
         <translation type="obsolete">Configurar aplicação de gravação do Rádio</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1708"/>
+        <location filename="../mainwindow.cpp" line="1709"/>
         <source>&amp;List programmers</source>
         <translation>&amp;Listar programadores</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1709"/>
+        <location filename="../mainwindow.cpp" line="1710"/>
         <source>List available programmers</source>
         <translation>Lista os programadores disponíveis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1712"/>
+        <location filename="../mainwindow.cpp" line="1713"/>
         <source>&amp;Fuses...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1713"/>
+        <location filename="../mainwindow.cpp" line="1714"/>
         <source>Show fuses dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1716"/>
+        <location filename="../mainwindow.cpp" line="1717"/>
         <source>&amp;Simulate</source>
         <translation>&amp;Simular</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1717"/>
+        <location filename="../mainwindow.cpp" line="1718"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1718"/>
+        <location filename="../mainwindow.cpp" line="1719"/>
         <source>Simulate selected model.</source>
         <translation>Simular o modelo seleccionado</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1722"/>
+        <location filename="../mainwindow.cpp" line="1723"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1723"/>
+        <location filename="../mainwindow.cpp" line="1724"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location filename="../mainwindow.cpp" line="1725"/>
         <source>Print current model.</source>
         <translation>Imprimir o modelo corrente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1728"/>
+        <location filename="../mainwindow.cpp" line="1729"/>
         <source>Cl&amp;ose</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1729"/>
+        <location filename="../mainwindow.cpp" line="1730"/>
         <source>Close the active window</source>
         <translation>Fechar a janela activa</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1733"/>
+        <location filename="../mainwindow.cpp" line="1734"/>
         <source>Close &amp;All</source>
         <translation>Fechar &amp;Todas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1734"/>
+        <location filename="../mainwindow.cpp" line="1735"/>
         <source>Close all the windows</source>
         <translation>Fechar todas as janelas</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1738"/>
+        <location filename="../mainwindow.cpp" line="1739"/>
         <source>&amp;Tile</source>
         <translation>&amp;Mosaico</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1739"/>
+        <location filename="../mainwindow.cpp" line="1740"/>
         <source>Tile the windows</source>
         <translation>Apresentar as janelas abertas em mosaico</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1742"/>
+        <location filename="../mainwindow.cpp" line="1743"/>
         <source>&amp;Cascade</source>
         <translation>&amp;Cascata</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1743"/>
+        <location filename="../mainwindow.cpp" line="1744"/>
         <source>Cascade the windows</source>
         <translation>Apresentar as janelas abertas em cascata</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
+        <location filename="../mainwindow.cpp" line="1747"/>
         <source>Ne&amp;xt</source>
         <translation>&amp;Próxima</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1748"/>
+        <location filename="../mainwindow.cpp" line="1749"/>
         <source>Move the focus to the next window</source>
         <translation>Selecciona janela seguinte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1752"/>
+        <location filename="../mainwindow.cpp" line="1753"/>
         <source>Pre&amp;vious</source>
         <translation>&amp;Anterior</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1754"/>
+        <location filename="../mainwindow.cpp" line="1755"/>
         <source>Move the focus to the previous window</source>
         <translation>Selecciona janela anterior</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1762"/>
+        <location filename="../mainwindow.cpp" line="1763"/>
         <source>&amp;About</source>
         <translation>A&amp;cerca</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1763"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
         <source>Show the application&apos;s About box</source>
         <translation>Sobre a aplicação</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1787"/>
-        <location filename="../mainwindow.cpp" line="1881"/>
+        <location filename="../mainwindow.cpp" line="1788"/>
+        <location filename="../mainwindow.cpp" line="1882"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1820"/>
+        <location filename="../mainwindow.cpp" line="1821"/>
         <source>&amp;Read/Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1916"/>
+        <location filename="../mainwindow.cpp" line="1917"/>
         <source>Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2066"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
         <source>Unable to find file %1!</source>
         <translation type="unfinished">Impossível encontrar o ficheiro %1!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2124"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
         <source>Error reading file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -1955,236 +1933,262 @@ Do you want to download it now ?</source>
         <translation type="obsolete">Lista de contribuidores do er9x/companion9x</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1767"/>
+        <location filename="../mainwindow.cpp" line="1768"/>
         <source>Switch layout Left/Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1790"/>
+        <location filename="../mainwindow.cpp" line="1791"/>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1766"/>
+        <location filename="../mainwindow.cpp" line="1767"/>
         <source>Switch layout direction</source>
         <translation>Mudar apresentação dos menus</translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="106"/>
-        <location filename="../mainwindow.cpp" line="721"/>
-        <location filename="../mainwindow.cpp" line="741"/>
-        <source>companion9x - Models and Settings Editor - %1 - profile %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="108"/>
-        <location filename="../mainwindow.cpp" line="715"/>
-        <location filename="../mainwindow.cpp" line="732"/>
-        <location filename="../mainwindow.cpp" line="743"/>
-        <source>companion9x - Models and Settings Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="224"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="260"/>
+        <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="281"/>
+        <source>A new release of Companion is available please check the repository</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="359"/>
+        <location filename="../mainwindow.cpp" line="399"/>
+        <source>Compilation server requires registration, please check OpenTX web site</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="430"/>
         <source>Do you want to write the firmware to the transmitter now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="487"/>
+        <location filename="../mainwindow.cpp" line="488"/>
         <source>Firmware %1 does not seem to have ever been downloaded.
 Version %2 is available.
 Do you want to download it now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1051"/>
-        <location filename="../mainwindow.cpp" line="1058"/>
-        <location filename="../mainwindow.cpp" line="1427"/>
-        <location filename="../mainwindow.cpp" line="1434"/>
+        <location filename="../mainwindow.cpp" line="1052"/>
+        <location filename="../mainwindow.cpp" line="1059"/>
+        <location filename="../mainwindow.cpp" line="1428"/>
+        <location filename="../mainwindow.cpp" line="1435"/>
         <source>Read Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1082"/>
+        <location filename="../mainwindow.cpp" line="1083"/>
         <source>The file %1
 has not been recognized as a valid Models and Settings file
 Write anyway ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1108"/>
-        <location filename="../mainwindow.cpp" line="1115"/>
-        <location filename="../mainwindow.cpp" line="1158"/>
-        <location filename="../mainwindow.cpp" line="1165"/>
-        <location filename="../mainwindow.cpp" line="1357"/>
-        <location filename="../mainwindow.cpp" line="1399"/>
+        <location filename="../mainwindow.cpp" line="1109"/>
+        <location filename="../mainwindow.cpp" line="1116"/>
+        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1166"/>
+        <location filename="../mainwindow.cpp" line="1358"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>Backup Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1131"/>
+        <location filename="../mainwindow.cpp" line="1132"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
         <source>The transmitter firmware belongs to another product family, check file and preferences!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>The transmitter firmware is outdated, please upgrade!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1180"/>
+        <location filename="../mainwindow.cpp" line="1181"/>
         <source>Write Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1363"/>
-        <location filename="../mainwindow.cpp" line="1406"/>
+        <location filename="../mainwindow.cpp" line="1364"/>
+        <location filename="../mainwindow.cpp" line="1407"/>
         <source>Write Firmware To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Cannot convert Models and Settings for use with this firmware, original data will be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1375"/>
         <source>Restore Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Could not restore Models and Settings to TX. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Firmware write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Could not write firmware to to transmitter. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Cannot backup existing Models and Settings from TX. Firmware write process aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1416"/>
+        <location filename="../mainwindow.cpp" line="1417"/>
         <source>Save transmitter Models and Settings to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Impossible to identify the radio on your system, please verify that the eeprom disk is connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1444"/>
+        <location filename="../mainwindow.cpp" line="1445"/>
         <source>Read Tx Firmware to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1677"/>
+        <location filename="../mainwindow.cpp" line="1495"/>
+        <source>The Companion project was originally forked from eePe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1500"/>
+        <source>About Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Check for new version of Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1631"/>
+        <source>Show Companion contributors list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1635"/>
+        <source>Show Companion changelog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1678"/>
         <source>&amp;Write Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1679"/>
+        <location filename="../mainwindow.cpp" line="1680"/>
         <source>Write Models and Settings to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1682"/>
+        <location filename="../mainwindow.cpp" line="1683"/>
         <source>&amp;Read Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1684"/>
+        <location filename="../mainwindow.cpp" line="1685"/>
         <source>Read Models and Settings from transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
+        <location filename="../mainwindow.cpp" line="1688"/>
         <source>Write Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1688"/>
+        <location filename="../mainwindow.cpp" line="1689"/>
         <source>Write firmware to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1691"/>
+        <location filename="../mainwindow.cpp" line="1692"/>
         <source>Write Models and Settings from file to Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1692"/>
+        <location filename="../mainwindow.cpp" line="1693"/>
         <source>Write Models and Settings from file to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1695"/>
+        <location filename="../mainwindow.cpp" line="1696"/>
         <source>Save transmitter Models and Settings to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1696"/>
+        <location filename="../mainwindow.cpp" line="1697"/>
         <source>Save the Models and Settings from the transmitter to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1699"/>
+        <location filename="../mainwindow.cpp" line="1700"/>
         <source>Read Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1700"/>
+        <location filename="../mainwindow.cpp" line="1701"/>
         <source>Read firmware from transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1788"/>
-        <location filename="../mainwindow.cpp" line="1891"/>
+        <location filename="../mainwindow.cpp" line="1789"/>
+        <location filename="../mainwindow.cpp" line="1892"/>
         <source>Firmware Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1815"/>
+        <location filename="../mainwindow.cpp" line="1816"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1838"/>
+        <location filename="../mainwindow.cpp" line="1839"/>
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1844"/>
+        <location filename="../mainwindow.cpp" line="1845"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1874"/>
+        <location filename="../mainwindow.cpp" line="1875"/>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1911"/>
+        <location filename="../mainwindow.cpp" line="1912"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
@@ -2193,12 +2197,12 @@ Write anyway ?</source>
         <translation type="obsolete">Gravar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1928"/>
+        <location filename="../mainwindow.cpp" line="1929"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location filename="../mainwindow.cpp" line="1936"/>
         <source>Ready</source>
         <translation>Pronto</translation>
     </message>
@@ -2210,11 +2214,8 @@ Write anyway ?</source>
         <translation type="obsolete">Parâmetros Gerais</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="182"/>
-        <location filename="../mdichild.cpp" line="187"/>
-        <location filename="../mdichild.cpp" line="470"/>
         <source>companion9x</source>
-        <translation>companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <source>Delete Selected Models?</source>
@@ -2298,6 +2299,13 @@ Write anyway ?</source>
         <source>Do you want to use model wizard? </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mdichild.cpp" line="182"/>
+        <location filename="../mdichild.cpp" line="187"/>
+        <location filename="../mdichild.cpp" line="470"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mdichild.cpp" line="187"/>
         <source>Ask this question again ? </source>
@@ -7625,11 +7633,11 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
     </message>
     <message>
         <location filename="../warnings.h" line="5"/>
-        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
+        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
 
-We are really sensible to that!
+We are really appreciative for that!
 
-The openTX/C9X Team.</source>
+The OpenTX/Companion Team.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7996,8 +8004,12 @@ Please only use this if you know what you are doing.  There are no error checks
     <message>
         <location filename="../burnconfigdialog.cpp" line="328"/>
         <location filename="../burnconfigdialog.cpp" line="397"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>companion9x</source>
-        <translation type="unfinished">companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="329"/>
@@ -8067,6 +8079,11 @@ m2560 for v4.1 boards</source>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../burndialog.ui" line="276"/>
+        <source>Allows Companion to write to older version of the firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burndialog.ui" line="289"/>
         <source>Backup and restore Models and Settings</source>
@@ -8113,11 +8130,6 @@ m2560 for v4.1 boards</source>
         <source>Variant</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../burndialog.ui" line="276"/>
-        <source>Allows companion9x to write to older version of the firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../burndialog.ui" line="279"/>
         <source>Check Firmware compatibility</source>
@@ -8900,27 +8912,27 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../contributorsdialog.cpp" line="29"/>
         <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
-of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
-companion9x was forked out.</source>
+of course. Also to Erez Raviv (er9x) and the fantastic eePe program 
+which was the staring point for OpenTX Companion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="31"/>
+        <location filename="../contributorsdialog.cpp" line="46"/>
+        <source>Companion Release Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contributorsdialog.cpp" line="32"/>
         <source>Thank you all !!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="34"/>
+        <location filename="../contributorsdialog.cpp" line="35"/>
         <source>Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="45"/>
-        <source>Companion9x Release Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contributorsdialog.cpp" line="50"/>
+        <location filename="../contributorsdialog.cpp" line="51"/>
         <source>OpenTX Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9077,8 +9089,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="54"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>companion9x</source>
-        <translation type="unfinished">companion9x</translation>
+        <translation type="obsolete">companion9x</translation>
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="55"/>
@@ -9408,7 +9424,7 @@ Press cancel to abort joystick calibration</source>
     <name>logsDialog</name>
     <message>
         <location filename="../logsdialog.ui" line="14"/>
-        <source>Companion9x log viewer</source>
+        <source>Companion Log Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9422,47 +9438,58 @@ Press cancel to abort joystick calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="131"/>
+        <location filename="../logsdialog.ui" line="94"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="138"/>
+        <location filename="../logsdialog.ui" line="101"/>
         <source>X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="145"/>
+        <location filename="../logsdialog.ui" line="108"/>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="169"/>
+        <location filename="../logsdialog.ui" line="132"/>
         <source>Fly sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="22"/>
+        <location filename="../logsdialog.cpp" line="27"/>
         <source>Telemetry logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="23"/>
+        <location filename="../logsdialog.cpp" line="28"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="395"/>
+        <location filename="../logsdialog.cpp" line="252"/>
+        <source>Error</source>
+        <translation type="unfinished">Erro</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="253"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="582"/>
         <source>Select your log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="406"/>
+        <location filename="../logsdialog.cpp" line="593"/>
         <source>Available fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="501"/>
+        <location filename="../logsdialog.cpp" line="690"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9920,7 +9947,7 @@ Press cancel to abort joystick calibration</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="506"/>
+        <location filename="../preferencesdialog.ui" line="650"/>
         <source>Language (requires restart)</source>
         <translation>Língua (necessita uma reinicialização)</translation>
     </message>
@@ -9930,23 +9957,23 @@ Press cancel to abort joystick calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="883"/>
-        <location filename="../preferencesdialog.ui" line="924"/>
+        <location filename="../preferencesdialog.ui" line="914"/>
+        <location filename="../preferencesdialog.ui" line="955"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="676"/>
+        <location filename="../preferencesdialog.ui" line="707"/>
         <source>Default Channel Order</source>
         <translation>Ordem dos Canais por Defeito</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="663"/>
+        <location filename="../preferencesdialog.ui" line="694"/>
         <source>Default Stick Mode</source>
         <translation>Modo do Rádio por Defeito</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="525"/>
+        <location filename="../preferencesdialog.ui" line="292"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
@@ -9957,12 +9984,12 @@ This is used by the templated to determine which channel goes to what number out
         <translation type="obsolete">companion9x</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="273"/>
+        <location filename="../preferencesdialog.ui" line="51"/>
         <source>Show Splash Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="686"/>
+        <location filename="../preferencesdialog.ui" line="717"/>
         <source>Mode selection:
 
 Mode 1:
@@ -9985,117 +10012,127 @@ Mode 4:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="711"/>
+        <location filename="../preferencesdialog.ui" line="742"/>
         <source>Mode 1 (RUD ELE THR AIL)</source>
         <translation>Modo 1 (RUD ELE THR AIL)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="716"/>
+        <location filename="../preferencesdialog.ui" line="747"/>
         <source>Mode 2 (RUD THR ELE AIL)</source>
         <translation>Modo 2 (RUD THR ELE AIL)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="721"/>
+        <location filename="../preferencesdialog.ui" line="752"/>
         <source>Mode 3 (AIL ELE THR RUD)</source>
         <translation>Modo 3 (AIL ELE THR RUD)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="726"/>
+        <location filename="../preferencesdialog.ui" line="757"/>
         <source>Mode 4 (AIL THR ELE RUD)</source>
         <translation>Modo 4 (AIL THR ELE RUD)</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="790"/>
+        <location filename="../preferencesdialog.ui" line="821"/>
         <source>Automatic Backup Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="846"/>
+        <location filename="../preferencesdialog.ui" line="877"/>
         <source>Automatically add version number to the filename after download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="870"/>
+        <location filename="../preferencesdialog.ui" line="901"/>
         <source>Voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="890"/>
+        <location filename="../preferencesdialog.ui" line="921"/>
         <source>Set language of voice.
 May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="964"/>
+        <location filename="../preferencesdialog.ui" line="995"/>
         <source>Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="70"/>
+        <location filename="../preferencesdialog.ui" line="1616"/>
+        <source>Find Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="1625"/>
+        <source>Google Earth Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="83"/>
         <source>Check for updates on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="148"/>
-        <location filename="../preferencesdialog.ui" line="215"/>
+        <location filename="../preferencesdialog.ui" line="161"/>
+        <location filename="../preferencesdialog.ui" line="228"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="773"/>
+        <location filename="../preferencesdialog.ui" line="804"/>
         <source>Splash library behaviour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="754"/>
+        <location filename="../preferencesdialog.ui" line="785"/>
         <source>Include companion splashes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="759"/>
+        <location filename="../preferencesdialog.ui" line="790"/>
         <source>Only user defined splashes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="286"/>
+        <location filename="../preferencesdialog.ui" line="430"/>
         <source>Custom TX splash screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="375"/>
+        <location filename="../preferencesdialog.ui" line="519"/>
         <source>Personal splash library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="740"/>
+        <location filename="../preferencesdialog.ui" line="771"/>
         <source>Joystick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="326"/>
-        <location filename="../preferencesdialog.ui" line="806"/>
-        <location filename="../preferencesdialog.ui" line="941"/>
-        <location filename="../preferencesdialog.ui" line="1008"/>
+        <location filename="../preferencesdialog.ui" line="470"/>
+        <location filename="../preferencesdialog.ui" line="662"/>
+        <location filename="../preferencesdialog.ui" line="837"/>
+        <location filename="../preferencesdialog.ui" line="972"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="977"/>
+        <location filename="../preferencesdialog.ui" line="1008"/>
         <source>SD Structure path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="987"/>
+        <location filename="../preferencesdialog.ui" line="1018"/>
         <source>Processor ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="996"/>
+        <location filename="../preferencesdialog.ui" line="1027"/>
         <source>Simulator capture folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="1025"/>
+        <location filename="../preferencesdialog.ui" line="679"/>
         <source>Use clipboard only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10146,206 +10183,211 @@ May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="360"/>
+        <location filename="../preferencesdialog.ui" line="504"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="908"/>
+        <location filename="../preferencesdialog.ui" line="939"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="488"/>
+        <location filename="../preferencesdialog.ui" line="632"/>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="454"/>
+        <location filename="../preferencesdialog.ui" line="598"/>
         <source>Export Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="461"/>
+        <location filename="../preferencesdialog.ui" line="605"/>
         <source>Save Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="478"/>
+        <location filename="../preferencesdialog.ui" line="622"/>
         <source>Import Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="58"/>
+        <location filename="../preferencesdialog.ui" line="71"/>
         <source>Simu BackLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="80"/>
+        <location filename="../preferencesdialog.ui" line="93"/>
         <source>Check for selected Fw updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="92"/>
+        <location filename="../preferencesdialog.ui" line="105"/>
         <source>Ask use of wizard for new models</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="164"/>
+        <location filename="../preferencesdialog.ui" line="177"/>
         <source>Remember switches in simulator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="172"/>
+        <location filename="../preferencesdialog.ui" line="185"/>
         <source>Blue</source>
         <oldsource>Blu</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="177"/>
+        <location filename="../preferencesdialog.ui" line="190"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="182"/>
+        <location filename="../preferencesdialog.ui" line="195"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="187"/>
+        <location filename="../preferencesdialog.ui" line="200"/>
         <source>Orange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="192"/>
+        <location filename="../preferencesdialog.ui" line="205"/>
         <source>Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="783"/>
+        <location filename="../preferencesdialog.ui" line="814"/>
         <source>Profile slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="813"/>
+        <location filename="../preferencesdialog.ui" line="844"/>
         <source>auto backup before write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="433"/>
+        <location filename="../preferencesdialog.ui" line="577"/>
         <source>Ask for flashing after Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="295"/>
+        <location filename="../preferencesdialog.ui" line="439"/>
         <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="312"/>
+        <location filename="../preferencesdialog.ui" line="456"/>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="232"/>
+        <location filename="../preferencesdialog.ui" line="245"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="141"/>
+        <location filename="../preferencesdialog.ui" line="154"/>
         <source>Invert Pixels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="353"/>
+        <location filename="../preferencesdialog.ui" line="497"/>
         <source>FwInfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="227"/>
+        <location filename="../preferencesdialog.cpp" line="233"/>
         <source>Last downloaded release: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="236"/>
-        <source>The selected firmware has never been downloaded by companion9x.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferencesdialog.cpp" line="240"/>
-        <source>The selected firmware cannot be downloaded by companion9x.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferencesdialog.cpp" line="447"/>
+        <location filename="../preferencesdialog.cpp" line="461"/>
         <source>Image stored in settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="458"/>
-        <location filename="../preferencesdialog.cpp" line="780"/>
+        <location filename="../preferencesdialog.cpp" line="472"/>
+        <location filename="../preferencesdialog.cpp" line="804"/>
         <source>No joysticks found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="542"/>
+        <location filename="../preferencesdialog.cpp" line="556"/>
         <source>Select your snapshot folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="569"/>
+        <location filename="../preferencesdialog.cpp" line="583"/>
         <source>Select your Models and Settings backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="597"/>
+        <location filename="../preferencesdialog.cpp" line="594"/>
+        <source>Select Google Earth executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="620"/>
         <source>Select the folder replicating your SD structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="641"/>
+        <location filename="../preferencesdialog.cpp" line="664"/>
         <source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="677"/>
+        <location filename="../preferencesdialog.cpp" line="701"/>
         <source>Export profile As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="699"/>
+        <location filename="../preferencesdialog.cpp" line="723"/>
         <source>Profile slot is not empty, profile slot %1 will we overwritten.&lt;br&gt;Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="705"/>
+        <location filename="../preferencesdialog.cpp" line="729"/>
         <source>Open Profile to import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Open Image to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Images (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Error</source>
         <translation type="unfinished">Erro</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="532"/>
+        <location filename="../preferencesdialog.cpp" line="242"/>
+        <source>The selected firmware has never been downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="246"/>
+        <source>The selected firmware cannot be downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="546"/>
         <source>Select your library folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Cannot load %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11027,10 +11069,9 @@ May be different from firmware language</source>
 <context>
     <name>simulatorDialog</name>
     <message>
-        <location filename="../simulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
         <oldsource>ER9x Simulator</oldsource>
-        <translation type="unfinished">Simulador ER9x</translation>
+        <translation type="obsolete">Simulador ER9x</translation>
     </message>
     <message>
         <location filename="../simulatordialog.ui" line="844"/>
@@ -11166,7 +11207,7 @@ May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1239"/>
+        <location filename="../simulatordialog.ui" line="1240"/>
         <source>Outputs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11206,264 +11247,269 @@ May be different from firmware language</source>
         <translation type="obsolete">SW12</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1854"/>
+        <location filename="../simulatordialog.ui" line="1856"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1265"/>
+        <location filename="../simulatordialog.ui" line="1266"/>
         <source>CS1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1296"/>
+        <location filename="../simulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../simulatordialog.ui" line="1297"/>
         <source>CS2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1327"/>
+        <location filename="../simulatordialog.ui" line="1328"/>
         <source>CS3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1358"/>
+        <location filename="../simulatordialog.ui" line="1359"/>
         <source>CS4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1389"/>
+        <location filename="../simulatordialog.ui" line="1390"/>
         <source>CS5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1420"/>
+        <location filename="../simulatordialog.ui" line="1421"/>
         <source>CS6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1451"/>
+        <location filename="../simulatordialog.ui" line="1452"/>
         <source>CS7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1482"/>
+        <location filename="../simulatordialog.ui" line="1483"/>
         <source>CS8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1513"/>
+        <location filename="../simulatordialog.ui" line="1514"/>
         <source>CS9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1544"/>
+        <location filename="../simulatordialog.ui" line="1545"/>
         <source>CSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1575"/>
+        <location filename="../simulatordialog.ui" line="1576"/>
         <source>CSB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1606"/>
+        <location filename="../simulatordialog.ui" line="1607"/>
         <source>CSC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1637"/>
+        <location filename="../simulatordialog.ui" line="1638"/>
         <source>CSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1668"/>
+        <location filename="../simulatordialog.ui" line="1669"/>
         <source>CSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1699"/>
+        <location filename="../simulatordialog.ui" line="1700"/>
         <source>CSF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1730"/>
+        <location filename="../simulatordialog.ui" line="1731"/>
         <source>CSG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1761"/>
+        <location filename="../simulatordialog.ui" line="1762"/>
         <source>CSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1792"/>
+        <location filename="../simulatordialog.ui" line="1793"/>
         <source>CSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1823"/>
+        <location filename="../simulatordialog.ui" line="1825"/>
         <source>CSJ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1885"/>
+        <location filename="../simulatordialog.ui" line="1887"/>
         <source>CSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1916"/>
+        <location filename="../simulatordialog.ui" line="1918"/>
         <source>CSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1947"/>
+        <location filename="../simulatordialog.ui" line="1949"/>
         <source>CSN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1978"/>
+        <location filename="../simulatordialog.ui" line="1980"/>
         <source>CSO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2009"/>
+        <location filename="../simulatordialog.ui" line="2011"/>
         <source>CSP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2040"/>
+        <location filename="../simulatordialog.ui" line="2042"/>
         <source>CSQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2071"/>
+        <location filename="../simulatordialog.ui" line="2073"/>
         <source>CSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2102"/>
+        <location filename="../simulatordialog.ui" line="2104"/>
         <source>CSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2133"/>
+        <location filename="../simulatordialog.ui" line="2135"/>
         <source>CST</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2164"/>
+        <location filename="../simulatordialog.ui" line="2166"/>
         <source>CSU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2195"/>
+        <location filename="../simulatordialog.ui" line="2197"/>
         <source>CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2226"/>
+        <location filename="../simulatordialog.ui" line="2228"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2307"/>
+        <location filename="../simulatordialog.ui" line="2310"/>
         <source>CH1</source>
         <translation>CH1</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2419"/>
+        <location filename="../simulatordialog.ui" line="2422"/>
         <source>CH9</source>
         <translation>CH9</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2432"/>
+        <location filename="../simulatordialog.ui" line="2435"/>
         <source>CH2</source>
         <translation>CH2</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2599"/>
+        <location filename="../simulatordialog.ui" line="2602"/>
         <source>CH10</source>
         <translation>CH10</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2612"/>
+        <location filename="../simulatordialog.ui" line="2615"/>
         <source>CH3</source>
         <translation>CH3</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2779"/>
+        <location filename="../simulatordialog.ui" line="2782"/>
         <source>CH11</source>
         <translation>CH11</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2792"/>
+        <location filename="../simulatordialog.ui" line="2795"/>
         <source>CH4</source>
         <translation>CH4</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2959"/>
+        <location filename="../simulatordialog.ui" line="2962"/>
         <source>CH12</source>
         <translation>CH12</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2972"/>
+        <location filename="../simulatordialog.ui" line="2975"/>
         <source>CH5</source>
         <translation>CH5</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3133"/>
+        <location filename="../simulatordialog.ui" line="3136"/>
         <source>CH13</source>
         <translation>CH13</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3146"/>
+        <location filename="../simulatordialog.ui" line="3149"/>
         <source>CH6</source>
         <translation>CH6</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3258"/>
+        <location filename="../simulatordialog.ui" line="3261"/>
         <source>CH14</source>
         <translation>CH14</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3271"/>
+        <location filename="../simulatordialog.ui" line="3274"/>
         <source>CH7</source>
         <translation>CH7</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3438"/>
+        <location filename="../simulatordialog.ui" line="3441"/>
         <source>CH15</source>
         <translation>CH15</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3451"/>
+        <location filename="../simulatordialog.ui" line="3454"/>
         <source>CH8</source>
         <translation>CH8</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3618"/>
+        <location filename="../simulatordialog.ui" line="3621"/>
         <source>CH16</source>
         <translation>CH16</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2326"/>
-        <location filename="../simulatordialog.ui" line="2348"/>
-        <location filename="../simulatordialog.ui" line="2506"/>
-        <location filename="../simulatordialog.ui" line="2528"/>
-        <location filename="../simulatordialog.ui" line="2686"/>
-        <location filename="../simulatordialog.ui" line="2708"/>
-        <location filename="../simulatordialog.ui" line="2866"/>
-        <location filename="../simulatordialog.ui" line="2888"/>
-        <location filename="../simulatordialog.ui" line="3040"/>
-        <location filename="../simulatordialog.ui" line="3062"/>
-        <location filename="../simulatordialog.ui" line="3165"/>
-        <location filename="../simulatordialog.ui" line="3187"/>
-        <location filename="../simulatordialog.ui" line="3345"/>
-        <location filename="../simulatordialog.ui" line="3367"/>
-        <location filename="../simulatordialog.ui" line="3525"/>
-        <location filename="../simulatordialog.ui" line="3547"/>
+        <location filename="../simulatordialog.ui" line="2329"/>
+        <location filename="../simulatordialog.ui" line="2351"/>
+        <location filename="../simulatordialog.ui" line="2509"/>
+        <location filename="../simulatordialog.ui" line="2531"/>
+        <location filename="../simulatordialog.ui" line="2689"/>
+        <location filename="../simulatordialog.ui" line="2711"/>
+        <location filename="../simulatordialog.ui" line="2869"/>
+        <location filename="../simulatordialog.ui" line="2891"/>
+        <location filename="../simulatordialog.ui" line="3043"/>
+        <location filename="../simulatordialog.ui" line="3065"/>
+        <location filename="../simulatordialog.ui" line="3168"/>
+        <location filename="../simulatordialog.ui" line="3190"/>
+        <location filename="../simulatordialog.ui" line="3348"/>
+        <location filename="../simulatordialog.ui" line="3370"/>
+        <location filename="../simulatordialog.ui" line="3528"/>
+        <location filename="../simulatordialog.ui" line="3550"/>
         <source>-100.1</source>
         <translation>-100.1</translation>
     </message>
@@ -11545,9 +11591,8 @@ May be different from firmware language</source>
 <context>
     <name>xsimulatorDialog</name>
     <message>
-        <location filename="../xsimulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation type="unfinished">Simulador ER9x</translation>
+        <translation type="obsolete">Simulador ER9x</translation>
     </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1089"/>
@@ -11718,6 +11763,11 @@ May be different from firmware language</source>
         <source>S2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../xsimulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="480"/>
         <location filename="../xsimulatordialog.ui" line="595"/>
@@ -11748,16 +11798,16 @@ May be different from firmware language</source>
         <location filename="../xsimulatordialog.ui" line="1772"/>
         <location filename="../xsimulatordialog.ui" line="1930"/>
         <location filename="../xsimulatordialog.ui" line="1952"/>
-        <location filename="../xsimulatordialog.ui" line="2110"/>
-        <location filename="../xsimulatordialog.ui" line="2132"/>
-        <location filename="../xsimulatordialog.ui" line="2284"/>
-        <location filename="../xsimulatordialog.ui" line="2306"/>
-        <location filename="../xsimulatordialog.ui" line="2409"/>
-        <location filename="../xsimulatordialog.ui" line="2431"/>
-        <location filename="../xsimulatordialog.ui" line="2589"/>
-        <location filename="../xsimulatordialog.ui" line="2611"/>
-        <location filename="../xsimulatordialog.ui" line="2769"/>
-        <location filename="../xsimulatordialog.ui" line="2791"/>
+        <location filename="../xsimulatordialog.ui" line="2111"/>
+        <location filename="../xsimulatordialog.ui" line="2133"/>
+        <location filename="../xsimulatordialog.ui" line="2285"/>
+        <location filename="../xsimulatordialog.ui" line="2307"/>
+        <location filename="../xsimulatordialog.ui" line="2410"/>
+        <location filename="../xsimulatordialog.ui" line="2432"/>
+        <location filename="../xsimulatordialog.ui" line="2590"/>
+        <location filename="../xsimulatordialog.ui" line="2612"/>
+        <location filename="../xsimulatordialog.ui" line="2770"/>
+        <location filename="../xsimulatordialog.ui" line="2792"/>
         <source>-100.1</source>
         <translation type="unfinished">-100.1</translation>
     </message>
@@ -11792,207 +11842,207 @@ May be different from firmware language</source>
         <translation type="unfinished">CH4</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2203"/>
+        <location filename="../xsimulatordialog.ui" line="2204"/>
         <source>CH12</source>
         <translation type="unfinished">CH12</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2216"/>
+        <location filename="../xsimulatordialog.ui" line="2217"/>
         <source>CH5</source>
         <translation type="unfinished">CH5</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2377"/>
+        <location filename="../xsimulatordialog.ui" line="2378"/>
         <source>CH13</source>
         <translation type="unfinished">CH13</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2390"/>
+        <location filename="../xsimulatordialog.ui" line="2391"/>
         <source>CH6</source>
         <translation type="unfinished">CH6</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2502"/>
+        <location filename="../xsimulatordialog.ui" line="2503"/>
         <source>CH14</source>
         <translation type="unfinished">CH14</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2515"/>
+        <location filename="../xsimulatordialog.ui" line="2516"/>
         <source>CH7</source>
         <translation type="unfinished">CH7</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2682"/>
+        <location filename="../xsimulatordialog.ui" line="2683"/>
         <source>CH15</source>
         <translation type="unfinished">CH15</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2695"/>
+        <location filename="../xsimulatordialog.ui" line="2696"/>
         <source>CH8</source>
         <translation type="unfinished">CH8</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2862"/>
+        <location filename="../xsimulatordialog.ui" line="2863"/>
         <source>CH16</source>
         <translation type="unfinished">CH16</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2896"/>
+        <location filename="../xsimulatordialog.ui" line="2897"/>
         <source>CSK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2927"/>
+        <location filename="../xsimulatordialog.ui" line="2928"/>
         <source>CSC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2958"/>
+        <location filename="../xsimulatordialog.ui" line="2959"/>
         <source>CSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2989"/>
+        <location filename="../xsimulatordialog.ui" line="2990"/>
         <source>CS7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3020"/>
+        <location filename="../xsimulatordialog.ui" line="3021"/>
         <source>CSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3051"/>
+        <location filename="../xsimulatordialog.ui" line="3052"/>
         <source>CSB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3082"/>
+        <location filename="../xsimulatordialog.ui" line="3083"/>
         <source>CS1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3113"/>
+        <location filename="../xsimulatordialog.ui" line="3114"/>
         <source>CSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3144"/>
+        <location filename="../xsimulatordialog.ui" line="3145"/>
         <source>CSG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3175"/>
+        <location filename="../xsimulatordialog.ui" line="3176"/>
         <source>CSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3206"/>
+        <location filename="../xsimulatordialog.ui" line="3207"/>
         <source>CSF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3237"/>
+        <location filename="../xsimulatordialog.ui" line="3238"/>
         <source>CS8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3268"/>
+        <location filename="../xsimulatordialog.ui" line="3269"/>
         <source>CS9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3299"/>
+        <location filename="../xsimulatordialog.ui" line="3300"/>
         <source>CSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3330"/>
+        <location filename="../xsimulatordialog.ui" line="3331"/>
         <source>CSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3361"/>
+        <location filename="../xsimulatordialog.ui" line="3362"/>
         <source>CSJ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3392"/>
+        <location filename="../xsimulatordialog.ui" line="3393"/>
         <source>CSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3423"/>
+        <location filename="../xsimulatordialog.ui" line="3424"/>
         <source>CS4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3454"/>
+        <location filename="../xsimulatordialog.ui" line="3455"/>
         <source>CS5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3485"/>
+        <location filename="../xsimulatordialog.ui" line="3486"/>
         <source>CS2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3516"/>
+        <location filename="../xsimulatordialog.ui" line="3517"/>
         <source>CS3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3547"/>
+        <location filename="../xsimulatordialog.ui" line="3548"/>
         <source>CS6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3578"/>
+        <location filename="../xsimulatordialog.ui" line="3579"/>
         <source>CSN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3609"/>
+        <location filename="../xsimulatordialog.ui" line="3610"/>
         <source>CSO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3640"/>
+        <location filename="../xsimulatordialog.ui" line="3641"/>
         <source>CSP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3671"/>
+        <location filename="../xsimulatordialog.ui" line="3672"/>
         <source>CSQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3702"/>
+        <location filename="../xsimulatordialog.ui" line="3703"/>
         <source>CSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3733"/>
+        <location filename="../xsimulatordialog.ui" line="3734"/>
         <source>CSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3764"/>
+        <location filename="../xsimulatordialog.ui" line="3765"/>
         <source>CST</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3795"/>
+        <location filename="../xsimulatordialog.ui" line="3796"/>
         <source>CSU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3826"/>
+        <location filename="../xsimulatordialog.ui" line="3827"/>
         <source>CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3857"/>
+        <location filename="../xsimulatordialog.ui" line="3858"/>
         <source>CSW</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/companion/src/translations/companion9x_ru.ts b/companion/src/translations/companion_ru.ts
similarity index 94%
rename from companion/src/translations/companion9x_ru.ts
rename to companion/src/translations/companion_ru.ts
index c6fb8c1ef..92c12ee9b 100644
--- a/companion/src/translations/companion9x_ru.ts
+++ b/companion/src/translations/companion_ru.ts
@@ -1225,29 +1225,24 @@ Are you sure ?</source>
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.cpp" line="147"/>
-        <location filename="../mainwindow.cpp" line="635"/>
-        <location filename="../mainwindow.cpp" line="669"/>
-        <location filename="../mainwindow.cpp" line="2161"/>
+        <location filename="../mainwindow.cpp" line="636"/>
+        <location filename="../mainwindow.cpp" line="670"/>
+        <location filename="../mainwindow.cpp" line="2162"/>
         <source>File loaded</source>
         <translation>Файл загружен</translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="260"/>
-        <source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="268"/>
         <location filename="../mainwindow.cpp" line="270"/>
         <location filename="../mainwindow.cpp" line="310"/>
-        <location filename="../mainwindow.cpp" line="570"/>
-        <location filename="../mainwindow.cpp" line="572"/>
+        <location filename="../mainwindow.cpp" line="571"/>
+        <location filename="../mainwindow.cpp" line="573"/>
         <source>Save As</source>
         <translation type="unfinished">Сохранить как...</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="285"/>
-        <location filename="../mainwindow.cpp" line="543"/>
+        <location filename="../mainwindow.cpp" line="544"/>
         <source>No updates available at this time.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1255,8 +1250,8 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="246"/>
         <location filename="../mainwindow.cpp" line="289"/>
         <location filename="../mainwindow.cpp" line="467"/>
-        <location filename="../mainwindow.cpp" line="589"/>
-        <location filename="../mainwindow.cpp" line="593"/>
+        <location filename="../mainwindow.cpp" line="590"/>
+        <location filename="../mainwindow.cpp" line="594"/>
         <source>Unable to check for updates.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1275,13 +1270,13 @@ Are you sure ?</source>
         <translation type="obsolete">файлы EEPROM (*.bin *.hex);;файлы BIN (*.bin);;файлы HEX (*.hex)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="623"/>
+        <location filename="../mainwindow.cpp" line="624"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="644"/>
-        <location filename="../mainwindow.cpp" line="650"/>
+        <location filename="../mainwindow.cpp" line="645"/>
+        <location filename="../mainwindow.cpp" line="651"/>
         <source>File saved</source>
         <translation>Файл записан</translation>
     </message>
@@ -1310,7 +1305,7 @@ Are you sure ?</source>
         <translation type="obsolete">Считать прошивку в файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1492"/>
+        <location filename="../mainwindow.cpp" line="1493"/>
         <source>Copyright</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1320,7 +1315,7 @@ Are you sure ?</source>
         <translation type="obsolete">Если эта программа и/или прошивка оказалась полезной, вы можете </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1497"/>
+        <location filename="../mainwindow.cpp" line="1498"/>
         <source>donating</source>
         <translation>поддержать ее</translation>
     </message>
@@ -1329,74 +1324,74 @@ Are you sure ?</source>
         <translation type="obsolete">О eePe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1563"/>
-        <location filename="../mainwindow.cpp" line="2019"/>
-        <location filename="../mainwindow.cpp" line="2040"/>
+        <location filename="../mainwindow.cpp" line="1564"/>
+        <location filename="../mainwindow.cpp" line="2020"/>
+        <location filename="../mainwindow.cpp" line="2041"/>
         <source>&amp;%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1565"/>
+        <location filename="../mainwindow.cpp" line="1566"/>
         <source>%1 %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1592"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
         <source>&amp;New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1594"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
         <source>Create a new file</source>
         <translation>Создать новый файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1597"/>
+        <location filename="../mainwindow.cpp" line="1598"/>
         <source>&amp;Open...</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1599"/>
+        <location filename="../mainwindow.cpp" line="1600"/>
         <source>Open an existing file</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1606"/>
+        <location filename="../mainwindow.cpp" line="1607"/>
         <source>&amp;Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1608"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Save the document to disk</source>
         <translation>Записать на диск</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1611"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Save &amp;As...</source>
         <translation>Сохранить как...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1613"/>
+        <location filename="../mainwindow.cpp" line="1614"/>
         <source>Save the document under a new name</source>
         <translation>Записать с другим именем</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
+        <location filename="../mainwindow.cpp" line="1622"/>
         <source>&amp;Preferences...</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1622"/>
+        <location filename="../mainwindow.cpp" line="1623"/>
         <source>Edit general preferences</source>
         <translation>Редактировать основные настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
         <source>&amp;Check for updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1495"/>
+        <location filename="../mainwindow.cpp" line="1496"/>
         <source>If you&apos;ve found this program useful, please support by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1410,34 +1405,29 @@ Are you sure ?</source>
         <source>New release available</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="281"/>
-        <source>A new release of companion is available please check the repository</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="337"/>
         <location filename="../mainwindow.cpp" line="366"/>
         <location filename="../mainwindow.cpp" line="377"/>
         <location filename="../mainwindow.cpp" line="406"/>
-        <location filename="../mainwindow.cpp" line="901"/>
-        <location filename="../mainwindow.cpp" line="2066"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
-        <location filename="../mainwindow.cpp" line="2124"/>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Error</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="338"/>
         <location filename="../mainwindow.cpp" line="378"/>
-        <location filename="../mainwindow.cpp" line="2072"/>
-        <location filename="../mainwindow.cpp" line="2080"/>
-        <location filename="../mainwindow.cpp" line="2116"/>
+        <location filename="../mainwindow.cpp" line="2073"/>
+        <location filename="../mainwindow.cpp" line="2081"/>
+        <location filename="../mainwindow.cpp" line="2117"/>
         <source>Error opening file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -1452,6 +1442,21 @@ Are you sure ?</source>
         <source>Display previous message again at startup ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="106"/>
+        <location filename="../mainwindow.cpp" line="722"/>
+        <location filename="../mainwindow.cpp" line="742"/>
+        <source>Companion - Models and Settings Editor - %1 - profile %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="716"/>
+        <location filename="../mainwindow.cpp" line="733"/>
+        <location filename="../mainwindow.cpp" line="744"/>
+        <source>Companion - Models and Settings Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="350"/>
         <source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
@@ -1468,12 +1473,6 @@ Are you sure ?</source>
         <source>Compilation server too busy, try later</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="359"/>
-        <location filename="../mainwindow.cpp" line="399"/>
-        <source>Compilation server requires registration, please check opentx web site</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="362"/>
         <location filename="../mainwindow.cpp" line="402"/>
@@ -1486,256 +1485,231 @@ Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="488"/>
-        <location filename="../mainwindow.cpp" line="517"/>
+        <location filename="../mainwindow.cpp" line="489"/>
+        <location filename="../mainwindow.cpp" line="518"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="489"/>
-        <location filename="../mainwindow.cpp" line="518"/>
+        <location filename="../mainwindow.cpp" line="490"/>
+        <location filename="../mainwindow.cpp" line="519"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="491"/>
-        <location filename="../mainwindow.cpp" line="520"/>
+        <location filename="../mainwindow.cpp" line="492"/>
+        <location filename="../mainwindow.cpp" line="521"/>
         <source>Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="499"/>
-        <location filename="../mainwindow.cpp" line="529"/>
+        <location filename="../mainwindow.cpp" line="500"/>
+        <location filename="../mainwindow.cpp" line="530"/>
         <source>Do you want to download release %1 now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="516"/>
+        <location filename="../mainwindow.cpp" line="517"/>
         <source>A new version of %1 firmware is available (current %2 - newer %3).
 Do you want to download it now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="546"/>
+        <location filename="../mainwindow.cpp" line="547"/>
         <source>Ignore this version (r%1)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="556"/>
+        <location filename="../mainwindow.cpp" line="557"/>
         <source>Release notes contain very important informations. Do you want to see them now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Firmware updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="770"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>Current firmware does not provide release notes informations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="902"/>
+        <location filename="../mainwindow.cpp" line="903"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished">Не удается записать файл %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Taranis radio not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1046"/>
-        <location filename="../mainwindow.cpp" line="1103"/>
-        <location filename="../mainwindow.cpp" line="1153"/>
-        <location filename="../mainwindow.cpp" line="1175"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
+        <location filename="../mainwindow.cpp" line="1104"/>
+        <location filename="../mainwindow.cpp" line="1154"/>
+        <location filename="../mainwindow.cpp" line="1176"/>
         <source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1079"/>
+        <location filename="../mainwindow.cpp" line="1080"/>
         <source>Write Models and settings from %1 to the Tx?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>Backup is impossible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1089"/>
-        <location filename="../mainwindow.cpp" line="1344"/>
-        <location filename="../mainwindow.cpp" line="1391"/>
+        <location filename="../mainwindow.cpp" line="1090"/>
+        <location filename="../mainwindow.cpp" line="1345"/>
+        <location filename="../mainwindow.cpp" line="1392"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>Warning</source>
         <translation type="unfinished">Звук</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Conversion failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Restore failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Backup failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1493"/>
+        <location filename="../mainwindow.cpp" line="1494"/>
         <source>Version %1 (revision %2), %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1494"/>
-        <source>The companion9x project was originally forked from eePe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1499"/>
-        <source>About companion9x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1602"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>&amp;loadBackup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1603"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>Load backup from file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Lo&amp;gs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Open log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
-        <source>Check for new version of companion9x/er9x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1629"/>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Contributors &amp;List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1630"/>
-        <source>Show companion9x contributors list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>ChangeLog...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
-        <source>Show companion9x changelog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Firmware ChangeLog...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Show firmware changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Compare...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Compare models</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1646"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Customize your &amp;TX...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Customize the splash screen of your TX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1653"/>
         <source>E&amp;xit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1655"/>
         <source>Exit the application</source>
         <translation>Выйти из программы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1659"/>
         <source>Cu&amp;t</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1661"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Вырезать выделение в буфер обмена</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
         <source>&amp;Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1667"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Копировать выделение в буфер обмена</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1671"/>
         <source>&amp;Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1673"/>
         <source>Paste the clipboard&apos;s contents into the current selection</source>
         <translation>Вставить выделение из буфера обмена</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1704"/>
+        <location filename="../mainwindow.cpp" line="1705"/>
         <source>Configure software for reading from and writing to the transmitter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1744,7 +1718,7 @@ Do you want to download it now ?</source>
         <translation type="obsolete">Записать EEPROM в TX</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1678"/>
+        <location filename="../mainwindow.cpp" line="1679"/>
         <source>Ctrl+Alt+W</source>
         <translation></translation>
     </message>
@@ -1757,7 +1731,7 @@ Do you want to download it now ?</source>
         <translation type="obsolete">Считать EEPROM из TX</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1683"/>
+        <location filename="../mainwindow.cpp" line="1684"/>
         <source>Ctrl+Alt+R</source>
         <translation></translation>
     </message>
@@ -1798,7 +1772,7 @@ Do you want to download it now ?</source>
         <translation type="obsolete">Считать прошивку из передатчика</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1703"/>
+        <location filename="../mainwindow.cpp" line="1704"/>
         <source>&amp;Configure...</source>
         <translation type="unfinished">Настройка</translation>
     </message>
@@ -1807,148 +1781,148 @@ Do you want to download it now ?</source>
         <translation type="obsolete">Настроить программатор</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1708"/>
+        <location filename="../mainwindow.cpp" line="1709"/>
         <source>&amp;List programmers</source>
         <translation>Список программаторов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1709"/>
+        <location filename="../mainwindow.cpp" line="1710"/>
         <source>List available programmers</source>
         <translation>Показать список программаторов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1712"/>
+        <location filename="../mainwindow.cpp" line="1713"/>
         <source>&amp;Fuses...</source>
         <translation>Фьюзы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1713"/>
+        <location filename="../mainwindow.cpp" line="1714"/>
         <source>Show fuses dialog</source>
         <translation>Показать диалог установки фьюзов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1716"/>
+        <location filename="../mainwindow.cpp" line="1717"/>
         <source>&amp;Simulate</source>
         <translation>Симуляция</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1717"/>
+        <location filename="../mainwindow.cpp" line="1718"/>
         <source>Alt+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1718"/>
+        <location filename="../mainwindow.cpp" line="1719"/>
         <source>Simulate selected model.</source>
         <translation>Запустить симуляцию</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1722"/>
+        <location filename="../mainwindow.cpp" line="1723"/>
         <source>&amp;Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1723"/>
+        <location filename="../mainwindow.cpp" line="1724"/>
         <source>Ctrl+P</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1724"/>
+        <location filename="../mainwindow.cpp" line="1725"/>
         <source>Print current model.</source>
         <translation>Распечатать текущую модель</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1728"/>
+        <location filename="../mainwindow.cpp" line="1729"/>
         <source>Cl&amp;ose</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1729"/>
+        <location filename="../mainwindow.cpp" line="1730"/>
         <source>Close the active window</source>
         <translation>Закрыть активное окно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1733"/>
+        <location filename="../mainwindow.cpp" line="1734"/>
         <source>Close &amp;All</source>
         <translation>Закрыть все</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1734"/>
+        <location filename="../mainwindow.cpp" line="1735"/>
         <source>Close all the windows</source>
         <translation>Закрыть все окна</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1738"/>
+        <location filename="../mainwindow.cpp" line="1739"/>
         <source>&amp;Tile</source>
         <translation>Мозаика</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1739"/>
+        <location filename="../mainwindow.cpp" line="1740"/>
         <source>Tile the windows</source>
         <translation>Расположить окна мозаикой</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1742"/>
+        <location filename="../mainwindow.cpp" line="1743"/>
         <source>&amp;Cascade</source>
         <translation>Каскад</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1743"/>
+        <location filename="../mainwindow.cpp" line="1744"/>
         <source>Cascade the windows</source>
         <translation>Разместить окна каскадом</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
+        <location filename="../mainwindow.cpp" line="1747"/>
         <source>Ne&amp;xt</source>
         <translation>Следующее</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1748"/>
+        <location filename="../mainwindow.cpp" line="1749"/>
         <source>Move the focus to the next window</source>
         <translation>Переместить фокус на следующее окно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1752"/>
+        <location filename="../mainwindow.cpp" line="1753"/>
         <source>Pre&amp;vious</source>
         <translation>Предыдущее</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1754"/>
+        <location filename="../mainwindow.cpp" line="1755"/>
         <source>Move the focus to the previous window</source>
         <translation>Переместить фокус на предыдущее окно</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1762"/>
+        <location filename="../mainwindow.cpp" line="1763"/>
         <source>&amp;About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1763"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
         <source>Show the application&apos;s About box</source>
         <translation>Показать окно &quot;О программе&quot;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1787"/>
-        <location filename="../mainwindow.cpp" line="1881"/>
+        <location filename="../mainwindow.cpp" line="1788"/>
+        <location filename="../mainwindow.cpp" line="1882"/>
         <source>Recent Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1820"/>
+        <location filename="../mainwindow.cpp" line="1821"/>
         <source>&amp;Read/Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1916"/>
+        <location filename="../mainwindow.cpp" line="1917"/>
         <source>Write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2066"/>
+        <location filename="../mainwindow.cpp" line="2067"/>
         <source>Unable to find file %1!</source>
         <translation type="unfinished">Невозможно найти файл %1!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2124"/>
+        <location filename="../mainwindow.cpp" line="2125"/>
         <source>Error reading file %1:
 %2.</source>
         <translation type="unfinished">Ошибка при считывании файла %1:
@@ -1959,227 +1933,253 @@ Do you want to download it now ?</source>
         <translation type="obsolete">Авторы</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1767"/>
+        <location filename="../mainwindow.cpp" line="1768"/>
         <source>Switch layout Left/Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1790"/>
+        <location filename="../mainwindow.cpp" line="1791"/>
         <source>&amp;File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1766"/>
+        <location filename="../mainwindow.cpp" line="1767"/>
         <source>Switch layout direction</source>
         <translation>Зеркало</translation>
     </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="106"/>
-        <location filename="../mainwindow.cpp" line="721"/>
-        <location filename="../mainwindow.cpp" line="741"/>
-        <source>companion9x - Models and Settings Editor - %1 - profile %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="108"/>
-        <location filename="../mainwindow.cpp" line="715"/>
-        <location filename="../mainwindow.cpp" line="732"/>
-        <location filename="../mainwindow.cpp" line="743"/>
-        <source>companion9x - Models and Settings Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="224"/>
         <source>Checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="260"/>
+        <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="281"/>
+        <source>A new release of Companion is available please check the repository</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="359"/>
+        <location filename="../mainwindow.cpp" line="399"/>
+        <source>Compilation server requires registration, please check OpenTX web site</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="430"/>
         <source>Do you want to write the firmware to the transmitter now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="487"/>
+        <location filename="../mainwindow.cpp" line="488"/>
         <source>Firmware %1 does not seem to have ever been downloaded.
 Version %2 is available.
 Do you want to download it now ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1051"/>
-        <location filename="../mainwindow.cpp" line="1058"/>
-        <location filename="../mainwindow.cpp" line="1427"/>
-        <location filename="../mainwindow.cpp" line="1434"/>
+        <location filename="../mainwindow.cpp" line="1052"/>
+        <location filename="../mainwindow.cpp" line="1059"/>
+        <location filename="../mainwindow.cpp" line="1428"/>
+        <location filename="../mainwindow.cpp" line="1435"/>
         <source>Read Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1082"/>
+        <location filename="../mainwindow.cpp" line="1083"/>
         <source>The file %1
 has not been recognized as a valid Models and Settings file
 Write anyway ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1108"/>
-        <location filename="../mainwindow.cpp" line="1115"/>
-        <location filename="../mainwindow.cpp" line="1158"/>
-        <location filename="../mainwindow.cpp" line="1165"/>
-        <location filename="../mainwindow.cpp" line="1357"/>
-        <location filename="../mainwindow.cpp" line="1399"/>
+        <location filename="../mainwindow.cpp" line="1109"/>
+        <location filename="../mainwindow.cpp" line="1116"/>
+        <location filename="../mainwindow.cpp" line="1159"/>
+        <location filename="../mainwindow.cpp" line="1166"/>
+        <location filename="../mainwindow.cpp" line="1358"/>
+        <location filename="../mainwindow.cpp" line="1400"/>
         <source>Backup Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1131"/>
+        <location filename="../mainwindow.cpp" line="1132"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1138"/>
+        <location filename="../mainwindow.cpp" line="1139"/>
         <source>The transmitter firmware belongs to another product family, check file and preferences!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1140"/>
+        <location filename="../mainwindow.cpp" line="1141"/>
         <source>The transmitter firmware is outdated, please upgrade!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1180"/>
+        <location filename="../mainwindow.cpp" line="1181"/>
         <source>Write Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1363"/>
-        <location filename="../mainwindow.cpp" line="1406"/>
+        <location filename="../mainwindow.cpp" line="1364"/>
+        <location filename="../mainwindow.cpp" line="1407"/>
         <source>Write Firmware To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1369"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Cannot convert Models and Settings for use with this firmware, original data will be used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1375"/>
         <source>Restore Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1378"/>
+        <location filename="../mainwindow.cpp" line="1379"/>
         <source>Could not restore Models and Settings to TX. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Firmware write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1381"/>
+        <location filename="../mainwindow.cpp" line="1382"/>
         <source>Could not write firmware to to transmitter. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1385"/>
         <source>Cannot backup existing Models and Settings from TX. Firmware write process aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1416"/>
+        <location filename="../mainwindow.cpp" line="1417"/>
         <source>Save transmitter Models and Settings to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1422"/>
+        <location filename="../mainwindow.cpp" line="1423"/>
         <source>Impossible to identify the radio on your system, please verify that the eeprom disk is connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1444"/>
+        <location filename="../mainwindow.cpp" line="1445"/>
         <source>Read Tx Firmware to File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1677"/>
+        <location filename="../mainwindow.cpp" line="1495"/>
+        <source>The Companion project was originally forked from eePe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1500"/>
+        <source>About Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Check for new version of Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1631"/>
+        <source>Show Companion contributors list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1635"/>
+        <source>Show Companion changelog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1678"/>
         <source>&amp;Write Models and Settings To Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1679"/>
+        <location filename="../mainwindow.cpp" line="1680"/>
         <source>Write Models and Settings to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1682"/>
+        <location filename="../mainwindow.cpp" line="1683"/>
         <source>&amp;Read Models and Settings From Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1684"/>
+        <location filename="../mainwindow.cpp" line="1685"/>
         <source>Read Models and Settings from transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
+        <location filename="../mainwindow.cpp" line="1688"/>
         <source>Write Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1688"/>
+        <location filename="../mainwindow.cpp" line="1689"/>
         <source>Write firmware to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1691"/>
+        <location filename="../mainwindow.cpp" line="1692"/>
         <source>Write Models and Settings from file to Tx</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1692"/>
+        <location filename="../mainwindow.cpp" line="1693"/>
         <source>Write Models and Settings from file to transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1695"/>
+        <location filename="../mainwindow.cpp" line="1696"/>
         <source>Save transmitter Models and Settings to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1696"/>
+        <location filename="../mainwindow.cpp" line="1697"/>
         <source>Save the Models and Settings from the transmitter to a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1699"/>
+        <location filename="../mainwindow.cpp" line="1700"/>
         <source>Read Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1700"/>
+        <location filename="../mainwindow.cpp" line="1701"/>
         <source>Read firmware from transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1788"/>
-        <location filename="../mainwindow.cpp" line="1891"/>
+        <location filename="../mainwindow.cpp" line="1789"/>
+        <location filename="../mainwindow.cpp" line="1892"/>
         <source>Firmware Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1815"/>
+        <location filename="../mainwindow.cpp" line="1816"/>
         <source>&amp;Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2103"/>
-        <location filename="../mainwindow.cpp" line="2109"/>
+        <location filename="../mainwindow.cpp" line="2104"/>
+        <location filename="../mainwindow.cpp" line="2110"/>
         <source>Invalid Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2128"/>
+        <location filename="../mainwindow.cpp" line="2129"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2188,22 +2188,22 @@ Write anyway ?</source>
         <translation type="obsolete">Запись</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1838"/>
+        <location filename="../mainwindow.cpp" line="1839"/>
         <source>&amp;Window</source>
         <translation>Окна</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1844"/>
+        <location filename="../mainwindow.cpp" line="1845"/>
         <source>&amp;Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1874"/>
+        <location filename="../mainwindow.cpp" line="1875"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1911"/>
+        <location filename="../mainwindow.cpp" line="1912"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
@@ -2212,12 +2212,12 @@ Write anyway ?</source>
         <translation type="obsolete">Запись</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1928"/>
+        <location filename="../mainwindow.cpp" line="1929"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1935"/>
+        <location filename="../mainwindow.cpp" line="1936"/>
         <source>Ready</source>
         <translation>Готово</translation>
     </message>
@@ -2321,6 +2321,13 @@ Write anyway ?</source>
         <source>Do you want to use model wizard? </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mdichild.cpp" line="182"/>
+        <location filename="../mdichild.cpp" line="187"/>
+        <location filename="../mdichild.cpp" line="470"/>
+        <source>Companion</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mdichild.cpp" line="187"/>
         <source>Ask this question again ? </source>
@@ -2422,13 +2429,6 @@ Write anyway ?</source>
         <source>Invalid binary backup File %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../mdichild.cpp" line="182"/>
-        <location filename="../mdichild.cpp" line="187"/>
-        <location filename="../mdichild.cpp" line="470"/>
-        <source>companion9x</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mdichild.cpp" line="471"/>
         <source>%1 has been modified.
@@ -7506,11 +7506,11 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
     </message>
     <message>
         <location filename="../warnings.h" line="5"/>
-        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
+        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
 
-We are really sensible to that!
+We are really appreciative for that!
 
-The openTX/C9X Team.</source>
+The OpenTX/Companion Team.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7840,7 +7840,7 @@ Please only use this if you know what you are doing.  There are no error checks
     <message>
         <location filename="../burnconfigdialog.cpp" line="328"/>
         <location filename="../burnconfigdialog.cpp" line="397"/>
-        <source>companion9x</source>
+        <source>Companion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7915,6 +7915,11 @@ m2560 for v4.1 boards</source>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../burndialog.ui" line="276"/>
+        <source>Allows Companion to write to older version of the firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burndialog.ui" line="289"/>
         <source>Backup and restore Models and Settings</source>
@@ -7961,11 +7966,6 @@ m2560 for v4.1 boards</source>
         <source>Variant</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../burndialog.ui" line="276"/>
-        <source>Allows companion9x to write to older version of the firmware</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../burndialog.ui" line="279"/>
         <source>Check Firmware compatibility</source>
@@ -8743,27 +8743,27 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../contributorsdialog.cpp" line="29"/>
         <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
-of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
-companion9x was forked out.</source>
+of course. Also to Erez Raviv (er9x) and the fantastic eePe program 
+which was the staring point for OpenTX Companion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="31"/>
+        <location filename="../contributorsdialog.cpp" line="46"/>
+        <source>Companion Release Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contributorsdialog.cpp" line="32"/>
         <source>Thank you all !!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="34"/>
+        <location filename="../contributorsdialog.cpp" line="35"/>
         <source>Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contributorsdialog.cpp" line="45"/>
-        <source>Companion9x Release Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contributorsdialog.cpp" line="50"/>
+        <location filename="../contributorsdialog.cpp" line="51"/>
         <source>OpenTX Release Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8920,7 +8920,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../downloaddialog.cpp" line="54"/>
-        <source>companion9x</source>
+        <source>Companion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9247,7 +9247,7 @@ Press cancel to abort joystick calibration</source>
     <name>logsDialog</name>
     <message>
         <location filename="../logsdialog.ui" line="14"/>
-        <source>Companion9x log viewer</source>
+        <source>Companion Log Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9261,47 +9261,59 @@ Press cancel to abort joystick calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="131"/>
+        <location filename="../logsdialog.ui" line="94"/>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="138"/>
+        <location filename="../logsdialog.ui" line="101"/>
         <source>X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="145"/>
+        <location filename="../logsdialog.ui" line="108"/>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="169"/>
+        <location filename="../logsdialog.ui" line="132"/>
         <source>Fly sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="22"/>
+        <location filename="../logsdialog.cpp" line="27"/>
         <source>Telemetry logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="23"/>
+        <location filename="../logsdialog.cpp" line="28"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="395"/>
+        <location filename="../logsdialog.cpp" line="252"/>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="253"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation type="unfinished">Не удается записать файл %1:
+%2.</translation>
+    </message>
+    <message>
+        <location filename="../logsdialog.cpp" line="582"/>
         <source>Select your log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="406"/>
+        <location filename="../logsdialog.cpp" line="593"/>
         <source>Available fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="501"/>
+        <location filename="../logsdialog.cpp" line="690"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9759,7 +9771,7 @@ Press cancel to abort joystick calibration</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="506"/>
+        <location filename="../preferencesdialog.ui" line="650"/>
         <source>Language (requires restart)</source>
         <translation>Язык (треб. перезапуск)</translation>
     </message>
@@ -9769,23 +9781,23 @@ Press cancel to abort joystick calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="883"/>
-        <location filename="../preferencesdialog.ui" line="924"/>
+        <location filename="../preferencesdialog.ui" line="914"/>
+        <location filename="../preferencesdialog.ui" line="955"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="676"/>
+        <location filename="../preferencesdialog.ui" line="707"/>
         <source>Default Channel Order</source>
         <translation>Порядок следов. каналов</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="663"/>
+        <location filename="../preferencesdialog.ui" line="694"/>
         <source>Default Stick Mode</source>
         <translation>Режим стиков</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="525"/>
+        <location filename="../preferencesdialog.ui" line="292"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
@@ -9794,17 +9806,17 @@ This is used by the templated to determine which channel goes to what number out
 Шаблон для определения порядка следования каналов.</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="353"/>
+        <location filename="../preferencesdialog.ui" line="497"/>
         <source>FwInfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="273"/>
+        <location filename="../preferencesdialog.ui" line="51"/>
         <source>Show Splash Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="686"/>
+        <location filename="../preferencesdialog.ui" line="717"/>
         <source>Mode selection:
 
 Mode 1:
@@ -9827,117 +9839,127 @@ Mode 4:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="711"/>
+        <location filename="../preferencesdialog.ui" line="742"/>
         <source>Mode 1 (RUD ELE THR AIL)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="716"/>
+        <location filename="../preferencesdialog.ui" line="747"/>
         <source>Mode 2 (RUD THR ELE AIL)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="721"/>
+        <location filename="../preferencesdialog.ui" line="752"/>
         <source>Mode 3 (AIL ELE THR RUD)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="726"/>
+        <location filename="../preferencesdialog.ui" line="757"/>
         <source>Mode 4 (AIL THR ELE RUD)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="790"/>
+        <location filename="../preferencesdialog.ui" line="821"/>
         <source>Automatic Backup Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="846"/>
+        <location filename="../preferencesdialog.ui" line="877"/>
         <source>Automatically add version number to the filename after download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="870"/>
+        <location filename="../preferencesdialog.ui" line="901"/>
         <source>Voice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="890"/>
+        <location filename="../preferencesdialog.ui" line="921"/>
         <source>Set language of voice.
 May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="964"/>
+        <location filename="../preferencesdialog.ui" line="995"/>
         <source>Firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="70"/>
+        <location filename="../preferencesdialog.ui" line="1616"/>
+        <source>Find Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="1625"/>
+        <source>Google Earth Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.ui" line="83"/>
         <source>Check for updates on startup</source>
         <translation>Проверять обновления</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="148"/>
-        <location filename="../preferencesdialog.ui" line="215"/>
+        <location filename="../preferencesdialog.ui" line="161"/>
+        <location filename="../preferencesdialog.ui" line="228"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="773"/>
+        <location filename="../preferencesdialog.ui" line="804"/>
         <source>Splash library behaviour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="754"/>
+        <location filename="../preferencesdialog.ui" line="785"/>
         <source>Include companion splashes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="759"/>
+        <location filename="../preferencesdialog.ui" line="790"/>
         <source>Only user defined splashes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="286"/>
+        <location filename="../preferencesdialog.ui" line="430"/>
         <source>Custom TX splash screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="375"/>
+        <location filename="../preferencesdialog.ui" line="519"/>
         <source>Personal splash library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="740"/>
+        <location filename="../preferencesdialog.ui" line="771"/>
         <source>Joystick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="326"/>
-        <location filename="../preferencesdialog.ui" line="806"/>
-        <location filename="../preferencesdialog.ui" line="941"/>
-        <location filename="../preferencesdialog.ui" line="1008"/>
+        <location filename="../preferencesdialog.ui" line="470"/>
+        <location filename="../preferencesdialog.ui" line="662"/>
+        <location filename="../preferencesdialog.ui" line="837"/>
+        <location filename="../preferencesdialog.ui" line="972"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="977"/>
+        <location filename="../preferencesdialog.ui" line="1008"/>
         <source>SD Structure path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="987"/>
+        <location filename="../preferencesdialog.ui" line="1018"/>
         <source>Processor ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="996"/>
+        <location filename="../preferencesdialog.ui" line="1027"/>
         <source>Simulator capture folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="1025"/>
+        <location filename="../preferencesdialog.ui" line="679"/>
         <source>Use clipboard only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9988,201 +10010,206 @@ May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="360"/>
+        <location filename="../preferencesdialog.ui" line="504"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="908"/>
+        <location filename="../preferencesdialog.ui" line="939"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="488"/>
+        <location filename="../preferencesdialog.ui" line="632"/>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="454"/>
+        <location filename="../preferencesdialog.ui" line="598"/>
         <source>Export Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="461"/>
+        <location filename="../preferencesdialog.ui" line="605"/>
         <source>Save Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="478"/>
+        <location filename="../preferencesdialog.ui" line="622"/>
         <source>Import Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="58"/>
+        <location filename="../preferencesdialog.ui" line="71"/>
         <source>Simu BackLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="80"/>
+        <location filename="../preferencesdialog.ui" line="93"/>
         <source>Check for selected Fw updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="92"/>
+        <location filename="../preferencesdialog.ui" line="105"/>
         <source>Ask use of wizard for new models</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="164"/>
+        <location filename="../preferencesdialog.ui" line="177"/>
         <source>Remember switches in simulator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="172"/>
+        <location filename="../preferencesdialog.ui" line="185"/>
         <source>Blue</source>
         <oldsource>Blu</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="177"/>
+        <location filename="../preferencesdialog.ui" line="190"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="182"/>
+        <location filename="../preferencesdialog.ui" line="195"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="187"/>
+        <location filename="../preferencesdialog.ui" line="200"/>
         <source>Orange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="192"/>
+        <location filename="../preferencesdialog.ui" line="205"/>
         <source>Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="783"/>
+        <location filename="../preferencesdialog.ui" line="814"/>
         <source>Profile slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="813"/>
+        <location filename="../preferencesdialog.ui" line="844"/>
         <source>auto backup before write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="433"/>
+        <location filename="../preferencesdialog.ui" line="577"/>
         <source>Ask for flashing after Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="295"/>
+        <location filename="../preferencesdialog.ui" line="439"/>
         <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="312"/>
+        <location filename="../preferencesdialog.ui" line="456"/>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="232"/>
+        <location filename="../preferencesdialog.ui" line="245"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="141"/>
+        <location filename="../preferencesdialog.ui" line="154"/>
         <source>Invert Pixels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="227"/>
+        <location filename="../preferencesdialog.cpp" line="233"/>
         <source>Last downloaded release: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="236"/>
-        <source>The selected firmware has never been downloaded by companion9x.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferencesdialog.cpp" line="240"/>
-        <source>The selected firmware cannot be downloaded by companion9x.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../preferencesdialog.cpp" line="447"/>
+        <location filename="../preferencesdialog.cpp" line="461"/>
         <source>Image stored in settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="458"/>
-        <location filename="../preferencesdialog.cpp" line="780"/>
+        <location filename="../preferencesdialog.cpp" line="472"/>
+        <location filename="../preferencesdialog.cpp" line="804"/>
         <source>No joysticks found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="542"/>
+        <location filename="../preferencesdialog.cpp" line="556"/>
         <source>Select your snapshot folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="569"/>
+        <location filename="../preferencesdialog.cpp" line="583"/>
         <source>Select your Models and Settings backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="597"/>
+        <location filename="../preferencesdialog.cpp" line="594"/>
+        <source>Select Google Earth executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="620"/>
         <source>Select the folder replicating your SD structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="641"/>
+        <location filename="../preferencesdialog.cpp" line="664"/>
         <source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="677"/>
+        <location filename="../preferencesdialog.cpp" line="701"/>
         <source>Export profile As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="699"/>
+        <location filename="../preferencesdialog.cpp" line="723"/>
         <source>Profile slot is not empty, profile slot %1 will we overwritten.&lt;br&gt;Are you sure ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="705"/>
+        <location filename="../preferencesdialog.cpp" line="729"/>
         <source>Open Profile to import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Open Image to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="729"/>
+        <location filename="../preferencesdialog.cpp" line="753"/>
         <source>Images (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Error</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="532"/>
+        <location filename="../preferencesdialog.cpp" line="242"/>
+        <source>The selected firmware has never been downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="246"/>
+        <source>The selected firmware cannot be downloaded by Companion.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../preferencesdialog.cpp" line="546"/>
         <source>Select your library folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="585"/>
-        <location filename="../preferencesdialog.cpp" line="735"/>
+        <location filename="../preferencesdialog.cpp" line="608"/>
+        <location filename="../preferencesdialog.cpp" line="759"/>
         <source>Cannot load %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10756,10 +10783,9 @@ May be different from firmware language</source>
 <context>
     <name>simulatorDialog</name>
     <message>
-        <location filename="../simulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
         <oldsource>ER9x Simulator</oldsource>
-        <translation type="unfinished">ER9x Симулятор</translation>
+        <translation type="obsolete">ER9x Симулятор</translation>
     </message>
     <message>
         <location filename="../simulatordialog.ui" line="844"/>
@@ -10879,269 +10905,274 @@ May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1239"/>
+        <location filename="../simulatordialog.ui" line="1240"/>
         <source>Outputs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1854"/>
+        <location filename="../simulatordialog.ui" line="1856"/>
         <source>CSK</source>
         <oldsource>SWK</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1265"/>
+        <location filename="../simulatordialog.ui" line="1266"/>
         <source>CS1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1296"/>
+        <location filename="../simulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../simulatordialog.ui" line="1297"/>
         <source>CS2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1327"/>
+        <location filename="../simulatordialog.ui" line="1328"/>
         <source>CS3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1358"/>
+        <location filename="../simulatordialog.ui" line="1359"/>
         <source>CS4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1389"/>
+        <location filename="../simulatordialog.ui" line="1390"/>
         <source>CS5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1420"/>
+        <location filename="../simulatordialog.ui" line="1421"/>
         <source>CS6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1451"/>
+        <location filename="../simulatordialog.ui" line="1452"/>
         <source>CS7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1482"/>
+        <location filename="../simulatordialog.ui" line="1483"/>
         <source>CS8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1513"/>
+        <location filename="../simulatordialog.ui" line="1514"/>
         <source>CS9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1544"/>
+        <location filename="../simulatordialog.ui" line="1545"/>
         <source>CSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1575"/>
+        <location filename="../simulatordialog.ui" line="1576"/>
         <source>CSB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1606"/>
+        <location filename="../simulatordialog.ui" line="1607"/>
         <source>CSC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1637"/>
+        <location filename="../simulatordialog.ui" line="1638"/>
         <source>CSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1668"/>
+        <location filename="../simulatordialog.ui" line="1669"/>
         <source>CSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1699"/>
+        <location filename="../simulatordialog.ui" line="1700"/>
         <source>CSF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1730"/>
+        <location filename="../simulatordialog.ui" line="1731"/>
         <source>CSG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1761"/>
+        <location filename="../simulatordialog.ui" line="1762"/>
         <source>CSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1792"/>
+        <location filename="../simulatordialog.ui" line="1793"/>
         <source>CSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1823"/>
+        <location filename="../simulatordialog.ui" line="1825"/>
         <source>CSJ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1885"/>
+        <location filename="../simulatordialog.ui" line="1887"/>
         <source>CSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1916"/>
+        <location filename="../simulatordialog.ui" line="1918"/>
         <source>CSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1947"/>
+        <location filename="../simulatordialog.ui" line="1949"/>
         <source>CSN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="1978"/>
+        <location filename="../simulatordialog.ui" line="1980"/>
         <source>CSO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2009"/>
+        <location filename="../simulatordialog.ui" line="2011"/>
         <source>CSP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2040"/>
+        <location filename="../simulatordialog.ui" line="2042"/>
         <source>CSQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2071"/>
+        <location filename="../simulatordialog.ui" line="2073"/>
         <source>CSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2102"/>
+        <location filename="../simulatordialog.ui" line="2104"/>
         <source>CSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2133"/>
+        <location filename="../simulatordialog.ui" line="2135"/>
         <source>CST</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2164"/>
+        <location filename="../simulatordialog.ui" line="2166"/>
         <source>CSU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2195"/>
+        <location filename="../simulatordialog.ui" line="2197"/>
         <source>CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2226"/>
+        <location filename="../simulatordialog.ui" line="2228"/>
         <source>CSW</source>
         <oldsource>SWW</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2307"/>
+        <location filename="../simulatordialog.ui" line="2310"/>
         <source>CH1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2419"/>
+        <location filename="../simulatordialog.ui" line="2422"/>
         <source>CH9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2432"/>
+        <location filename="../simulatordialog.ui" line="2435"/>
         <source>CH2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2599"/>
+        <location filename="../simulatordialog.ui" line="2602"/>
         <source>CH10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2612"/>
+        <location filename="../simulatordialog.ui" line="2615"/>
         <source>CH3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2779"/>
+        <location filename="../simulatordialog.ui" line="2782"/>
         <source>CH11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2792"/>
+        <location filename="../simulatordialog.ui" line="2795"/>
         <source>CH4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2959"/>
+        <location filename="../simulatordialog.ui" line="2962"/>
         <source>CH12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2972"/>
+        <location filename="../simulatordialog.ui" line="2975"/>
         <source>CH5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3133"/>
+        <location filename="../simulatordialog.ui" line="3136"/>
         <source>CH13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3146"/>
+        <location filename="../simulatordialog.ui" line="3149"/>
         <source>CH6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3258"/>
+        <location filename="../simulatordialog.ui" line="3261"/>
         <source>CH14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3271"/>
+        <location filename="../simulatordialog.ui" line="3274"/>
         <source>CH7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3438"/>
+        <location filename="../simulatordialog.ui" line="3441"/>
         <source>CH15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3451"/>
+        <location filename="../simulatordialog.ui" line="3454"/>
         <source>CH8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="3618"/>
+        <location filename="../simulatordialog.ui" line="3621"/>
         <source>CH16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="2326"/>
-        <location filename="../simulatordialog.ui" line="2348"/>
-        <location filename="../simulatordialog.ui" line="2506"/>
-        <location filename="../simulatordialog.ui" line="2528"/>
-        <location filename="../simulatordialog.ui" line="2686"/>
-        <location filename="../simulatordialog.ui" line="2708"/>
-        <location filename="../simulatordialog.ui" line="2866"/>
-        <location filename="../simulatordialog.ui" line="2888"/>
-        <location filename="../simulatordialog.ui" line="3040"/>
-        <location filename="../simulatordialog.ui" line="3062"/>
-        <location filename="../simulatordialog.ui" line="3165"/>
-        <location filename="../simulatordialog.ui" line="3187"/>
-        <location filename="../simulatordialog.ui" line="3345"/>
-        <location filename="../simulatordialog.ui" line="3367"/>
-        <location filename="../simulatordialog.ui" line="3525"/>
-        <location filename="../simulatordialog.ui" line="3547"/>
+        <location filename="../simulatordialog.ui" line="2329"/>
+        <location filename="../simulatordialog.ui" line="2351"/>
+        <location filename="../simulatordialog.ui" line="2509"/>
+        <location filename="../simulatordialog.ui" line="2531"/>
+        <location filename="../simulatordialog.ui" line="2689"/>
+        <location filename="../simulatordialog.ui" line="2711"/>
+        <location filename="../simulatordialog.ui" line="2869"/>
+        <location filename="../simulatordialog.ui" line="2891"/>
+        <location filename="../simulatordialog.ui" line="3043"/>
+        <location filename="../simulatordialog.ui" line="3065"/>
+        <location filename="../simulatordialog.ui" line="3168"/>
+        <location filename="../simulatordialog.ui" line="3190"/>
+        <location filename="../simulatordialog.ui" line="3348"/>
+        <location filename="../simulatordialog.ui" line="3370"/>
+        <location filename="../simulatordialog.ui" line="3528"/>
+        <location filename="../simulatordialog.ui" line="3550"/>
         <source>-100.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11219,9 +11250,8 @@ May be different from firmware language</source>
 <context>
     <name>xsimulatorDialog</name>
     <message>
-        <location filename="../xsimulatordialog.ui" line="26"/>
         <source>Companion9x Simulator</source>
-        <translation type="unfinished">ER9x Симулятор</translation>
+        <translation type="obsolete">ER9x Симулятор</translation>
     </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="1089"/>
@@ -11328,6 +11358,11 @@ May be different from firmware language</source>
         <source>S2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../xsimulatordialog.ui" line="26"/>
+        <source>Companion Simulator</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../xsimulatordialog.ui" line="480"/>
         <location filename="../xsimulatordialog.ui" line="595"/>
@@ -11358,16 +11393,16 @@ May be different from firmware language</source>
         <location filename="../xsimulatordialog.ui" line="1772"/>
         <location filename="../xsimulatordialog.ui" line="1930"/>
         <location filename="../xsimulatordialog.ui" line="1952"/>
-        <location filename="../xsimulatordialog.ui" line="2110"/>
-        <location filename="../xsimulatordialog.ui" line="2132"/>
-        <location filename="../xsimulatordialog.ui" line="2284"/>
-        <location filename="../xsimulatordialog.ui" line="2306"/>
-        <location filename="../xsimulatordialog.ui" line="2409"/>
-        <location filename="../xsimulatordialog.ui" line="2431"/>
-        <location filename="../xsimulatordialog.ui" line="2589"/>
-        <location filename="../xsimulatordialog.ui" line="2611"/>
-        <location filename="../xsimulatordialog.ui" line="2769"/>
-        <location filename="../xsimulatordialog.ui" line="2791"/>
+        <location filename="../xsimulatordialog.ui" line="2111"/>
+        <location filename="../xsimulatordialog.ui" line="2133"/>
+        <location filename="../xsimulatordialog.ui" line="2285"/>
+        <location filename="../xsimulatordialog.ui" line="2307"/>
+        <location filename="../xsimulatordialog.ui" line="2410"/>
+        <location filename="../xsimulatordialog.ui" line="2432"/>
+        <location filename="../xsimulatordialog.ui" line="2590"/>
+        <location filename="../xsimulatordialog.ui" line="2612"/>
+        <location filename="../xsimulatordialog.ui" line="2770"/>
+        <location filename="../xsimulatordialog.ui" line="2792"/>
         <source>-100.1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11402,207 +11437,207 @@ May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2203"/>
+        <location filename="../xsimulatordialog.ui" line="2204"/>
         <source>CH12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2216"/>
+        <location filename="../xsimulatordialog.ui" line="2217"/>
         <source>CH5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2377"/>
+        <location filename="../xsimulatordialog.ui" line="2378"/>
         <source>CH13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2390"/>
+        <location filename="../xsimulatordialog.ui" line="2391"/>
         <source>CH6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2502"/>
+        <location filename="../xsimulatordialog.ui" line="2503"/>
         <source>CH14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2515"/>
+        <location filename="../xsimulatordialog.ui" line="2516"/>
         <source>CH7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2682"/>
+        <location filename="../xsimulatordialog.ui" line="2683"/>
         <source>CH15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2695"/>
+        <location filename="../xsimulatordialog.ui" line="2696"/>
         <source>CH8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2862"/>
+        <location filename="../xsimulatordialog.ui" line="2863"/>
         <source>CH16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2896"/>
+        <location filename="../xsimulatordialog.ui" line="2897"/>
         <source>CSK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2927"/>
+        <location filename="../xsimulatordialog.ui" line="2928"/>
         <source>CSC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2958"/>
+        <location filename="../xsimulatordialog.ui" line="2959"/>
         <source>CSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="2989"/>
+        <location filename="../xsimulatordialog.ui" line="2990"/>
         <source>CS7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3020"/>
+        <location filename="../xsimulatordialog.ui" line="3021"/>
         <source>CSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3051"/>
+        <location filename="../xsimulatordialog.ui" line="3052"/>
         <source>CSB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3082"/>
+        <location filename="../xsimulatordialog.ui" line="3083"/>
         <source>CS1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3113"/>
+        <location filename="../xsimulatordialog.ui" line="3114"/>
         <source>CSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3144"/>
+        <location filename="../xsimulatordialog.ui" line="3145"/>
         <source>CSG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3175"/>
+        <location filename="../xsimulatordialog.ui" line="3176"/>
         <source>CSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3206"/>
+        <location filename="../xsimulatordialog.ui" line="3207"/>
         <source>CSF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3237"/>
+        <location filename="../xsimulatordialog.ui" line="3238"/>
         <source>CS8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3268"/>
+        <location filename="../xsimulatordialog.ui" line="3269"/>
         <source>CS9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3299"/>
+        <location filename="../xsimulatordialog.ui" line="3300"/>
         <source>CSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3330"/>
+        <location filename="../xsimulatordialog.ui" line="3331"/>
         <source>CSM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3361"/>
+        <location filename="../xsimulatordialog.ui" line="3362"/>
         <source>CSJ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3392"/>
+        <location filename="../xsimulatordialog.ui" line="3393"/>
         <source>CSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3423"/>
+        <location filename="../xsimulatordialog.ui" line="3424"/>
         <source>CS4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3454"/>
+        <location filename="../xsimulatordialog.ui" line="3455"/>
         <source>CS5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3485"/>
+        <location filename="../xsimulatordialog.ui" line="3486"/>
         <source>CS2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3516"/>
+        <location filename="../xsimulatordialog.ui" line="3517"/>
         <source>CS3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3547"/>
+        <location filename="../xsimulatordialog.ui" line="3548"/>
         <source>CS6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3578"/>
+        <location filename="../xsimulatordialog.ui" line="3579"/>
         <source>CSN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3609"/>
+        <location filename="../xsimulatordialog.ui" line="3610"/>
         <source>CSO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3640"/>
+        <location filename="../xsimulatordialog.ui" line="3641"/>
         <source>CSP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3671"/>
+        <location filename="../xsimulatordialog.ui" line="3672"/>
         <source>CSQ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3702"/>
+        <location filename="../xsimulatordialog.ui" line="3703"/>
         <source>CSR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3733"/>
+        <location filename="../xsimulatordialog.ui" line="3734"/>
         <source>CSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3764"/>
+        <location filename="../xsimulatordialog.ui" line="3765"/>
         <source>CST</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3795"/>
+        <location filename="../xsimulatordialog.ui" line="3796"/>
         <source>CSU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3826"/>
+        <location filename="../xsimulatordialog.ui" line="3827"/>
         <source>CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="3857"/>
+        <location filename="../xsimulatordialog.ui" line="3858"/>
         <source>CSW</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/companion/src/translations/companion9x_sv.ts b/companion/src/translations/companion_sv.ts
similarity index 98%
rename from companion/src/translations/companion9x_sv.ts
rename to companion/src/translations/companion_sv.ts
index c37c3550a..dad124c89 100644
--- a/companion/src/translations/companion9x_sv.ts
+++ b/companion/src/translations/companion_sv.ts
@@ -1211,53 +1211,38 @@ FAI-funktionen kan inte slås av i sändaren.
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.cpp" line="+147"/>
-        <location line="+488"/>
+        <location line="+489"/>
         <location line="+34"/>
         <location line="+1492"/>
         <source>File loaded</source>
         <translation>Filen har laddats</translation>
     </message>
     <message>
-        <location line="-1893"/>
+        <location line="-1894"/>
         <location line="+2"/>
         <location line="+40"/>
-        <location line="+260"/>
+        <location line="+261"/>
         <location line="+2"/>
         <source>Save As</source>
         <translation>Spara Som</translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+258"/>
+        <location line="-288"/>
+        <location line="+259"/>
         <source>No updates available at this time.</source>
         <translation>Inga updateringar finns tillgängliga.</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-298"/>
         <location line="+43"/>
         <location line="+178"/>
-        <location line="+122"/>
+        <location line="+123"/>
         <location line="+4"/>
         <source>Unable to check for updates.</source>
         <translation>Det gick inte att söka efter uppdateringar.</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+615"/>
-        <location line="+20"/>
-        <source>companion9x - Models and Settings Editor - %1 - profile %2</source>
-        <translation>companion9x - Editor för Modeller och Inställningar - %1 - profile %2</translation>
-    </message>
-    <message>
-        <location line="-633"/>
-        <location line="+607"/>
-        <location line="+17"/>
-        <location line="+11"/>
-        <source>companion9x - Models and Settings Editor - %1</source>
-        <translation>companion9x - Editor för Modeller och Inställningar - %1</translation>
-    </message>
-    <message>
-        <location line="-473"/>
+        <location line="-324"/>
         <source>Executable (*.exe)</source>
         <translation>Program (*.exe)</translation>
     </message>
@@ -1272,7 +1257,7 @@ FAI-funktionen kan inte slås av i sändaren.
         <translation>Vill du skriva firmware till sändaren nu?</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+87"/>
         <source>A new version of %1 firmware is available (current %2 - newer %3).
 Do you want to download it now ?</source>
         <translation>En ny version finns tillgänglig av %1 fimware (Din version %2 - Ny version %3).
@@ -1367,12 +1352,7 @@ Vill du ladda ned den nya versionen nu ?</translation>
         <translation>&amp;Sök efter uppdateringar...</translation>
     </message>
     <message>
-        <location line="-1365"/>
-        <source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
-        <translation>An ny version av companion9x finns tillgänglig (version %1)&lt;br&gt;Vill du ladda ned den?</translation>
-    </message>
-    <message>
-        <location line="-87"/>
+        <location line="-1453"/>
         <source>Display previous message again at startup ?</source>
         <translation>Skall föregående varning visas igen vid uppstart ?</translation>
     </message>
@@ -1387,18 +1367,12 @@ Vill du ladda ned den nya versionen nu ?</translation>
         <translation>Tillfälligt fel i byggservern. Försök igen senare</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+40"/>
-        <source>Compilation server requires registration, please check opentx web site</source>
-        <translation>Byggservern kräver registrering. Var god kontrollera openTX webbsida</translation>
-    </message>
-    <message>
-        <location line="-9"/>
+        <location line="+37"/>
         <source>Firmware does not fit in the Tx, due to selected firmware options</source>
         <translation>Firmware får inte rum i minnet på grund av att för många funktioner aktiverats</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+98"/>
         <source>Firmware %1 does not seem to have ever been downloaded.
 Version %2 is available.
 Do you want to download it now ?</source>
@@ -1432,32 +1406,12 @@ Vill du ladda ned den nu ?</translation>
         <translation>Version %1 (revision %2), %3</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>The companion9x project was originally forked from eePe</source>
-        <translation>Ursprungligen grenades companion9x av från eePe</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>If you&apos;ve found this program useful, please support by</source>
         <translation>Om du tycker att programet är användbart så kan du stödja utvecklingen genom att</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>About companion9x</source>
-        <translation>Om companion9x</translation>
-    </message>
-    <message>
-        <location line="+127"/>
-        <source>Check for new version of companion9x/er9x</source>
-        <translation>Sök efter ny version av companion9x/er9x</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Show companion9x contributors list</source>
-        <translation>Visa vilka som bidragit till companion9x</translation>
-    </message>
-    <message>
-        <location line="+16"/>
+        <location line="+151"/>
         <source>Customize your &amp;TX...</source>
         <translation>Sändari&amp;nställningar...</translation>
     </message>
@@ -1668,17 +1622,37 @@ Vill du ladda ned den nu ?</translation>
         <translation>Byt layout-riktning</translation>
     </message>
     <message>
-        <location line="-1542"/>
+        <location line="-1661"/>
+        <location line="+616"/>
+        <location line="+20"/>
+        <source>Companion - Models and Settings Editor - %1 - profile %2</source>
+        <translation>Companion - Editor för Modeller och Inställningar - %1 - profile %2</translation>
+    </message>
+    <message>
+        <location line="-634"/>
+        <location line="+608"/>
+        <location line="+17"/>
+        <location line="+11"/>
+        <source>Companion - Models and Settings Editor - %1</source>
+        <translation>Companion - Editor för Modeller och Inställningar - %1</translation>
+    </message>
+    <message>
+        <location line="-520"/>
         <source>Checking for updates</source>
         <translation>Letar efter uppdateringar</translation>
     </message>
     <message>
-        <location line="+322"/>
+        <location line="+323"/>
         <source>Ignore this version (r%1)?</source>
         <translation>Ladda inte ned versionen (r%1)?</translation>
     </message>
     <message>
-        <location line="+1131"/>
+        <location line="+1088"/>
+        <source>Show Companion changelog</source>
+        <translation>Visa en lista med förändringar av Companion</translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&amp;Write Models and Settings To Tx</source>
         <translation>&amp;Skriv Modeller och Inställningar till sändaren</translation>
     </message>
@@ -1737,14 +1711,6 @@ Vill du ladda ned den nu ?</translation>
         <source>Read firmware from transmitter</source>
         <translation>Läs firmware från sändaren</translation>
     </message>
-    <message>
-        <source>&amp;Configure Communication...</source>
-        <translation type="obsolete">&amp;Kommunikationsinställningar...</translation>
-    </message>
-    <message>
-        <source>Configure software for communication with the transmitter</source>
-        <translation type="obsolete">Inställningar för mjukvaran som kommunicerar med sändaren</translation>
-    </message>
     <message>
         <location line="+115"/>
         <source>&amp;Edit</source>
@@ -1786,7 +1752,7 @@ Vill du ladda ned den nu ?</translation>
         <translation>&amp;Bidragsgivare...</translation>
     </message>
     <message>
-        <location line="-1459"/>
+        <location line="-1460"/>
         <source>Display previous warning again at startup ?</source>
         <translation>SKall föregående varning visas igen vid uppstart ?</translation>
     </message>
@@ -1795,7 +1761,7 @@ Vill du ladda ned den nu ?</translation>
         <location line="+29"/>
         <location line="+11"/>
         <location line="+29"/>
-        <location line="+495"/>
+        <location line="+496"/>
         <location line="+1165"/>
         <location line="+6"/>
         <location line="+8"/>
@@ -1815,19 +1781,14 @@ Vill du ladda ned den nu ?</translation>
 %2.</translation>
     </message>
     <message>
-        <location line="-621"/>
+        <location line="-622"/>
         <source>New release available</source>
         <translation>En ny version finns tillgänglig</translation>
     </message>
-    <message>
-        <location line="+0"/>
-        <source>A new release of companion is available please check the repository</source>
-        <translation>En ny version av companion finns tillgänglig. Kontrollera källkods-repository</translation>
-    </message>
     <message>
         <location line="+57"/>
         <location line="+40"/>
-        <location line="+1694"/>
+        <location line="+1695"/>
         <location line="+8"/>
         <location line="+36"/>
         <source>Error opening file %1:
@@ -1836,7 +1797,7 @@ Vill du ladda ned den nu ?</translation>
 %2.</translation>
     </message>
     <message>
-        <location line="-1723"/>
+        <location line="-1724"/>
         <source>Compilation server termporary failure, try later</source>
         <translation>Tillfälligt fel i byggservern. Försök igen senare</translation>
     </message>
@@ -1853,7 +1814,7 @@ Vill du ladda ned den nu ?</translation>
         <translation>Okänt server-fel. Försök igen senare</translation>
     </message>
     <message>
-        <location line="+1239"/>
+        <location line="+1240"/>
         <source>Compare...</source>
         <translation>Jämför...</translation>
     </message>
@@ -1959,7 +1920,23 @@ Vill du ladda ned den nu ?</translation>
         <translation>Ja</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="-258"/>
+        <source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
+        <translation>An ny version av Companion finns tillgänglig (version %1)&lt;br&gt;Vill du ladda ned den?</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>A new release of Companion is available please check the repository</source>
+        <translation>En ny version av Companion finns tillgänglig. Kontrollera källkods-repository</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <location line="+40"/>
+        <source>Compilation server requires registration, please check OpenTX web site</source>
+        <translation>Byggservern kräver registrering. Var god kontrollera OpenTX webbsida</translation>
+    </message>
+    <message>
+        <location line="+91"/>
         <location line="+29"/>
         <source>No</source>
         <translation>Nej</translation>
@@ -2090,17 +2067,32 @@ Starta skrivningen i alla fall ?</translation>
         <translation>Läs Sändarens Firmware till Fil</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+50"/>
+        <source>The Companion project was originally forked from eePe</source>
+        <translation>Ursprungligen grenades Companion av från eePe</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>About Companion</source>
+        <translation>Om Companion</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Check for new version of Companion</source>
+        <translation>Sök efter ny version av Companion</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show Companion contributors list</source>
+        <translation>Visa vilka som bidragit till Companion</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>ChangeLog...</source>
         <translation>Förändringar...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Show companion9x changelog</source>
-        <translation>Visa en lista med förändringar av companion9x</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Firmware ChangeLog...</source>
         <translation>Firmware-förändringar...</translation>
     </message>
@@ -2218,14 +2210,7 @@ Starta skrivningen i alla fall ?</translation>
         <translation>Ogiltig binär modelldatafil %1</translation>
     </message>
     <message>
-        <location line="-137"/>
-        <location line="+5"/>
-        <location line="+283"/>
-        <source>companion9x</source>
-        <translation>companion9x</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+152"/>
         <source>%1 has been modified.
 Do you want to save your changes?</source>
         <translation>%1 har förändrats.
@@ -2242,7 +2227,14 @@ Vill du spara förändringarna?</translation>
         <translation>Säkerhetskopierin kan ej utföras</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-332"/>
+        <location line="+5"/>
+        <location line="+283"/>
+        <source>Companion</source>
+        <translation>Companion</translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation>Katalog för säkerhetskopiering saknas i inställningarna</translation>
     </message>
@@ -7167,16 +7159,16 @@ eeprom-storleken är 4096, men enbart den första hälften används</translation
     </message>
     <message>
         <location filename="../warnings.h" line="+5"/>
-        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
+        <source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
 
-We are really sensible to that!
+We are really appreciative for that!
 
-The openTX/C9X Team.</source>
-        <translation>Tack för alla donationer, vänliga meddelanden, goda idéer och konstruktiva förslag för att bekosta fortsatt utveckling av openTX/companion9x
+The OpenTX/Companion Team.</source>
+        <translation>Tack för alla donationer, vänliga meddelanden, goda idéer och konstruktiva förslag för att bekosta fortsatt utveckling av OpenTX/Companion
 
-Vi uppkskattar ert stöd!
+Vi uppskattar ert stöd!
 
-Gruppen bakum  openTX/companion9X.</translation>
+Gruppen bakom OpenTX/Companion.</translation>
     </message>
 </context>
 <context>
@@ -7450,12 +7442,6 @@ OBS. Fyll enbart i detta fällt om du är säker på vad du gör. Ingen kontroll
         <source>Select Location</source>
         <translation>Välj sökväg</translation>
     </message>
-    <message>
-        <location line="+71"/>
-        <location line="+69"/>
-        <source>companion9x</source>
-        <translation>companion9x</translation>
-    </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="+20"/>
         <location line="+30"/>
@@ -7473,7 +7459,7 @@ m2560 for v4.1 boards</source>
 m2560 för v4.1-kort</translation>
     </message>
     <message>
-        <location filename="../burnconfigdialog.cpp" line="-68"/>
+        <location filename="../burnconfigdialog.cpp" line="+72"/>
         <source>&lt;b&gt;&lt;u&gt;WARNING!&lt;/u&gt;&lt;/b&gt;&lt;br&gt;This will reset the fuses of  %1 to the factory settings.&lt;br&gt;Writing fuses can mess up your radio.&lt;br&gt;Do this only if you are sure they are wrong!&lt;br&gt;Are you sure you want to continue?</source>
         <translation>&lt;b&gt;&lt;u&gt;VARNING!&lt;/u&gt;&lt;/b&gt;&lt;br&gt;Detta åerställer säkringarna för %1 till deras ursprungliga värden.&lt;br&gt;Att ändra dessa värden kan skapa allvarliga problem med din sändare.&lt;br&gt;Ändra säkringarna  bara om du är helt säker på att de har fel värde!&lt;br&gt;Är du säker på att du vill fortsätta?</translation>
     </message>
@@ -7550,6 +7536,12 @@ m2560 för v4.1-kort</translation>
         <source>AVRDUDE Configuration</source>
         <translation>Inställningar för AVRDUDE</translation>
     </message>
+    <message>
+        <location line="+272"/>
+        <location line="+69"/>
+        <source>Companion</source>
+        <translation>Companion</translation>
+    </message>
 </context>
 <context>
     <name>burnDialog</name>
@@ -7569,7 +7561,12 @@ m2560 för v4.1-kort</translation>
         <translation>Subversion</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+63"/>
+        <source>Allows Companion to write to older version of the firmware</source>
+        <translation>Tillåter Companon att skriva till äldre firmware-versioner</translation>
+    </message>
+    <message>
+        <location line="+170"/>
         <source>Load Image</source>
         <translation>Ladda Bild</translation>
     </message>
@@ -7748,12 +7745,7 @@ m2560 för v4.1-kort</translation>
         <translation>Välj fil</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>Allows companion9x to write to older version of the firmware</source>
-        <translation>Tillåter companon9x att skriva till äldre firmware-versioner</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+28"/>
         <source>Backup and restore Models and Settings</source>
         <translation>Säkerhetskopiera Modeller och Inställningar</translation>
     </message>
@@ -8375,14 +8367,19 @@ m2560 för v4.1-kort</translation>
     <message>
         <location line="+7"/>
         <source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) 
-of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
-companion9x was forked out.</source>
-        <translation>All heder åt  Rafal Tomczak (RadioClone) och Thomas Husterer (th9x) naturligtvis.
-Dessutom till Erez Raviv (er9x) och dess fantastiska  eePe, från vilken
-companion9x grenades av.</translation>
+of course. Also to Erez Raviv (er9x) and the fantastic eePe program 
+which was the staring point for OpenTX Companion.</source>
+        <translation>All heder åt Rafal Tomczak (RadioClone) och Thomas Husterer (th9x) naturligtvis.
+Dessutom till Erez Raviv (er9x) och hans fantastiska  eePe, från vilken
+OpenTX Companion grenades av.</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+17"/>
+        <source>Companion Release Notes</source>
+        <translation>Companion Release Notes</translation>
+    </message>
+    <message>
+        <location line="-14"/>
         <source>Thank you all !!!</source>
         <translation>Tack till er alla !!!</translation>
     </message>
@@ -8392,12 +8389,7 @@ companion9x grenades av.</translation>
         <translation>Bidragande</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Companion9x Release Notes</source>
-        <translation>Companion9x Release Notes</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+16"/>
         <source>OpenTX Release Notes</source>
         <translation>OpenTX Release Notes</translation>
     </message>
@@ -8550,8 +8542,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+29"/>
-        <source>companion9x</source>
-        <translation>companion9x</translation>
+        <source>Companion</source>
+        <translation>Companion</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -8931,8 +8923,8 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
     <name>logsDialog</name>
     <message>
         <location filename="../logsdialog.ui" line="+14"/>
-        <source>Companion9x log viewer</source>
-        <translation>Companion9x loggläsare</translation>
+        <source>Companion Log Viewer</source>
+        <translation>Companion Logg-läsare</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -8945,7 +8937,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
         <translation>Öppna Loggfil</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+51"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
@@ -8960,7 +8952,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
         <translation>Y</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="+22"/>
+        <location filename="../logsdialog.cpp" line="+27"/>
         <source>Telemetry logs</source>
         <translation>Telemetriloggar</translation>
     </message>
@@ -8970,7 +8962,19 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
         <translation>Tid</translation>
     </message>
     <message>
-        <location line="+372"/>
+        <location line="+224"/>
+        <source>Error</source>
+        <translation>Fel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation>Filen %1 kunde inte skrivas:
+%2.</translation>
+    </message>
+    <message>
+        <location line="+329"/>
         <source>Select your log file</source>
         <translation>Välj loggfil</translation>
     </message>
@@ -8980,7 +8984,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
         <translation>Tillgängliga fält</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+97"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation>Denn aktuella filen innehåller %1 felaktiga rader. Totalt innehåller filen %2 rader</translation>
     </message>
@@ -9443,22 +9447,22 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location line="+480"/>
+        <location line="+624"/>
         <source>Language (requires restart)</source>
         <translation>Språk (kräver omstart)</translation>
     </message>
     <message>
-        <location line="-233"/>
+        <location line="-599"/>
         <source>Show Splash Screen</source>
         <translation>Visa Startbild</translation>
     </message>
     <message>
-        <location line="+767"/>
+        <location line="+989"/>
         <source>Recent History Size</source>
         <translation>Loggstorlek</translation>
     </message>
     <message>
-        <location line="-157"/>
+        <location line="-126"/>
         <location line="+41"/>
         <source>Download</source>
         <translation>Nedladdning</translation>
@@ -9469,7 +9473,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
         <translation>Kanalordning</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-415"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
@@ -9478,7 +9482,7 @@ This is used by the templated to determine which channel goes to what number out
 Detta används av mallen för att koppla kanal till output-nummer.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+402"/>
         <source>Default Stick Mode</source>
         <translation>Spaktilldelning</translation>
     </message>
@@ -9554,7 +9558,17 @@ Mode 4:
         <translation>Firmware</translation>
     </message>
     <message>
-        <location line="-894"/>
+        <location line="+621"/>
+        <source>Find Executable</source>
+        <translation>Sök Program</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Google Earth Executable</source>
+        <translation>Sökväg till Google Earth</translation>
+    </message>
+    <message>
+        <location line="-1542"/>
         <source>Check for updates on startup</source>
         <translation>Sök efter uppdateringar vid start</translation>
     </message>
@@ -9565,30 +9579,30 @@ Mode 4:
         <translation>...</translation>
     </message>
     <message>
-        <location line="+558"/>
+        <location line="+576"/>
         <source>Splash library behaviour</source>
         <translation>Beteende för bildbibliotek</translation>
     </message>
     <message>
-        <location line="-398"/>
+        <location line="-285"/>
         <source>Personal splash library</source>
         <translation>Personligt bildbibliotek</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+252"/>
         <source>Joystick</source>
         <translation>Joystick</translation>
     </message>
     <message>
-        <location line="-414"/>
-        <location line="+480"/>
+        <location line="-301"/>
+        <location line="+192"/>
+        <location line="+175"/>
         <location line="+135"/>
-        <location line="+67"/>
         <source>Open Folder</source>
         <translation>Öppna katalog</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+93"/>
         <location line="+13"/>
         <location line="+13"/>
         <location line="+13"/>
@@ -9634,12 +9648,12 @@ Mode 4:
         <translation>Kryssruta</translation>
     </message>
     <message>
-        <location line="-1238"/>
+        <location line="-1094"/>
         <source>Check for updates</source>
         <translation>Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location line="-188"/>
+        <location line="-319"/>
         <source>Blue</source>
         <oldsource>Blu</oldsource>
         <translation>Blå</translation>
@@ -9665,7 +9679,7 @@ Mode 4:
         <translation>Gul</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+234"/>
         <source>Enable</source>
         <translation>Slå på</translation>
     </message>
@@ -9675,7 +9689,7 @@ Mode 4:
         <translation>Kalibrera</translation>
     </message>
     <message>
-        <location line="-80"/>
+        <location line="-211"/>
         <source>Open Image</source>
         <translation>Öppna bild</translation>
     </message>
@@ -9685,38 +9699,33 @@ Mode 4:
         <translation>Invertera bild</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+343"/>
         <source>FwInfo</source>
         <translation>Firmware-info</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="+227"/>
+        <location filename="../preferencesdialog.cpp" line="+233"/>
         <source>Last downloaded release: %1</source>
         <translation>Senast nedladdade release: %1</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>The selected firmware has never been downloaded by companion9x.</source>
-        <translation>Firmware-filen har aldrig laddats ned av companion9x.</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>The selected firmware cannot be downloaded by companion9x.</source>
-        <translation>Firmware-filen kan inte laddas ned av companion9x.</translation>
-    </message>
-    <message>
-        <location line="+218"/>
-        <location line="+322"/>
+        <location line="+239"/>
+        <location line="+332"/>
         <source>No joysticks found</source>
         <translation>Ingen joystick hittades</translation>
     </message>
     <message>
-        <location line="-211"/>
+        <location line="-221"/>
         <source>Select your Models and Settings backup folder</source>
         <translation>Välj folder för automatisk säkerhetskopiering</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+11"/>
+        <source>Select Google Earth executable</source>
+        <translation>Sökväg till Google Earth</translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <source>Open Image to load</source>
         <translation>Öppna bild för laddning</translation>
     </message>
@@ -9726,24 +9735,34 @@ Mode 4:
         <translation>Bilder (%1)</translation>
     </message>
     <message>
-        <location line="-144"/>
-        <location line="+150"/>
+        <location line="-145"/>
+        <location line="+151"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location line="-150"/>
-        <location line="+150"/>
+        <location line="-517"/>
+        <source>The selected firmware has never been downloaded by Companion.</source>
+        <translation>Firmware-filen har aldrig laddats ned av Companion.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>The selected firmware cannot be downloaded by Companion.</source>
+        <translation>Firmware-filen kan inte laddas ned av Companion.</translation>
+    </message>
+    <message>
+        <location line="+362"/>
+        <location line="+151"/>
         <source>Cannot load %1.</source>
         <translation>%1 kunde inte laddas.</translation>
     </message>
     <message>
-        <location line="-288"/>
+        <location line="-298"/>
         <source>Image stored in settings</source>
         <translation>Bilden lagras i inställningar</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="+401"/>
+        <location filename="../preferencesdialog.ui" line="+288"/>
         <source>Include companion splashes</source>
         <translation>Användarens bilder och companion-bilder</translation>
     </message>
@@ -9753,7 +9772,7 @@ Mode 4:
         <translation>Enbart användarens bilder</translation>
     </message>
     <message>
-        <location line="-473"/>
+        <location line="-360"/>
         <source>Custom TX splash screen</source>
         <translation>Egen uppstartsbild</translation>
     </message>
@@ -9763,12 +9782,12 @@ Mode 4:
         <translation>Fråga om skrivning efter Nedladdning</translation>
     </message>
     <message>
-        <location line="+475"/>
+        <location line="+362"/>
         <source>Language</source>
         <translation>Språk</translation>
     </message>
     <message>
-        <location line="-420"/>
+        <location line="-307"/>
         <source>Profile Name</source>
         <translation>Profilnamn</translation>
     </message>
@@ -9778,7 +9797,7 @@ Mode 4:
         <translation>Spara Profil</translation>
     </message>
     <message>
-        <location line="+322"/>
+        <location line="+209"/>
         <source>Profile slot</source>
         <translation>Profilplats</translation>
     </message>
@@ -9793,7 +9812,7 @@ Mode 4:
         <translation>Välj bibliotekskatalog</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="-359"/>
+        <location filename="../preferencesdialog.ui" line="-246"/>
         <source>Export Profile</source>
         <translation>Exportera Profil</translation>
     </message>
@@ -9803,7 +9822,7 @@ Mode 4:
         <translation>Importera Profil</translation>
     </message>
     <message>
-        <location line="+368"/>
+        <location line="+255"/>
         <source>Automatically add version number to the filename after download</source>
         <translation>Lägg automatiskt till ett versionsnummer till filnamnet</translation>
     </message>
@@ -9820,7 +9839,7 @@ May be different from firmware language</source>
 Får skilja från språket för mjukvaran</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="+145"/>
+        <location filename="../preferencesdialog.cpp" line="+155"/>
         <source>Export profile As</source>
         <translation>Exportera profil som</translation>
     </message>
@@ -9835,12 +9854,12 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Öppna profil för import</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="-832"/>
+        <location filename="../preferencesdialog.ui" line="-850"/>
         <source>Simu BackLight</source>
         <translation>Simulatorbelysning</translation>
     </message>
     <message>
-        <location line="+929"/>
+        <location line="+947"/>
         <source>Processor ID</source>
         <translation>Processortyp</translation>
     </message>
@@ -9850,22 +9869,22 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Katalog för simulator-data</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="-348"/>
         <source>Use clipboard only</source>
         <translation>Använd bara clipboard</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="-163"/>
+        <location filename="../preferencesdialog.cpp" line="-173"/>
         <source>Select your snapshot folder</source>
         <translation>Välj katalog för snapshots</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+108"/>
         <source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
         <translation>Profilnamn saknas, profilplats %1 kommer att raderas.&lt;br&gt; Är du säker?</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="-945"/>
+        <location filename="../preferencesdialog.ui" line="-586"/>
         <source>Check for selected Fw updates</source>
         <translation>Sök efter updatering av vald FW</translation>
     </message>
@@ -9880,7 +9899,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Minns brytare i simulator</translation>
     </message>
     <message>
-        <location line="+813"/>
+        <location line="+831"/>
         <source>SD Structure path</source>
         <translation>Sökväg till SD-struktur</translation>
     </message>
@@ -10387,13 +10406,7 @@ Får skilja från språket för mjukvaran</translation>
 <context>
     <name>simulatorDialog</name>
     <message>
-        <location filename="../simulatordialog.ui" line="+26"/>
-        <source>Companion9x Simulator</source>
-        <oldsource>ER9x Simulator</oldsource>
-        <translation>Companion 9x Simulator</translation>
-    </message>
-    <message>
-        <location line="+818"/>
+        <location filename="../simulatordialog.ui" line="+844"/>
         <source>P1</source>
         <translation>P1</translation>
     </message>
@@ -10498,17 +10511,22 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Höger dubbelklick nollställer</translation>
     </message>
     <message>
-        <location line="+278"/>
+        <location line="-742"/>
+        <source>Companion Simulator</source>
+        <translation>Companion Simulator</translation>
+    </message>
+    <message>
+        <location line="+1020"/>
         <source>9x Simulator</source>
         <translation>Simulator för 9x</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+194"/>
         <source>Outputs</source>
         <translation>Utgångar</translation>
     </message>
     <message>
-        <location line="+1068"/>
+        <location line="+1070"/>
         <source>CH1</source>
         <translation>KN1</translation>
     </message>
@@ -10639,7 +10657,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Simulerar </translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="-2681"/>
+        <location filename="../simulatordialog.ui" line="-2684"/>
         <location line="+60"/>
         <location line="+57"/>
         <source>0 %</source>
@@ -10651,7 +10669,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation> - Fligmod: %1(%2)</translation>
     </message>
     <message>
-        <location filename="../simulatordialog.ui" line="+282"/>
+        <location filename="../simulatordialog.ui" line="+283"/>
         <source>CS1</source>
         <translation>LB1</translation>
     </message>
@@ -10741,7 +10759,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation>LBI</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>CSJ</source>
         <translation>LBJ</translation>
     </message>
@@ -10848,12 +10866,7 @@ Får skilja från språket för mjukvaran</translation>
 <context>
     <name>xsimulatorDialog</name>
     <message>
-        <location filename="../xsimulatordialog.ui" line="+26"/>
-        <source>Companion9x Simulator</source>
-        <translation>Companion 9x-Simulator</translation>
-    </message>
-    <message>
-        <location line="+1035"/>
+        <location filename="../xsimulatordialog.ui" line="+1061"/>
         <location line="+138"/>
         <source>SE</source>
         <translation>SE</translation>
@@ -10923,7 +10936,12 @@ Får skilja från språket för mjukvaran</translation>
         <translation>SG</translation>
     </message>
     <message>
-        <location line="-301"/>
+        <location line="-539"/>
+        <source>Companion Simulator</source>
+        <translation>Companion Simulator</translation>
+    </message>
+    <message>
+        <location line="+238"/>
         <location line="+291"/>
         <source>SD</source>
         <translation>SD</translation>
@@ -10951,7 +10969,7 @@ Får skilja från språket för mjukvaran</translation>
         <location line="+22"/>
         <location line="+158"/>
         <location line="+22"/>
-        <location line="+158"/>
+        <location line="+159"/>
         <location line="+22"/>
         <location line="+152"/>
         <location line="+22"/>
@@ -10965,7 +10983,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation>-100.1</translation>
     </message>
     <message>
-        <location line="-1128"/>
+        <location line="-1129"/>
         <source>CH9</source>
         <translation>KN9</translation>
     </message>
@@ -10995,7 +11013,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation>KN4</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+168"/>
         <source>CH12</source>
         <translation>KN12</translation>
     </message>
@@ -11071,7 +11089,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Simulerar </translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="-1773"/>
+        <location filename="../xsimulatordialog.ui" line="-1774"/>
         <location line="+22"/>
         <location line="+3"/>
         <source>SF</source>
@@ -11112,7 +11130,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation> - Fligmod: %1(%2)</translation>
     </message>
     <message>
-        <location filename="../xsimulatordialog.ui" line="+1627"/>
+        <location filename="../xsimulatordialog.ui" line="+1628"/>
         <source>CSK</source>
         <translation>LBK</translation>
     </message>
diff --git a/companion/src/warnings.h b/companion/src/warnings.h
index 2f18a736d..c8fb4753e 100644
--- a/companion/src/warnings.h
+++ b/companion/src/warnings.h
@@ -2,7 +2,7 @@
 #define	WARNINGS_H
 #define WARNING_LEVEL 0
 #define WARNING_ID 6
-#define WARNING QObject::tr("Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.\n\nWe are really sensible to that!\n\nThe openTX/C9X Team.")
+#define WARNING QObject::tr("Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.\n\nWe are really appreciative for that!\n\nThe OpenTX/Companion Team.")
 
 #endif	/* WARNINGS_H */
 
diff --git a/companion/src/xmlinterface.cpp b/companion/src/xmlinterface.cpp
index 67d8be5ce..b3514383d 100644
--- a/companion/src/xmlinterface.cpp
+++ b/companion/src/xmlinterface.cpp
@@ -91,8 +91,6 @@ void saveGeneralSettings(GeneralSettings & settings, global_settings & gs)
     gs.warnings(warns);
   gs.beeper(settings.beeperMode);
   sticks stks(settings.stickMode);
-  if (settings.throttleReversed)
-    stks.throttle_reverse(true);
   gs.sticks(stks);
   gs.inactivity_timer(settings.inactivityTimer);
   if (settings.minuteBeep || settings.preBeep || settings.flashBeep) {
@@ -195,7 +193,7 @@ bool XmlInterface::save(RadioData &radioData)
     // the models
     models xml_models;
     models::model_sequence & model_sequence (xml_models.model());
-    for (int i=0; i<C9XMAX_MODELS; i++) {
+    for (int i=0; i<C9X_MAX_MODELS; i++) {
       ModelData & m = radioData.models[i];
       if (m.used) {
         model xm(m.name);
diff --git a/companion/src/xsimulatordialog.cpp b/companion/src/xsimulatordialog.cpp
index a048532f6..d2200e9bf 100644
--- a/companion/src/xsimulatordialog.cpp
+++ b/companion/src/xsimulatordialog.cpp
@@ -194,12 +194,13 @@ void xsimulatorDialog::onButtonPressed(int value)
 void xsimulatorDialog::onTimerEvent()
 {
   static unsigned int lcd_counter = 0;
+
   if (!simulator->timer10ms()) {
-    QMessageBox::critical(this, "companion9x", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError()));
+    QMessageBox::critical(this, "companion", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError()));
     timer->stop();
     return;
   }
-
+  
   getValues();
 
   if (g_modelIdx >= 0) {
diff --git a/companion/src/xsimulatordialog.h b/companion/src/xsimulatordialog.h
index 3d2e5a958..a78143fc7 100644
--- a/companion/src/xsimulatordialog.h
+++ b/companion/src/xsimulatordialog.h
@@ -2,7 +2,7 @@
 #define XSIMULATORDIALOG_H
 
 #include <QDialog>
-#include "node.h"
+#include "modeledit/node.h"
 #include "eeprominterface.h"
 #ifdef JOYSTICKS
 #include "joystick.h"
diff --git a/companion/src/xsimulatordialog.ui b/companion/src/xsimulatordialog.ui
index d2bc64bfe..2ddd8f310 100644
--- a/companion/src/xsimulatordialog.ui
+++ b/companion/src/xsimulatordialog.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Companion9x Simulator</string>
+   <string>Companion Simulator</string>
   </property>
   <property name="windowIcon">
    <iconset resource="companion9x.qrc">
@@ -2053,6 +2053,7 @@ border-radius: 4px;
              <width>16777215</width>
              <height>18</height>
             </size>
+
            </property>
            <property name="styleSheet">
             <string notr="true">QSlider::sub-page:horizontal:disabled {
diff --git a/companion/targets/windows/companion9x-msys.nsi.in b/companion/targets/windows/companion-msys.nsi.in
similarity index 80%
rename from companion/targets/windows/companion9x-msys.nsi.in
rename to companion/targets/windows/companion-msys.nsi.in
index ed7bf33fb..3b38bb303 100644
--- a/companion/targets/windows/companion9x-msys.nsi.in
+++ b/companion/targets/windows/companion-msys.nsi.in
@@ -1,186 +1,186 @@
-;NSIS Modern User Interface
-;Start Menu Folder Selection Example Script
-;Written by Joost Verburg
-
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI2.nsh"
-  !include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
-
-;--------------------------------
-;General
-
-  ;Name and file
-  Name "companion9x"
-  OutFile "companion9xInstall_v@C9X_VERSION@.exe"
-
-  ;Default installation folder
-  InstallDir "$PROGRAMFILES\companion9x"
-  
-  ;Get installation folder from registry if available
-  InstallDirRegKey HKCU "Software\companion9x" ""
-  
-  ;Compressor options
-  SetCompressor /FINAL /SOLID lzma
-  SetCompressorDictSize 64
-
-  ;Request application privileges for Windows Vista
-  RequestExecutionLevel admin
-
-;--------------------------------
-;Variables
-
-  Var StartMenuFolder
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-;--------------------------------
-;Pages
-
-  !insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
-  !insertmacro MUI_PAGE_COMPONENTS
-  !insertmacro MUI_PAGE_DIRECTORY
-  
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x" 
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  
-  !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-  
-  !insertmacro MUI_PAGE_INSTFILES
-  
-  # These indented statements modify settings for MUI_PAGE_FINISH
-    !define MUI_FINISHPAGE_NOAUTOCLOSE
-    !define MUI_FINISHPAGE_RUN
-    !define MUI_FINISHPAGE_RUN_CHECKED
-    !define MUI_FINISHPAGE_RUN_TEXT "Launch companion9x"
-    !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
-  #  !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-  #  !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
-  !insertmacro MUI_PAGE_FINISH
-  
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-;Languages
- 
-  !insertmacro MUI_LANGUAGE "English"
-  !insertmacro MUI_LANGUAGE "French"
-
-;--------------------------------
-;Installer Sections
-
-Section "companion9x" SecDummy
-
-  SetOutPath "$INSTDIR"
-  
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
-  File "companion9x.exe"
-  File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll"
-  File "C:\MinGW\bin\libgcc_s_dw2-1.dll"
-  File "C:\MinGW\bin\mingwm10.dll"
-  File "C:\MinGW\bin\libstdc++-6.dll"
-  File "@QT_BINARY_DIR@\QtCore4.dll"
-  File "@QT_BINARY_DIR@\QtGui4.dll"
-  File "@QT_BINARY_DIR@\QtXml4.dll"
-  File "@QT_BINARY_DIR@\QtNetwork4.dll"
-  File "@QT_BINARY_DIR@\Phonon4.dll"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
-  
-  CreateDirectory "$INSTDIR\lang"
-  SetOutPath "$INSTDIR\lang"
-  File "*.qm"
-  
-  SetOutPath "$INSTDIR"
-  ;Store installation folder
-  WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
-  
-  ;Associate with extentions ,bin and .hex
-  ${registerExtension} "$INSTDIR\companion9x.exe" ".bin" "BIN_File"
-  ${registerExtension} "$INSTDIR\companion9x.exe" ".hex" "HEX_File"
-  ${registerExtension} "$INSTDIR\companion9x.exe" ".companion9x" "EEPE_File"
-  ${registerExtension} "$INSTDIR\companion9x.exe" ".eepm" "EEPM_File"
-
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    
-  ;Create shortcuts
-  CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" "$INSTDIR\companion9x.exe"
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-  
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-SectionEnd
-
-;--------------------------------
-;Descriptions
-
-  ;Language strings
-  LangString DESC_SecDummy ${LANG_ENGLISH} "companion9x EEPROM editor."
-  LangString DESC_SecDummy ${LANG_FRENCH} "companion9x editeur d'EEPROM"
-
-  ;Assign language strings to sections
-  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
-  !insertmacro MUI_FUNCTION_DESCRIPTION_END
- 
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
-  ;ADD YOUR OWN FILES HERE...
- 
-  Delete "$INSTDIR\license.txt"
-  Delete "$INSTDIR\companion9x.exe"
-  Delete "$INSTDIR\libxerces-c-3-1.dll"
-  Delete "$INSTDIR\libgcc_s_dw2-1.dll"
-  Delete "$INSTDIR\mingwm10.dll"
-  Delete "$INSTDIR\libstdc++-6.dll"
-  Delete "$INSTDIR\QtCore4.dll"
-  Delete "$INSTDIR\QtGui4.dll"
-  Delete "$INSTDIR\QtNetwork4.dll"
-  Delete "$INSTDIR\Phonon4.dll"
-  Delete "$INSTDIR\QtXml4.dll"
-  Delete "$INSTDIR\avrdude.exe"
-  Delete "$INSTDIR\avrdude.conf"
-  Delete "$INSTDIR\libusb0.dll"
-  Delete "$INSTDIR\dfu-util.exe"
-  Delete "$INSTDIR\Uninstall.exe"
-  
-  Delete "$INSTDIR\lang\*.*"
-
-  RMDir "$INSTDIR\lang"
-  RMDir "$INSTDIR"
-  
-  ${unregisterExtension} ".bin" "BIN File"
-  ${unregisterExtension} ".hex" "HEX File"
-  ${unregisterExtension} ".eepm" "EEPE File"
-  ${unregisterExtension} ".companion9x" "EEPM File"
-  
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
-    
-  Delete "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk"
-  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
-  RMDir "$SMPROGRAMS\$StartMenuFolder"
-  
-  DeleteRegKey /ifempty HKCU "Software\companion9x"
-
-SectionEnd
-
-Function LaunchLink
-  ExecShell "" "$INSTDIR\companion9x.exe"
-FunctionEnd
+;NSIS Modern User Interface
+;Start Menu Folder Selection Example Script
+;Written by Joost Verburg
+
+;--------------------------------
+;Include Modern UI
+
+  !include "MUI2.nsh"
+  !include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
+
+;--------------------------------
+;General
+
+  ;Name and file
+  Name "openTx companion"
+  OutFile "companionInstall_v@C9X_VERSION@.exe"
+
+  ;Default installation folder
+  InstallDir "$PROGRAMFILES\openTx companion"
+  
+  ;Get installation folder from registry if available
+  InstallDirRegKey HKCU "Software\companion9x" ""
+  
+  ;Compressor options
+  SetCompressor /FINAL /SOLID lzma
+  SetCompressorDictSize 64
+
+  ;Request application privileges for Windows Vista
+  RequestExecutionLevel admin
+
+;--------------------------------
+;Variables
+
+  Var StartMenuFolder
+
+;--------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+
+;--------------------------------
+;Pages
+
+  !insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  
+  ;Start Menu Folder Page Configuration
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x" 
+  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+  
+  !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
+  
+  !insertmacro MUI_PAGE_INSTFILES
+  
+  # These indented statements modify settings for MUI_PAGE_FINISH
+    !define MUI_FINISHPAGE_NOAUTOCLOSE
+    !define MUI_FINISHPAGE_RUN
+    !define MUI_FINISHPAGE_RUN_CHECKED
+    !define MUI_FINISHPAGE_RUN_TEXT "Launch companion"
+    !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
+  #  !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+  #  !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
+  !insertmacro MUI_PAGE_FINISH
+  
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+ 
+  !insertmacro MUI_LANGUAGE "English"
+  !insertmacro MUI_LANGUAGE "French"
+
+;--------------------------------
+;Installer Sections
+
+Section "openTx companion" SecDummy
+
+  SetOutPath "$INSTDIR"
+  
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
+  File "companion.exe"
+  File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll"
+  File "C:\MinGW\bin\libgcc_s_dw2-1.dll"
+  File "C:\MinGW\bin\mingwm10.dll"
+  File "C:\MinGW\bin\libstdc++-6.dll"
+  File "@QT_BINARY_DIR@\QtCore4.dll"
+  File "@QT_BINARY_DIR@\QtGui4.dll"
+  File "@QT_BINARY_DIR@\QtXml4.dll"
+  File "@QT_BINARY_DIR@\QtNetwork4.dll"
+  File "@QT_BINARY_DIR@\Phonon4.dll"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
+  
+  CreateDirectory "$INSTDIR\lang"
+  SetOutPath "$INSTDIR\lang"
+  File "*.qm"
+  
+  SetOutPath "$INSTDIR"
+  ;Store installation folder
+  WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
+  
+  ;Associate with extentions ,bin and .hex
+  ${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
+  ${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
+  ${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
+  ${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
+
+  
+  ;Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+  
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    
+  ;Create shortcuts
+  CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe"
+  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+  ;Language strings
+  LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for openTx"
+  LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de r�glages et mod�les pour openTx"
+
+  ;Assign language strings to sections
+  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
+  !insertmacro MUI_FUNCTION_DESCRIPTION_END
+ 
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+  ;ADD YOUR OWN FILES HERE...
+ 
+  Delete "$INSTDIR\license.txt"
+  Delete "$INSTDIR\companion.exe"
+  Delete "$INSTDIR\libxerces-c-3-1.dll"
+  Delete "$INSTDIR\libgcc_s_dw2-1.dll"
+  Delete "$INSTDIR\mingwm10.dll"
+  Delete "$INSTDIR\libstdc++-6.dll"
+  Delete "$INSTDIR\QtCore4.dll"
+  Delete "$INSTDIR\QtGui4.dll"
+  Delete "$INSTDIR\QtNetwork4.dll"
+  Delete "$INSTDIR\Phonon4.dll"
+  Delete "$INSTDIR\QtXml4.dll"
+  Delete "$INSTDIR\avrdude.exe"
+  Delete "$INSTDIR\avrdude.conf"
+  Delete "$INSTDIR\libusb0.dll"
+  Delete "$INSTDIR\dfu-util.exe"
+  Delete "$INSTDIR\Uninstall.exe"
+  
+  Delete "$INSTDIR\lang\*.*"
+
+  RMDir "$INSTDIR\lang"
+  RMDir "$INSTDIR"
+  
+  ${unregisterExtension} ".bin" "BIN File"
+  ${unregisterExtension} ".hex" "HEX File"
+  ${unregisterExtension} ".eepm" "EEPE File"
+  ${unregisterExtension} ".companion" "EEPM File"
+  
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
+    
+  Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk"
+  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
+  RMDir "$SMPROGRAMS\$StartMenuFolder"
+  
+  DeleteRegKey /ifempty HKCU "Software\companion9x"
+
+SectionEnd
+
+Function LaunchLink
+  ExecShell "" "$INSTDIR\companion.exe"
+FunctionEnd
diff --git a/companion/targets/windows/companion9x-vs.nsi.in b/companion/targets/windows/companion-vs.nsi.in
similarity index 82%
rename from companion/targets/windows/companion9x-vs.nsi.in
rename to companion/targets/windows/companion-vs.nsi.in
index 3e5950ada..340abc782 100644
--- a/companion/targets/windows/companion9x-vs.nsi.in
+++ b/companion/targets/windows/companion-vs.nsi.in
@@ -1,214 +1,214 @@
-;NSIS Modern User Interface
-;Start Menu Folder Selection Example Script
-;Written by Joost Verburg
-
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI2.nsh"
-  !include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
-
-;--------------------------------
-;General
-
-  ;Name and file
-  Name "companion9x"
-  OutFile "companion9xInstall_v@C9X_VERSION@.exe"
-
-  ;Default installation folder
-  InstallDir "$PROGRAMFILES\companion9x"
-  
-  ;Get installation folder from registry if available
-  InstallDirRegKey HKCU "Software\companion9x" ""
-  
-  ;Compressor options
-  SetCompressor /FINAL /SOLID lzma
-  SetCompressorDictSize 64
-
-  ;Request application privileges for Windows Vista
-  RequestExecutionLevel admin
-
-;--------------------------------
-;Variables
-
-  Var StartMenuFolder
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-;--------------------------------
-;File Exists Macro
-
-; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation
-!macro !defineifexist _VAR_NAME _FILE_NAME
-	!tempfile _TEMPFILE
-	!ifdef NSIS_WIN32_MAKENSIS
-		; Windows - cmd.exe
-		!system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} > "${_TEMPFILE}"'
-	!else
-		; Posix - sh
-		!system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi'
-	!endif
-	!include '${_TEMPFILE}'
-	!delfile '${_TEMPFILE}'
-	!undef _TEMPFILE
-!macroend
-!define !defineifexist "!insertmacro !defineifexist"
-
-;--------------------------------
-;Pages
-
-  !insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
-  !insertmacro MUI_PAGE_COMPONENTS
-  !insertmacro MUI_PAGE_DIRECTORY
-  
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x" 
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  
-  !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-  
-  !insertmacro MUI_PAGE_INSTFILES
-  
-  # These indented statements modify settings for MUI_PAGE_FINISH
-    !define MUI_FINISHPAGE_NOAUTOCLOSE
-    !define MUI_FINISHPAGE_RUN
-    !define MUI_FINISHPAGE_RUN_CHECKED
-    !define MUI_FINISHPAGE_RUN_TEXT "Launch companion9x"
-    !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
-  #  !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-  #  !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
-  !insertmacro MUI_PAGE_FINISH
-  
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-;Languages
- 
-  !insertmacro MUI_LANGUAGE "English"
-  !insertmacro MUI_LANGUAGE "French"
-
-;--------------------------------
-;Installer Sections
-
-Section "companion9x" SecDummy
-
-  SetOutPath "$INSTDIR"
-  
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
-  File "Release\companion9x.exe"
-  ${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
-  !ifdef PTHREAD_WINDIR
-  File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
-  !else
-  File "@SYSDIR@\system32\pthreadVC2.dll"
-  !endif
-  File "C:\Programs\xerces-vc\bin\xerces-c_3_1.dll"
-  File "C:\Programs\SDL\lib\SDL.dll"
-  File "@SYSDIR@\msvcp100.dll"
-  File "@SYSDIR@\msvcr100.dll"
-  File "@QT_BINARY_DIR@\QtCore4.dll"
-  File "@QT_BINARY_DIR@\QtGui4.dll"
-  File "@QT_BINARY_DIR@\QtNetwork4.dll"
-  File "@QT_BINARY_DIR@\Phonon4.dll"
-  File "@QT_BINARY_DIR@\QtXml4.dll"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb-1.0.dll"
-  
-  CreateDirectory "$INSTDIR\lang"
-  SetOutPath "$INSTDIR\lang"
-  File "*.qm"
-  
-  SetOutPath "$INSTDIR"
-  ;Store installation folder
-  WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
-  
-  ;Associate with extentions ,bin and .hex
-  ${registerExtension} "$INSTDIR\companion9x.exe" ".bin" "BIN_File"
-  ${registerExtension} "$INSTDIR\companion9x.exe" ".hex" "HEX_File"
-  ${registerExtension} "$INSTDIR\companion9x.exe" ".companion9x" "EEPE_File"
-  ${registerExtension} "$INSTDIR\companion9x.exe" ".eepm" "EEPM_File"
-
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    
-  ;Create shortcuts
-  CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" "$INSTDIR\companion9x.exe"
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-  
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-SectionEnd
-
-;--------------------------------
-;Descriptions
-
-  ;Language strings
-  LangString DESC_SecDummy ${LANG_ENGLISH} "companion9x EEPROM editor."
-  LangString DESC_SecDummy ${LANG_FRENCH} "companion9x editeur d'EEPROM"
-
-  ;Assign language strings to sections
-  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
-  !insertmacro MUI_FUNCTION_DESCRIPTION_END
- 
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
-  ;ADD YOUR OWN FILES HERE...  
-  
-  Delete "$INSTDIR\license.txt"
-  Delete "$INSTDIR\companion9x.exe"
-  Delete "$INSTDIR\pthreadVC2.dll"
-  Delete "$INSTDIR\xerces-c_3_1.dll"
-  Delete "$INSTDIR\SDL.dll"
-  Delete "$INSTDIR\msvcp100.dll"
-  Delete "$INSTDIR\msvcr100.dll"
-  Delete "$INSTDIR\QtCore4.dll"
-  Delete "$INSTDIR\QtGui4.dll"
-  Delete "$INSTDIR\QtXml4.dll"
-  Delete "$INSTDIR\QtNetwork4.dll"
-  Delete "$INSTDIR\Phonon4.dll"
-  Delete "$INSTDIR\avrdude.exe"
-  Delete "$INSTDIR\avrdude.conf"
-  Delete "$INSTDIR\libusb0.dll"
-  Delete "$INSTDIR\dfu-util.exe"
-  Delete "$INSTDIR\libusb-1.0.dll"
-  Delete "$INSTDIR\Uninstall.exe"
-  
-  Delete "$INSTDIR\lang\*.*"
-
-  RMDir "$INSTDIR\lang"
-  RMDir "$INSTDIR"
-  
-  ${unregisterExtension} ".bin" "BIN File"
-  ${unregisterExtension} ".hex" "HEX File"
-  ${unregisterExtension} ".eepm" "EEPE File"
-  ${unregisterExtension} ".companion9x" "EEPM File"
-  
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
-    
-  Delete "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk"
-  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
-  RMDir "$SMPROGRAMS\$StartMenuFolder"
-  
-  DeleteRegKey /ifempty HKCU "Software\companion9x"
-
-SectionEnd
-
-Function LaunchLink
-  ExecShell "" "$INSTDIR\companion9x.exe"
-FunctionEnd
+;NSIS Modern User Interface
+;Start Menu Folder Selection Example Script
+;Written by Joost Verburg
+
+;--------------------------------
+;Include Modern UI
+
+  !include "MUI2.nsh"
+  !include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
+
+;--------------------------------
+;General
+
+  ;Name and file
+  Name "openTx companion"
+  OutFile "companionInstall_v@C9X_VERSION@.exe"
+
+  ;Default installation folder
+  InstallDir "$PROGRAMFILES\openTx companion"
+  
+  ;Get installation folder from registry if available
+  InstallDirRegKey HKCU "Software\companion9x" ""
+  
+  ;Compressor options
+  SetCompressor /FINAL /SOLID lzma
+  SetCompressorDictSize 64
+
+  ;Request application privileges for Windows Vista
+  RequestExecutionLevel admin
+
+;--------------------------------
+;Variables
+
+  Var StartMenuFolder
+
+;--------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+
+;--------------------------------
+;File Exists Macro
+
+; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation
+!macro !defineifexist _VAR_NAME _FILE_NAME
+	!tempfile _TEMPFILE
+	!ifdef NSIS_WIN32_MAKENSIS
+		; Windows - cmd.exe
+		!system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} > "${_TEMPFILE}"'
+	!else
+		; Posix - sh
+		!system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi'
+	!endif
+	!include '${_TEMPFILE}'
+	!delfile '${_TEMPFILE}'
+	!undef _TEMPFILE
+!macroend
+!define !defineifexist "!insertmacro !defineifexist"
+
+;--------------------------------
+;Pages
+
+  !insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
+  !insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
+  
+  ;Start Menu Folder Page Configuration
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x" 
+  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+  
+  !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
+  
+  !insertmacro MUI_PAGE_INSTFILES
+  
+  # These indented statements modify settings for MUI_PAGE_FINISH
+    !define MUI_FINISHPAGE_NOAUTOCLOSE
+    !define MUI_FINISHPAGE_RUN
+    !define MUI_FINISHPAGE_RUN_CHECKED
+    !define MUI_FINISHPAGE_RUN_TEXT "Launch companion"
+    !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
+  #  !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+  #  !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
+  !insertmacro MUI_PAGE_FINISH
+  
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+ 
+  !insertmacro MUI_LANGUAGE "English"
+  !insertmacro MUI_LANGUAGE "French"
+
+;--------------------------------
+;Installer Sections
+
+Section "openTx companion" SecDummy
+
+  SetOutPath "$INSTDIR"
+  
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
+  File "Release\companion.exe"
+  ${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
+  !ifdef PTHREAD_WINDIR
+  File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
+  !else
+  File "@SYSDIR@\system32\pthreadVC2.dll"
+  !endif
+  File "C:\Programs\xerces-vc\bin\xerces-c_3_1.dll"
+  File "C:\Programs\SDL\lib\SDL.dll"
+  File "@SYSDIR@\msvcp100.dll"
+  File "@SYSDIR@\msvcr100.dll"
+  File "@QT_BINARY_DIR@\QtCore4.dll"
+  File "@QT_BINARY_DIR@\QtGui4.dll"
+  File "@QT_BINARY_DIR@\QtNetwork4.dll"
+  File "@QT_BINARY_DIR@\Phonon4.dll"
+  File "@QT_BINARY_DIR@\QtXml4.dll"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
+  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb-1.0.dll"
+  
+  CreateDirectory "$INSTDIR\lang"
+  SetOutPath "$INSTDIR\lang"
+  File "*.qm"
+  
+  SetOutPath "$INSTDIR"
+  ;Store installation folder
+  WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
+  
+  ;Associate with extentions ,bin and .hex
+  ${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
+  ${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
+  ${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
+  ${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
+
+  
+  ;Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+  
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    
+  ;Create shortcuts
+  CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe"
+  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+  ;Language strings
+  LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for openTx"
+  LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de r�glages et mod�les pour openTx"
+
+  ;Assign language strings to sections
+  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
+  !insertmacro MUI_FUNCTION_DESCRIPTION_END
+ 
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+  ;ADD YOUR OWN FILES HERE...  
+  
+  Delete "$INSTDIR\license.txt"
+  Delete "$INSTDIR\companion.exe"
+  Delete "$INSTDIR\pthreadVC2.dll"
+  Delete "$INSTDIR\xerces-c_3_1.dll"
+  Delete "$INSTDIR\SDL.dll"
+  Delete "$INSTDIR\msvcp100.dll"
+  Delete "$INSTDIR\msvcr100.dll"
+  Delete "$INSTDIR\QtCore4.dll"
+  Delete "$INSTDIR\QtGui4.dll"
+  Delete "$INSTDIR\QtXml4.dll"
+  Delete "$INSTDIR\QtNetwork4.dll"
+  Delete "$INSTDIR\Phonon4.dll"
+  Delete "$INSTDIR\avrdude.exe"
+  Delete "$INSTDIR\avrdude.conf"
+  Delete "$INSTDIR\libusb0.dll"
+  Delete "$INSTDIR\dfu-util.exe"
+  Delete "$INSTDIR\libusb-1.0.dll"
+  Delete "$INSTDIR\Uninstall.exe"
+  
+  Delete "$INSTDIR\lang\*.*"
+
+  RMDir "$INSTDIR\lang"
+  RMDir "$INSTDIR"
+  
+  ${unregisterExtension} ".bin" "BIN File"
+  ${unregisterExtension} ".hex" "HEX File"
+  ${unregisterExtension} ".eepm" "EEPE File"
+  ${unregisterExtension} ".companion" "EEPM File"
+  
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
+    
+  Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk"
+  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
+  RMDir "$SMPROGRAMS\$StartMenuFolder"
+  
+  DeleteRegKey /ifempty HKCU "Software\companion9x"
+
+SectionEnd
+
+Function LaunchLink
+  ExecShell "" "$INSTDIR\companion.exe"
+FunctionEnd
diff --git a/radio/src/Makefile b/radio/src/Makefile
index 73515c551..7e49bf5ab 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1299,12 +1299,7 @@ clean_list :
 	$(REMOVE) $(TARGET).lss
 	$(REMOVE) $(TARGET).lst
 	$(REMOVE) $(SRC:.c=.s)
-	$(REMOVE) *.o
-	$(REMOVE) */*.o
-	$(REMOVE) */*/*.o
-	$(REMOVE) */*/*/*.o
-	$(REMOVE) */*/*/*/*.o
-	$(REMOVE) */*/*/*/*/*.o
+	$(REMOVE) `find . -name "*.o"` 
 	$(REMOVE) *.d
 	$(REMOVE) *.lst
 	$(REMOVE) allsrc.cpp
diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index 6edb00974..0e325d247 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -131,6 +131,22 @@ PACK(typedef struct {
   gvar_t gvars[5];
 }) PhaseData_v215;
 
+PACK(typedef struct {
+  FrSkyChannelData channels[2];
+  uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
+  uint8_t voltsSource;
+  uint8_t blades;   // How many blades for RPMs, 0=2 blades, 1=3 blades
+  uint8_t currentSource;
+  uint8_t screensType;
+  FrSkyScreenData screens[MAX_FRSKY_SCREENS];
+  uint8_t varioSource;
+  int8_t  varioCenterMax;
+  int8_t  varioCenterMin;
+  int8_t  varioMin;
+  int8_t  varioMax;
+  FrSkyRSSIAlarm rssiAlarms[2];
+}) FrSkyData_v215;
+
 PACK(typedef struct {
   ModelHeader header;
   TimerData_v215 timers[MAX_TIMERS];
@@ -162,9 +178,9 @@ PACK(typedef struct {
 
   swstate_t switchWarningStates;
 
-  char      gvar_names[5][LEN_GVAR_NAME];
+  char gvar_names[5][LEN_GVAR_NAME];
 
-  TELEMETRY_DATA
+  FrSkyData_v215 frsky;
 
   ROTARY_ENCODER_ARRAY_EXTRA
 
@@ -427,7 +443,8 @@ void ConvertModel_215_to_216(ModelData &model)
   for (uint8_t i=0; i<5; i++) {
     memcpy(g_model.gvars[i].name, oldModel.gvar_names[i], LEN_GVAR_NAME);
   }
-  g_model.frsky = oldModel.frsky;
+
+  memcpy(&g_model.frsky, &oldModel.frsky, sizeof(oldModel.frsky));
 
 #if defined(PCBTARANIS)
   g_model.externalModule = oldModel.externalModule;
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 3c49e6f59..bbf184de6 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -56,11 +56,11 @@
 #elif defined(PCBSKY9X)
   #define EEPROM_VER       216
 #elif defined(CPUM2560) || defined(CPUM2561)
-  #define EEPROM_VER       215
+  #define EEPROM_VER       216
 #elif defined(CPUM128)
   #define EEPROM_VER       216
 #else
-  #define EEPROM_VER       214
+  #define EEPROM_VER       216
 #endif
 
 #ifndef PACK
@@ -274,12 +274,12 @@ PACK(typedef struct t_ScriptData {
     TRAINER_MODULE
   };
   #define MODELDATA_BITMAP  char bitmap[LEN_BITMAP_NAME];
-  #define MODELDATA_EXTRA   uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS];
+  #define MODELDATA_EXTRA   uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4];
   #define LIMITDATA_EXTRA   char name[LEN_CHANNEL_NAME]; int8_t curve;
   #define swstate_t         uint16_t
 #elif defined(PCBSKY9X)
   #define MODELDATA_BITMAP
-  #define MODELDATA_EXTRA   ModuleData moduleData[NUM_MODULES]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS];
+  #define MODELDATA_EXTRA   ModuleData moduleData[NUM_MODULES];
   #define LIMITDATA_EXTRA
   #define swstate_t         uint8_t
 #else
@@ -397,7 +397,7 @@ PACK(typedef struct t_ExpoData {
   char     name[LEN_EXPOMIX_NAME];
   int8_t   offset;
   CurveRef curve;
-  uint8_t  spare[2];
+  uint8_t  spare;
 }) ExpoData;
 #define MIN_EXPO_WEIGHT         -100
 #define EXPO_VALID(ed)          ((ed)->srcRaw)
@@ -508,7 +508,7 @@ PACK(typedef struct t_MixData {
   uint8_t  srcRaw;
   int16_t  offset;
   char     name[LEN_EXPOMIX_NAME];
-  uint8_t  spare[2];
+  uint8_t  spare;
 }) MixData;
 #else
 PACK(typedef struct t_MixData {
@@ -988,8 +988,7 @@ PACK(typedef struct t_FrSkyData {
   FrSkyRSSIAlarm rssiAlarms[2];
   uint16_t mAhPersistent:1;
   uint16_t storedMah:15;
-  int8_t  fasOffset:5;
-  uint8_t spare:3;
+  int8_t   fasOffset;
 }) FrSkyData;
 #else
 #define MAX_FRSKY_SCREENS 2
@@ -1007,8 +1006,7 @@ PACK(typedef struct t_FrSkyData {
   int8_t  varioCenterMin:5;
   uint8_t currentSource:3;
   int8_t  varioCenterMax:5;
-  int8_t  fasOffset:5;
-  uint8_t spare:3;
+  int8_t  fasOffset;
 }) FrSkyData;
 #endif
 
@@ -1412,24 +1410,28 @@ PACK(typedef struct t_ModelHeader {
 }) ModelHeader;
 
 #if defined (CPUARM)
-  #define ARM_OR_AVR(x, y) x
+  #define ARM_FIELD(x) x;
+  #define AVR_FIELD(x)
 #else
-  #define ARM_OR_AVR(x, y) y
+  #define ARM_FIELD(x)
+  #define AVR_FIELD(x) x;
 #endif
 
 PACK(typedef struct t_ModelData {
   ModelHeader header;
   TimerData timers[MAX_TIMERS];
-  uint8_t   protocol:3;
+  uint8_t    protocol:3; // not used on Taranis
   uint8_t   thrTrim:1;            // Enable Throttle Trim
-  int8_t    ppmNCH:4; /* spare on ARM */
+  AVR_FIELD(int8_t    ppmNCH:4)
+  ARM_FIELD(int8_t    spare2:4)
   uint8_t   trimInc:3;            // Trim Increments
   uint8_t   disableThrottleWarning:1;
-  uint8_t   ARM_OR_AVR(displayText, pulsePol):1;
+  ARM_FIELD(uint8_t displayText:1)
+  AVR_FIELD(uint8_t pulsePol:1)
   uint8_t   extendedLimits:1;
   uint8_t   extendedTrims:1;
   uint8_t   throttleReversed:1;
-  int8_t    ppmDelay; /* spare on ARM */
+  AVR_FIELD(int8_t ppmDelay)
   BeepANACenter beepANACenter;        // 1<<0->A1.. 1<<6->A7
   MixData   mixData[MAX_MIXERS];
   LimitData limitData[NUM_CHNOUT];
@@ -1443,11 +1445,10 @@ PACK(typedef struct t_ModelData {
   SwashRingData swashR;
   PhaseData phaseData[MAX_PHASES];
 
-  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5ms increments
+  AVR_FIELD(int8_t ppmFrameLength)     // 0=22.5ms  (10ms-30ms) 0.5ms increments
   uint8_t   thrTraceSrc;
   
   swstate_t switchWarningStates;
-  uint8_t   nSwToWarn;
 
   MODEL_GVARS_DATA
 
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index c5dd5adce..ee634a7d2 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -73,7 +73,7 @@ OS_TID btTaskId;
 OS_STK btStack[BT_STACK_SIZE];
 #endif
 
-#if defined(CPUARM) && defined(DEBUG)
+#if defined(DEBUG)
 OS_TID debugTaskId;
 OS_STK debugStack[DEBUG_STACK_SIZE];
 #endif
diff --git a/radio/src/simpgmspace.cpp b/radio/src/simpgmspace.cpp
index 48aecb6c7..10c7abd4a 100644
--- a/radio/src/simpgmspace.cpp
+++ b/radio/src/simpgmspace.cpp
@@ -345,6 +345,11 @@ void StartMainThread(bool tests)
     getcwd(simuSdDirectory, 1024);
 #endif
 
+#if defined(CPUARM)
+  pthread_mutex_init(&mixerMutex, NULL);
+  pthread_mutex_init(&audioMutex, NULL);
+#endif
+
   main_thread_running = (tests ? 1 : 2);
   pthread_create(&main_thread_pid, NULL, &main_thread, NULL);
 }