diff --git a/.gitignore b/.gitignore
index ec42fe618..a3460b017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ radio/src/bootloader/.dep/
 radio/src/bootloader/bootloader_ramBoot*
 *.lbm
 *.o
+/doc
diff --git a/DONATIONS.txt b/DONATIONS.txt
index 573271369..591417a3d 100644
--- a/DONATIONS.txt
+++ b/DONATIONS.txt
@@ -178,14 +178,14 @@ Nicholas Crego
 Keith Hertzog
 Johan Moelich
 Timo Esser
-Dean Church (mensual)
-Brian Paddock (mensual)
+Dean Church (monthly)
+Brian Paddock (monthly)
 Jean Pierre Parisy
 Norbert Martsch
 Jean-Marie Guitard
 Eric Beier
 Mike Perkins
-Tilman Baumann (mensual)
+Tilman Baumann (monthly)
 Fred Larssen
 Ari Aalto
 Robert Sams 
@@ -197,7 +197,7 @@ Kenneth Crump
 Dave Matison
 Mike Matheny
 Pino Agostino
-Graham Boucher (mensual)
+Graham Boucher (monthly)
 Nelson Noura
 Joel Allamy
 Philip David Martin
@@ -208,7 +208,7 @@ Timothy Pelletier
 Glen Roe (ShowMaster)
 Jan Van Ooteghem
 David Ankers - Special thanks here to the OpenPilot project!
-Lawrence Christensen (mensual)
+Lawrence Christensen (monthly)
 Leo Duflou
 Bruce Wood
 Arnd Feige
@@ -372,3 +372,6 @@ Aaron Stringer
 Alan J Wasserman
 Wolfgang Rauser
 Samuel Cook
+BoltRC - www.boltrc.com
+Friedrich Ipolt
+ 
diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index 462200d3f..362d84c9e 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -11,14 +11,22 @@
 #include <QDesktopServices>
 #include <QtGui>
 
-appPreferencesDialog::appPreferencesDialog(QWidget *parent) :
+AppPreferencesDialog::AppPreferencesDialog(QWidget *parent) :
   QDialog(parent),
-  ui(new Ui::appPreferencesDialog)
+  ui(new Ui::AppPreferencesDialog)
 {
   ui->setupUi(this);
+  updateLock=false;
   setWindowIcon(CompanionIcon("apppreferences.png"));
+
+  voice=NULL;
+  connect(ui->langCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged()));
+  connect(ui->voiceCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged()));
+
   initSettings();
+  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
   connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
+
 #ifndef JOYSTICKS
   ui->joystickCB->hide();
   ui->joystickCB->setDisabled(true);
@@ -26,15 +34,16 @@ appPreferencesDialog::appPreferencesDialog(QWidget *parent) :
   ui->joystickChkB->hide();
   ui->label_11->hide();
 #endif
-  resize(0,0);
+
+  shrink();
 }
 
-appPreferencesDialog::~appPreferencesDialog()
+AppPreferencesDialog::~AppPreferencesDialog()
 {
   delete ui;
 }
 
-void appPreferencesDialog::writeValues()
+void AppPreferencesDialog::writeValues()
 {
   g.autoCheckApp(ui->startupCheck_companion9x->isChecked());
   g.autoCheckFw(ui->startupCheck_fw->isChecked());
@@ -69,17 +78,17 @@ void appPreferencesDialog::writeValues()
   else
     g.profile[g.id()].name(ui->profileNameLE->text());
 
-  // If a new radio type has been choosen, several things need to reset
-  if ( initialRadioType != ui->radioCB->currentIndex())
-  {
+  // If a new fw type has been choosen, several things need to reset
+  g.cpuId( ui->CPU_ID_LE->text() );
+  current_firmware_variant = getFirmwareVariant();
+  if (g.profile[g.id()].fwType() != current_firmware_variant.id) {
     g.profile[g.id()].fwName("");
-    g.profile[g.id()].fwType(getDefaultFwType(ui->radioCB->currentIndex()));
-    current_firmware_variant = GetFirmwareVariant(g.profile[g.id()].fwType());
     g.profile[g.id()].initFwVariables();
+    g.profile[g.id()].fwType( current_firmware_variant.id );
   }
 }
 
-void appPreferencesDialog::on_snapshotPathButton_clicked()
+void AppPreferencesDialog::on_snapshotPathButton_clicked()
 {
   QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your snapshot folder"), g.snapshotDir());
   if (!fileName.isEmpty()) {
@@ -89,7 +98,7 @@ void appPreferencesDialog::on_snapshotPathButton_clicked()
   }
 }
 
-void appPreferencesDialog::initSettings()
+void AppPreferencesDialog::initSettings()
 {
   ui->snapshotClipboardCKB->setChecked(g.snapToClpbrd());
   ui->burnFirmware->setChecked(g.profile[g.id()].burnFirmware());
@@ -105,8 +114,10 @@ void appPreferencesDialog::initSettings()
   ui->showSplash->setChecked(g.showSplash());
   ui->historySize->setValue(g.historySize());
   ui->backLightColor->setCurrentIndex(g.backLight());
-  if (getRadioType(g.profile[g.id()].fwType())==6)  // TODO - NOT AT ALL OK. THERE SHOULD BE A COMMON RADIO DEFINITION.
+
+  if (IS_TARANIS(GetCurrentFirmware()->getBoard()))
     ui->backLightColor->setEnabled(false);
+
   ui->simuSW->setChecked(g.simuSW());
   ui->modelWizard_CB->setChecked(g.useWizard());
   ui->libraryPath->setText(g.libDir());
@@ -159,8 +170,7 @@ void appPreferencesDialog::initSettings()
   ui->sdPath->setText(g.profile[g.id()].sdPath());
   ui->profileNameLE->setText(g.profile[g.id()].name());
   ui->SplashFileName->setText(g.profile[g.id()].splashFile());
-  initialRadioType = getRadioType(g.profile[g.id()].fwType());
-  ui->radioCB->setCurrentIndex(initialRadioType);
+
   displayImage( g.profile[g.id()].splashFile() );
 
   QString hwSettings;
@@ -176,9 +186,22 @@ void appPreferencesDialog::initSettings()
   }
   ui->lblGeneralSettings->setText(hwSettings);
 
+
+  ui->CPU_ID_LE->setText(g.cpuId());
+  FirmwareInterface * current_firmware = GetCurrentFirmware();
+
+  foreach(FirmwareInterface * firmware, firmwares) {
+    ui->downloadVerCB->addItem(firmware->name, firmware->id);
+    if (current_firmware == firmware) {
+      ui->downloadVerCB->setCurrentIndex(ui->downloadVerCB->count() - 1);
+    }
+  }
+  
+  baseFirmwareChanged();
+  firmwareChanged();
 }
 
-void appPreferencesDialog::on_libraryPathButton_clicked()
+void AppPreferencesDialog::on_libraryPathButton_clicked()
 {
   QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your library folder"), g.libDir());
   if (!fileName.isEmpty()) {
@@ -187,13 +210,14 @@ void appPreferencesDialog::on_libraryPathButton_clicked()
   }
 }
 
-void appPreferencesDialog::on_snapshotClipboardCKB_clicked()
+void AppPreferencesDialog::on_snapshotClipboardCKB_clicked()
 {
   if (ui->snapshotClipboardCKB->isChecked()) {
     ui->snapshotPath->setDisabled(true);
     ui->snapshotPathButton->setDisabled(true);
     g.snapToClpbrd(true);
-  } else {
+  }
+  else {
     ui->snapshotPath->setEnabled(true);
     ui->snapshotPath->setReadOnly(true);
     ui->snapshotPathButton->setEnabled(true);
@@ -201,7 +225,7 @@ void appPreferencesDialog::on_snapshotClipboardCKB_clicked()
   }
 }
 
-void appPreferencesDialog::on_backupPathButton_clicked()
+void AppPreferencesDialog::on_backupPathButton_clicked()
 {
   QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your Models and Settings backup folder"), g.backupDir());
   if (!fileName.isEmpty()) {
@@ -211,7 +235,7 @@ void appPreferencesDialog::on_backupPathButton_clicked()
   ui->backupEnable->setEnabled(true);
 }
 
-void appPreferencesDialog::on_ge_pathButton_clicked()
+void AppPreferencesDialog::on_ge_pathButton_clicked()
 {
   QString fileName = QFileDialog::getOpenFileName(this, tr("Select Google Earth executable"),ui->ge_lineedit->text());
   if (!fileName.isEmpty()) {
@@ -220,7 +244,7 @@ void appPreferencesDialog::on_ge_pathButton_clicked()
 }
  
 #ifdef JOYSTICKS
-void appPreferencesDialog::on_joystickChkB_clicked() {
+void AppPreferencesDialog::on_joystickChkB_clicked() {
   if (ui->joystickChkB->isChecked()) {
     QStringList joystickNames;
     joystickNames << tr("No joysticks found");
@@ -246,7 +270,7 @@ void appPreferencesDialog::on_joystickChkB_clicked() {
   }
 }
 
-void appPreferencesDialog::on_joystickcalButton_clicked() {
+void AppPreferencesDialog::on_joystickcalButton_clicked() {
    joystickDialog * jd=new joystickDialog(this, ui->joystickCB->currentIndex());
    jd->exec();
 }
@@ -254,7 +278,7 @@ void appPreferencesDialog::on_joystickcalButton_clicked() {
 
 // ******** Profile tab functions
 
-void appPreferencesDialog::on_sdPathButton_clicked()
+void AppPreferencesDialog::on_sdPathButton_clicked()
 {
   QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), g.profile[g.id()].sdPath());
   if (!fileName.isEmpty()) {
@@ -262,12 +286,12 @@ void appPreferencesDialog::on_sdPathButton_clicked()
   }
 }
 
-void appPreferencesDialog::on_removeProfileButton_clicked()
+void AppPreferencesDialog::on_removeProfileButton_clicked()
 {
-  if ( g.id() == 0 )
+  if ( g.id() == 0 ) {
      QMessageBox::information(this, tr("Not possible to remove profile"), tr("The default profile can not be removed."));
-  else
-  {
+  }
+  else {
     g.profile[g.id()].remove();
     g.id( 0 );
     initSettings();
@@ -275,7 +299,7 @@ void appPreferencesDialog::on_removeProfileButton_clicked()
 }
 
 
-bool appPreferencesDialog::displayImage( QString fileName )
+bool AppPreferencesDialog::displayImage( QString fileName )
 {
   // Start by clearing the pixmap
   ui->imageLabel->setPixmap(QPixmap());
@@ -294,7 +318,7 @@ bool appPreferencesDialog::displayImage( QString fileName )
   return true;
 }
 
-void appPreferencesDialog::on_SplashSelect_clicked()
+void AppPreferencesDialog::on_SplashSelect_clicked()
 {
   QString supportedImageFormats;
   for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
@@ -312,11 +336,204 @@ void appPreferencesDialog::on_SplashSelect_clicked()
   }
 }
 
-void appPreferencesDialog::on_clearImageButton_clicked() {
+void AppPreferencesDialog::on_clearImageButton_clicked() {
   ui->imageLabel->clear();
   ui->SplashFileName->clear();
 }
 
 
+void AppPreferencesDialog::showVoice(bool show)
+{
+  if (show)
+    showVoice();
+  else
+    hideVoice();
+}
+
+void AppPreferencesDialog::showVoice()
+{
+  ui->voiceLabel->show();
+  ui->voiceCombo->show();
+}
+
+void AppPreferencesDialog::hideVoice()
+{
+  ui->voiceLabel->hide();
+  ui->voiceCombo->hide();
+  QTimer::singleShot(0, this, SLOT(shrink()));
+}
 
 
+void AppPreferencesDialog::baseFirmwareChanged()
+{
+  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
+  voice=NULL;
+  foreach(FirmwareInterface * firmware, firmwares) {
+    if (firmware->id == selected_firmware) {
+      showVoice(firmware->voice);
+      populateFirmwareOptions(firmware);
+      break;
+    }
+  }
+  firmwareChanged();
+}
+
+FirmwareVariant AppPreferencesDialog::getFirmwareVariant()
+{
+  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
+  bool voice=false;
+  foreach(FirmwareInterface * firmware, firmwares) {
+    if (firmware->id == selected_firmware) {
+      QString id = firmware->id;
+      foreach(QCheckBox *cb, optionsCheckBoxes) {
+        if (cb->isChecked()) {
+          if (cb->text()=="voice" && cb->isChecked())
+            voice=true;
+          id += QString("-") + cb->text();
+        }
+      }
+      if (! firmware->getCapability(MultiLangVoice)) {
+        if (ui->voiceCombo->count() && (voice || firmware->voice))
+          id += QString("-tts") + ui->voiceCombo->currentText();
+      }
+      if (ui->langCombo->count())
+        id += QString("-") + ui->langCombo->currentText();
+
+      return GetFirmwareVariant(id);
+    }
+  }
+
+  // Should never occur...
+  return default_firmware_variant;
+}
+
+void AppPreferencesDialog::firmwareOptionChanged(bool state)
+{
+  QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
+  FirmwareInterface * firmware=NULL;
+  if (cb && state) {
+    QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
+    foreach(firmware, firmwares) {
+      if (firmware->id == selected_firmware) {
+        foreach(QList<Option> opts, firmware->opts) {
+          foreach(Option opt, opts) {
+            if (cb->text() == opt.name) {
+              foreach(Option other, opts) {
+                if (other.name != opt.name) {
+                  foreach(QCheckBox *ocb, optionsCheckBoxes) {
+                    if (ocb->text() == other.name)
+                      ocb->setChecked(false);
+                  }
+                }
+              }
+              if (voice) {
+                showVoice(voice->isChecked());
+              }
+              
+              return firmwareChanged();
+            }
+          }
+        }
+      }
+    }
+  } 
+  else if (cb && !state) {
+    if (cb->text()=="voice") {
+      hideVoice();
+    }
+  }
+  if (voice) {
+    showVoice(voice->isChecked());
+  }
+  else if (firmware) {
+    if (firmware->voice) {
+      showVoice();    
+    }
+  }
+  return firmwareChanged();
+}
+
+void AppPreferencesDialog::firmwareLangChanged()
+{
+  firmwareChanged();
+}
+
+void AppPreferencesDialog::firmwareChanged()
+{
+  if (updateLock)
+    return;
+  
+  FirmwareVariant variant = getFirmwareVariant();
+  QString stamp;
+  stamp.append(variant.firmware->getStampUrl());
+  QString url = variant.getFirmwareUrl();
+  // B-Plan 
+  if (false) {
+    ui->CPU_ID_LE->show();
+    ui->CPU_ID_LABEL->show();
+  } else {
+    ui->CPU_ID_LE->hide();
+    ui->CPU_ID_LABEL->hide();
+  }
+}
+
+void AppPreferencesDialog::populateFirmwareOptions(const FirmwareInterface * firmware)
+{
+  const FirmwareInterface * parent = /*firmware->parent ? firmware->parent : */ firmware;
+
+  updateLock = true;
+
+  ui->langCombo->clear();
+  foreach(const char *lang, parent->languages) {
+    ui->langCombo->addItem(lang);
+    if (current_firmware_variant.id.endsWith(lang))
+      ui->langCombo->setCurrentIndex(ui->langCombo->count() - 1);
+  }
+  ui->voiceCombo->clear();
+  foreach(const char *lang, parent->ttslanguages) {
+    ui->voiceCombo->addItem(lang);
+    if (current_firmware_variant.id.contains(QString("-tts%1").arg(lang)))
+      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
+  }
+
+  showVoice(ui->langCombo->count()!=0);
+
+  int index = 0;
+  foreach(QList<Option> opts, parent->opts) {
+    foreach(Option opt, opts) {
+      if (index >= optionsCheckBoxes.size()) {
+        QCheckBox * checkbox = new QCheckBox(ui->profileTab);
+        ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/5, optionsCheckBoxes.count()%5, 1, 1);
+        optionsCheckBoxes.push_back(checkbox);
+        connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
+      }
+
+      QCheckBox *cb = optionsCheckBoxes.at(index++);
+      if (cb) {
+        cb->show();
+        cb->setText(opt.name);
+        cb->setToolTip(opt.tooltip);
+        cb->setCheckState(current_firmware_variant.id.contains(opt.name) ? Qt::Checked : Qt::Unchecked);
+            
+        if (opt.name==QString("voice")) {
+          voice=cb;
+          showVoice(current_firmware_variant.id.contains(opt.name) ||firmware->voice);
+        }
+      }
+    }
+  }
+  for (; index<optionsCheckBoxes.size(); index++) {
+    QCheckBox *cb = optionsCheckBoxes.at(index);
+    cb->hide();
+    cb->setCheckState(Qt::Unchecked);
+  }
+
+  updateLock = false;
+  QTimer::singleShot(0, this, SLOT(shrink()));
+}
+
+void AppPreferencesDialog::shrink()
+{
+  resize(0,0);
+}
+
diff --git a/companion/src/apppreferencesdialog.h b/companion/src/apppreferencesdialog.h
index 46bdf3156..68ffc088a 100644
--- a/companion/src/apppreferencesdialog.h
+++ b/companion/src/apppreferencesdialog.h
@@ -6,29 +6,44 @@
 #include "eeprominterface.h"
 
 namespace Ui {
-    class appPreferencesDialog;
+  class AppPreferencesDialog;
 }
 
 class Joystick;
 
-class appPreferencesDialog : public QDialog
+class AppPreferencesDialog : public QDialog
 {
     Q_OBJECT
 
-public:
-    explicit appPreferencesDialog(QWidget *parent = 0);
-    ~appPreferencesDialog();
+  public:
+    explicit AppPreferencesDialog(QWidget *parent = 0);
+    ~AppPreferencesDialog();
     Joystick *joystick;
 
-private:
-    int initialRadioType;
-    Ui::appPreferencesDialog *ui;
+  private:
+    QList<QCheckBox *> optionsCheckBoxes;
+    bool updateLock;
+    void showVoice(bool);
+    void showVoice();
+    void hideVoice();
+    void populateLocale();
+    void populateFirmwareOptions(const FirmwareInterface *);
+    FirmwareVariant getFirmwareVariant();
+    QCheckBox * voice;
+
+    Ui::AppPreferencesDialog *ui;
     void initSettings();
     bool displayImage( QString fileName );
     void loadProfileString(QString profile, QString label);
     void loadFromProfile();
 
-private slots:
+  protected slots:
+    void shrink();  
+    void firmwareLangChanged();
+    void baseFirmwareChanged();
+    void firmwareOptionChanged(bool state);
+    void firmwareChanged();
+
     void writeValues();
     void on_libraryPathButton_clicked();
     void on_snapshotPathButton_clicked();
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index e0d4a0264..f3c967885 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>appPreferencesDialog</class>
- <widget class="QDialog" name="appPreferencesDialog">
+ <class>AppPreferencesDialog</class>
+ <widget class="QDialog" name="AppPreferencesDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>736</width>
-    <height>514</height>
+    <width>685</width>
+    <height>818</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -42,7 +42,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="1" column="1">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -52,14 +52,120 @@
        <string>Radio Profile</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
-       <item row="10" column="1" colspan="5">
-        <widget class="Line" name="line_6">
+       <item row="22" column="5">
+        <widget class="QPushButton" name="sdPathButton">
+         <property name="text">
+          <string>Open Folder</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QComboBox" name="downloadVerCB">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="26" column="0">
+        <widget class="QLabel" name="label_13">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Default Channel Order</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Build Options</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="langLabel">
+         <property name="text">
+          <string>Menu Language</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="24" column="0">
+        <widget class="QLabel" name="label_14">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Default Stick Mode</string>
+         </property>
+        </widget>
+       </item>
+       <item row="15" column="5">
+        <widget class="QPushButton" name="SplashSelect">
+         <property name="text">
+          <string>Select Image</string>
+         </property>
+        </widget>
+       </item>
+       <item row="23" column="1">
+        <widget class="QLabel" name="lblGeneralSettings">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="text">
+          <string notr="true">General Settings Label</string>
+         </property>
+        </widget>
+       </item>
+       <item row="15" column="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>
+       <item row="11" column="0" colspan="6">
+        <widget class="Line" name="line_7">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="11" column="1" colspan="3">
+       <item row="10" column="1" colspan="5">
+        <layout class="QGridLayout" name="optionsLayout"/>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="CPU_ID_LABEL">
+         <property name="text">
+          <string>Processor ID</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QLineEdit" name="CPU_ID_LE"/>
+       </item>
+       <item row="24" column="1" colspan="3">
         <widget class="QComboBox" name="stickmodeCB">
          <property name="maximumSize">
           <size>
@@ -113,7 +219,26 @@ Mode 4:
          </item>
         </widget>
        </item>
-       <item row="13" column="1" colspan="3">
+       <item row="15" column="0">
+        <widget class="QLabel" name="label_8">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Splash Screen</string>
+         </property>
+        </widget>
+       </item>
+       <item row="26" column="1" colspan="3">
         <widget class="QComboBox" name="channelorderCB">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -261,27 +386,20 @@ Mode 4:
          </item>
         </widget>
        </item>
-       <item row="11" column="0">
-        <widget class="QLabel" name="label_14">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Default Stick Mode</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
+       <item row="1" column="0">
         <widget class="QLabel" name="label_2">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
          <property name="text">
           <string>Profile Name</string>
          </property>
         </widget>
        </item>
-       <item row="16" column="1">
+       <item row="29" column="1">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -294,101 +412,14 @@ Mode 4:
          </property>
         </spacer>
        </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_8">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Splash Screen</string>
-         </property>
-        </widget>
-       </item>
-       <item row="13" column="0">
-        <widget class="QLabel" name="label_13">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Default Channel Order</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="sdPathLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>SD Structure path</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1" colspan="2">
-        <widget class="QLineEdit" name="sdPath">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>350</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>350</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="4">
-        <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 row="15" column="5">
+       <item row="28" column="5">
         <widget class="QPushButton" name="removeProfileButton">
          <property name="text">
           <string>Remove Profile</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="5">
-        <widget class="QPushButton" name="sdPathButton">
-         <property name="text">
-          <string>Open Folder</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1" colspan="2">
+       <item row="15" column="1" colspan="2">
         <widget class="QLineEdit" name="SplashFileName">
          <property name="enabled">
           <bool>true</bool>
@@ -410,35 +441,14 @@ Mode 4:
          </property>
         </widget>
        </item>
-       <item row="5" column="5">
-        <widget class="QPushButton" name="SplashSelect">
-         <property name="text">
-          <string>Select Image</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Radio Type</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="5">
+       <item row="18" column="5">
         <widget class="QPushButton" name="clearImageButton">
          <property name="text">
           <string>Clear Image</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1" colspan="5">
-        <widget class="Line" name="line_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
+       <item row="1" column="1">
         <widget class="QLineEdit" name="profileNameLE">
          <property name="minimumSize">
           <size>
@@ -454,7 +464,7 @@ Mode 4:
          </property>
         </widget>
        </item>
-       <item row="8" column="1">
+       <item row="18" column="1">
         <widget class="QLabel" name="imageLabel">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -491,73 +501,156 @@ Mode 4:
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QComboBox" name="radioCB">
-         <item>
-          <property name="text">
-           <string>9X</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>9X with m128</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>9XR</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>9XR with m128</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Gruvin9x Board</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Sky9x Board</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Taranis</string>
-          </property>
-         </item>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_4">
-         <property name="text">
-          <string>General Settings</string>
-         </property>
-        </widget>
-       </item>
-       <item row="14" column="1" colspan="4">
+       <item row="27" column="1" colspan="4">
         <widget class="QCheckBox" name="renameFirmware">
          <property name="text">
           <string>Append version number to FW file name</string>
          </property>
         </widget>
        </item>
-       <item row="15" column="1" colspan="4">
+       <item row="28" column="1" colspan="4">
         <widget class="QCheckBox" name="burnFirmware">
          <property name="text">
           <string>Offer to write FW to Tx after download</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1" colspan="5">
-        <widget class="QLabel" name="lblGeneralSettings">
+       <item row="8" column="1">
+        <widget class="QComboBox" name="langCombo">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Sans Serif</family>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Radio Firmware</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="22" column="1">
+        <widget class="QLineEdit" name="sdPath">
          <property name="enabled">
           <bool>true</bool>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>350</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>350</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="20" column="0" colspan="6">
+        <widget class="Line" name="line_6">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="6">
+        <widget class="Line" name="line_8">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="21" column="0">
+        <widget class="QLabel" name="label">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
          <property name="text">
-          <string notr="true">General Settings Label</string>
+          <string>Other Settings</string>
+         </property>
+        </widget>
+       </item>
+       <item row="23" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>General Settings</string>
+         </property>
+        </widget>
+       </item>
+       <item row="22" column="0">
+        <widget class="QLabel" name="sdPathLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>SD Structure path</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QComboBox" name="voiceCombo">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>Set language of voice.
+May be different from firmware language</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="voiceLabel">
+         <property name="font">
+          <font>
+           <family>Sans Serif</family>
+           <weight>50</weight>
+           <bold>false</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Voice Language</string>
          </property>
         </widget>
        </item>
@@ -1006,7 +1099,6 @@ Mode 4:
   </layout>
  </widget>
  <tabstops>
-  <tabstop>tabWidget</tabstop>
   <tabstop>ge_lineedit</tabstop>
   <tabstop>ge_pathButton</tabstop>
   <tabstop>historySize</tabstop>
@@ -1028,7 +1120,6 @@ Mode 4:
   <tabstop>joystickCB</tabstop>
   <tabstop>joystickChkB</tabstop>
   <tabstop>joystickcalButton</tabstop>
-  <tabstop>sdPath</tabstop>
   <tabstop>SplashFileName</tabstop>
   <tabstop>stickmodeCB</tabstop>
   <tabstop>channelorderCB</tabstop>
@@ -1042,12 +1133,12 @@ Mode 4:
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>appPreferencesDialog</receiver>
+   <receiver>AppPreferencesDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>382</x>
-     <y>455</y>
+     <x>388</x>
+     <y>835</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -1055,21 +1146,5 @@ Mode 4:
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>appPreferencesDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>402</x>
-     <y>455</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>
diff --git a/companion/src/avroutputdialog.cpp b/companion/src/avroutputdialog.cpp
index e7f6243aa..6dcb22d68 100644
--- a/companion/src/avroutputdialog.cpp
+++ b/companion/src/avroutputdialog.cpp
@@ -327,7 +327,7 @@ void avrOutputDialog::errorWizard()
       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();
+      FirmwareInterface *firmware = GetCurrentFirmware();
       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));
     }
   }
diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp
index aad8c884e..5f9438867 100644
--- a/companion/src/burndialog.cpp
+++ b/companion/src/burndialog.cpp
@@ -445,7 +445,7 @@ void burnDialog::on_BurnFlashButton_clicked()
   if (hexType==EEPROM_FILE_TYPE) {
     QString calib = g.profile[g.id()].stickPotCalib();
     QString trainercalib = g.profile[g.id()].trainerCalib();
-    int potsnum=GetEepromInterface()->getCapability(Pots);
+    int potsnum=GetCurrentFirmware()->getCapability(Pots);
     int8_t vBatCalib=(int8_t) g.profile[g.id()].vBatCalib();
     int8_t currentCalib=(int8_t) g.profile[g.id()].currentCalib();
     int8_t PPM_Multiplier=(int8_t) g.profile[g.id()].ppmMultiplier();
diff --git a/companion/src/companion.cpp b/companion/src/companion.cpp
index ce0f282ae..f41c25bb2 100644
--- a/companion/src/companion.cpp
+++ b/companion/src/companion.cpp
@@ -104,7 +104,8 @@ int main(int argc, char *argv[])
   QPixmap pixmap = QPixmap(g.profile[g.id()].fwType().contains("taranis") ? ":/images/splasht.png" : ":/images/splash.png");
   QSplashScreen *splash = new QSplashScreen(pixmap);
 
-  RegisterFirmwares();
+  RegisterEepromInterfaces();
+  registerOpenTxFirmwares();
 
   current_firmware_variant = GetFirmwareVariant(g.profile[g.id()].fwType());
 
@@ -124,6 +125,7 @@ int main(int argc, char *argv[])
   delete mainWin;
 
   UnregisterFirmwares();
+  UnregisterEepromInterfaces();
 
   return result;
 }
diff --git a/companion/src/comparedialog.cpp b/companion/src/comparedialog.cpp
index 95fab3fe0..85e34f7cc 100644
--- a/companion/src/comparedialog.cpp
+++ b/companion/src/comparedialog.cpp
@@ -24,39 +24,38 @@ public:
   uint8_t models[C9X_MAX_MODELS];
 };
 
-compareDialog::compareDialog(QWidget *parent, GeneralSettings *gg) :
-    QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-    ui(new Ui::compareDialog)
+CompareDialog::CompareDialog(QWidget * parent):
+  QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+  model1(0),
+  model2(0),
+  ui(new Ui::CompareDialog)
 {
   ui->setupUi(this);
   this->setWindowIcon(CompanionIcon("compare.png"));
-  g_eeGeneral = gg;
-  eepromInterface = GetEepromInterface();
   te = ui->textEdit;
   this->setAcceptDrops(true);
-  model1=0;
-  model2=0;
+
+  // TODO this is really horrible  
   g_model1=(ModelData *)malloc(sizeof(ModelData));
   g_model2=(ModelData *)malloc(sizeof(ModelData));
   modeltemp=(ModelData *)malloc(sizeof(ModelData));
-    //setDragDropOverwriteMode(true);
-    //setDropIndicatorShown(true);
-/*
-    printFrSky();
-*/    
-    te->scrollToAnchor("1");
+
+  //setDragDropOverwriteMode(true);
+  //setDropIndicatorShown(true);
+  te->scrollToAnchor("1");
 }
 
-void compareDialog::dragMoveEvent(QDragMoveEvent *event)
+void CompareDialog::dragMoveEvent(QDragMoveEvent *event)
 {
   if (event->mimeData()->hasFormat("application/x-companion")) {   
     event->acceptProposedAction();
-  } else {
+  }
+  else {
     event->ignore();
   }
 }
 
-void compareDialog::dragEnterEvent(QDragEnterEvent *event)
+void CompareDialog::dragEnterEvent(QDragEnterEvent *event)
 {
   // accept just text/uri-list mime format
   if (event->mimeData()->hasFormat("application/x-companion")) {   
@@ -66,16 +65,16 @@ void compareDialog::dragEnterEvent(QDragEnterEvent *event)
   }
 }
 
-void compareDialog::dragLeaveEvent(QDragLeaveEvent *event)
+void CompareDialog::dragLeaveEvent(QDragLeaveEvent *event)
 {
   event->accept();
 }
 
-void compareDialog::printDiff()
+void CompareDialog::printDiff()
 {
   te->clear();
   printSetup();
-  if (GetEepromInterface()->getCapability(FlightPhases)) {
+  if (GetCurrentFirmware()->getCapability(FlightPhases)) {
     printPhases();
   }
   printExpos();
@@ -89,7 +88,7 @@ void compareDialog::printDiff()
   te->scrollToAnchor("1");
 }
 
-void compareDialog::dropEvent(QDropEvent *event)
+void CompareDialog::dropEvent(QDropEvent *event)
 {
   QLabel *child = qobject_cast<QLabel*>(childAt(event->pos()));
   const QMimeData  *mimeData = event->mimeData();
@@ -153,7 +152,7 @@ void compareDialog::dropEvent(QDropEvent *event)
   }
 }
 
-void compareDialog::closeEvent(QCloseEvent *event) 
+void CompareDialog::closeEvent(QCloseEvent *event) 
 {
   QByteArray ba = curvefile5.toLatin1();
   char *name = ba.data(); 
@@ -163,12 +162,12 @@ void compareDialog::closeEvent(QCloseEvent *event)
   unlink(name);    
 }
 
-compareDialog::~compareDialog()
+CompareDialog::~CompareDialog()
 {
   delete ui;
 }
 
-QString compareDialog::doTC(const QString s, const QString color="", bool bold=false)
+QString CompareDialog::doTC(const QString s, const QString color="", bool bold=false)
 {
   QString str = s;
   if(bold) str = "<b>" + str + "</b>";
@@ -176,7 +175,7 @@ QString compareDialog::doTC(const QString s, const QString color="", bool bold=f
   return "<td align=center>" + str + "</td>";
 }
 
-QString compareDialog::doTR(const QString s, const QString color="", bool bold=false)
+QString CompareDialog::doTR(const QString s, const QString color="", bool bold=false)
 {
   QString str = s;
   if(bold) str = "<b>" + str + "</b>";
@@ -184,7 +183,7 @@ QString compareDialog::doTR(const QString s, const QString color="", bool bold=f
   return "<td align=right>" + str + "</td>";
 }
 
-QString compareDialog::doTL(const QString s, const QString color="", bool bold=false)
+QString CompareDialog::doTL(const QString s, const QString color="", bool bold=false)
 {
   QString str = s;
   if(bold) str = "<b>" + str + "</b>";
@@ -192,14 +191,14 @@ QString compareDialog::doTL(const QString s, const QString color="", bool bold=f
   return "<td align=left>" + str + "</td>";
 }
 
-QString compareDialog::fv(const QString name, const QString value, const QString color="green")
+QString CompareDialog::fv(const QString name, const QString value, const QString color="green")
 {
     return "<b>" + name + ": </b><font color=" +color + ">" + value + "</font><br>";
 }
 
 
 
-int compareDialog::ModelHasExpo(ExpoData * ExpoArray, ExpoData expo, bool * expoused)
+int CompareDialog::ModelHasExpo(ExpoData * ExpoArray, ExpoData expo, bool * expoused)
 {
   for (int i=0; i< C9X_MAX_EXPOS; i++) {
     if ((memcmp(&expo,&ExpoArray[i],sizeof(ExpoData))==0) && (expoused[i]==false)) {
@@ -209,7 +208,7 @@ int compareDialog::ModelHasExpo(ExpoData * ExpoArray, ExpoData expo, bool * expo
   return -1;
 }
 
-bool compareDialog::ChannelHasExpo(ExpoData * expoArray, uint8_t destCh)
+bool CompareDialog::ChannelHasExpo(ExpoData * expoArray, uint8_t destCh)
 {
   for (int i=0; i< C9X_MAX_EXPOS; i++) {
     if ((expoArray[i].chn==destCh)&&(expoArray[i].mode!=0)) {
@@ -219,7 +218,7 @@ bool compareDialog::ChannelHasExpo(ExpoData * expoArray, uint8_t destCh)
   return false;
 }
 
-int compareDialog::ModelHasMix(MixData * mixArray, MixData mix, bool * mixused)
+int CompareDialog::ModelHasMix(MixData * mixArray, MixData mix, bool * mixused)
 {
   for (int i=0; i< C9X_MAX_MIXERS; i++) {
     if ((memcmp(&mix,&mixArray[i],sizeof(MixData))==0) && (mixused[i]==false)) {
@@ -229,7 +228,7 @@ int compareDialog::ModelHasMix(MixData * mixArray, MixData mix, bool * mixused)
   return -1;
 }
 
-bool compareDialog::ChannelHasMix(MixData * mixArray, uint8_t destCh)
+bool CompareDialog::ChannelHasMix(MixData * mixArray, uint8_t destCh)
 {
   for (int i=0; i< C9X_MAX_MIXERS; i++) {
     if (mixArray[i].destCh==destCh) {
@@ -239,7 +238,7 @@ bool compareDialog::ChannelHasMix(MixData * mixArray, uint8_t destCh)
   return false;
 }
 
-void compareDialog::printSetup()
+void CompareDialog::printSetup()
 {
   QString color;
   QString str = "<a name=1></a><table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
@@ -247,8 +246,8 @@ void compareDialog::printSetup()
   str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3 width=\"50%\">");
   color=getColor1(g_model1->name,g_model2->name);
   str.append(fv(tr("Name"), g_model1->name, color));
-  color=getColor1(eepromInterface->getSize(*g_model1),eepromInterface->getSize(*g_model2));
-  str.append("<b>"+tr("EEprom Size")+QString(": </b><font color=%2>%1</font><br>").arg(eepromInterface->getSize(*g_model1)).arg(color));
+  color=getColor1(GetEepromInterface()->getSize(*g_model1), GetEepromInterface()->getSize(*g_model2));
+  str.append("<b>"+tr("EEprom Size")+QString(": </b><font color=%2>%1</font><br>").arg(GetEepromInterface()->getSize(*g_model1)).arg(color));
   color=getColor1(getTimerStr(g_model1->timers[0]), getTimerStr(g_model2->timers[0]));
   str.append(fv(tr("Timer1"), getTimerStr(g_model1->timers[0]), color));  //value, mode, count up/down
   color=getColor1(getTimerStr(g_model1->timers[1]), getTimerStr(g_model2->timers[1]));
@@ -270,8 +269,8 @@ void compareDialog::printSetup()
   str.append("<td><table border=0 cellspacing=0 cellpadding=3 width=\"50%\">");
   color=getColor2(g_model1->name,g_model2->name);
   str.append(fv(tr("Name"), g_model2->name, color));
-  color=getColor2(eepromInterface->getSize(*g_model1),eepromInterface->getSize(*g_model2));
-  str.append("<b>"+tr("EEprom Size")+QString(": </b><font color=%2>%1</font><br>").arg(eepromInterface->getSize(*g_model2)).arg(color));
+  color=getColor2(GetEepromInterface()->getSize(*g_model1), GetEepromInterface()->getSize(*g_model2));
+  str.append("<b>"+tr("EEprom Size")+QString(": </b><font color=%2>%1</font><br>").arg(GetEepromInterface()->getSize(*g_model2)).arg(color));
   color=getColor2(getTimerStr(g_model1->timers[0]), getTimerStr(g_model2->timers[0]));
   str.append(fv(tr("Timer1"), getTimerStr(g_model2->timers[0]),color));  //value, mode, count up/down
   color=getColor2(getTimerStr(g_model1->timers[1]), getTimerStr(g_model2->timers[1]));
@@ -293,7 +292,7 @@ void compareDialog::printSetup()
   te->append(str);
 }
 
-void compareDialog::printPhases()
+void CompareDialog::printPhases()
 {
   QString color;
   int i,k;
@@ -308,7 +307,7 @@ void compareDialog::printPhases()
     str.append(QString("<td width=\"40\" align=\"center\"><b>%1</b></td>").arg(getInputStr(*g_model1, i)));
   }
   str.append("</tr>");
-  for (i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+  for (i=0; i<GetCurrentFirmware()->getCapability(FlightPhases); i++) {
     PhaseData *pd1=&g_model1->phaseData[i];
     PhaseData *pd2=&g_model2->phaseData[i];
     str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
@@ -334,7 +333,7 @@ void compareDialog::printPhases()
   str.append("</table>");
   int gvars=0;
   int gvarnum=0;
-  if (GetEepromInterface()->getCapability(HasVariants)) {
+  if (GetCurrentFirmware()->getCapability(HasVariants)) {
     if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
       gvars=1;
     }
@@ -342,35 +341,35 @@ void compareDialog::printPhases()
     gvars=1;
   }
   if (gvars==1) {
-    gvarnum=GetEepromInterface()->getCapability(Gvars);
+    gvarnum=GetCurrentFirmware()->getCapability(Gvars);
   }
-  if ((gvars==1 && GetEepromInterface()->getCapability(GvarsFlightPhases)) || GetEepromInterface()->getCapability(RotaryEncoders)) {
+  if ((gvars==1 && GetCurrentFirmware()->getCapability(GvarsFlightPhases)) || GetCurrentFirmware()->getCapability(RotaryEncoders)) {
     str.append("<br><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">");
     str.append("<tr><td style=\"border-style:none;\">&nbsp;</td>");
-    if (GetEepromInterface()->getCapability(GvarsFlightPhases)) {
+    if (GetCurrentFirmware()->getCapability(GvarsFlightPhases)) {
       
       str.append(QString("<td colspan=%1 align=center><b>").arg(gvarnum)+tr("Gvars")+"</td>");
     }
-    if (GetEepromInterface()->getCapability(RotaryEncoders)) {
-      str.append(QString("<td colspan=%1 align=center><b>").arg(GetEepromInterface()->getCapability(RotaryEncoders))+tr("Rot. Enc.")+"</td>");
+    if (GetCurrentFirmware()->getCapability(RotaryEncoders)) {
+      str.append(QString("<td colspan=%1 align=center><b>").arg(GetCurrentFirmware()->getCapability(RotaryEncoders))+tr("Rot. Enc.")+"</td>");
     }
     str.append("</tr><tr><td align=center><b>"+tr("Flight mode name")+"</b></td>");
-    if (GetEepromInterface()->getCapability(GvarsFlightPhases)) {
+    if (GetCurrentFirmware()->getCapability(GvarsFlightPhases)) {
       for (i=0; i<gvarnum; i++) {
         str.append(QString("<td width=\"40\" align=\"center\"><b>GV%1</b><br>%2</td>").arg(i+1).arg(g_model1->gvars_names[i]));
       }
     }
-    for (i=0; i<GetEepromInterface()->getCapability(RotaryEncoders); i++) {
+    for (i=0; i<GetCurrentFirmware()->getCapability(RotaryEncoders); i++) {
       str.append(QString("<td align=\"center\"><b>RE%1</b></td>").arg((i==0 ? 'A': 'B')));
     }
     str.append("</tr>");
-    for (i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+    for (i=0; i<GetCurrentFirmware()->getCapability(FlightPhases); i++) {
       PhaseData *pd1=&g_model1->phaseData[i];
       PhaseData *pd2=&g_model2->phaseData[i];
       str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
       color=getColor1(pd1->name,pd2->name);
       str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd1->name).arg(color));
-      if (GetEepromInterface()->getCapability(GvarsFlightPhases)) {
+      if (GetCurrentFirmware()->getCapability(GvarsFlightPhases)) {
         for (k=0; k<gvarnum; k++) {
           color=getColor1(pd1->gvars[k],pd2->gvars[k]);
           if (pd1->gvars[k]<=1024) {
@@ -383,7 +382,7 @@ void compareDialog::printPhases()
           }
         }
       }
-      for (k=0; k<GetEepromInterface()->getCapability(RotaryEncoders); k++) {
+      for (k=0; k<GetCurrentFirmware()->getCapability(RotaryEncoders); k++) {
         color=getColor1(pd1->rotaryEncoders[k],pd2->rotaryEncoders[k]);
         if (pd1->rotaryEncoders[k]<=1024) {
           str.append(QString("<td align=\"right\"><font size=+1 face='Courier New' color=%2>%1").arg(pd1->rotaryEncoders[k]).arg(color)+"</font></td>");
@@ -409,7 +408,7 @@ void compareDialog::printPhases()
     str.append(QString("<td width=\"40\" align=\"center\"><b>%1</b></td>").arg(getInputStr(*g_model1, i)));
   }
   str.append("</tr>");
-  for (i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+  for (i=0; i<GetCurrentFirmware()->getCapability(FlightPhases); i++) {
     PhaseData *pd1=&g_model1->phaseData[i];
     PhaseData *pd2=&g_model2->phaseData[i];
     str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
@@ -434,32 +433,32 @@ void compareDialog::printPhases()
   }
   str.append("</table>");
   
-  if ((gvars==1 && GetEepromInterface()->getCapability(GvarsFlightPhases)) || GetEepromInterface()->getCapability(RotaryEncoders)) {
+  if ((gvars==1 && GetCurrentFirmware()->getCapability(GvarsFlightPhases)) || GetCurrentFirmware()->getCapability(RotaryEncoders)) {
     str.append("<br><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">");
     str.append("<tr><td style=\"border-style:none;\">&nbsp;</td>");
-    if (GetEepromInterface()->getCapability(GvarsFlightPhases)) {
+    if (GetCurrentFirmware()->getCapability(GvarsFlightPhases)) {
       str.append(QString("<td colspan=%1 align=center><b>").arg(gvarnum)+tr("Gvars")+"</td>");
     }
-    if (GetEepromInterface()->getCapability(RotaryEncoders)) {
-      str.append(QString("<td colspan=%1 align=center><b>").arg(GetEepromInterface()->getCapability(RotaryEncoders))+tr("Rot. Enc.")+"</td>");
+    if (GetCurrentFirmware()->getCapability(RotaryEncoders)) {
+      str.append(QString("<td colspan=%1 align=center><b>").arg(GetCurrentFirmware()->getCapability(RotaryEncoders))+tr("Rot. Enc.")+"</td>");
     }
     str.append("</tr><tr><td align=center ><b>"+tr("Flight mode name")+"</b></td>");
-    if (GetEepromInterface()->getCapability(GvarsFlightPhases)) {
+    if (GetCurrentFirmware()->getCapability(GvarsFlightPhases)) {
       for (i=0; i<gvarnum; i++) {
         str.append(QString("<td width=\"40\" align=\"center\"><b>GV%1</b><br>%2</td>").arg(i+1).arg(g_model2->gvars_names[i]));
       }
     }
-    for (i=0; i<GetEepromInterface()->getCapability(RotaryEncoders); i++) {
+    for (i=0; i<GetCurrentFirmware()->getCapability(RotaryEncoders); i++) {
       str.append(QString("<td align=\"center\"><b>RE%1</b></td>").arg((i==0 ? 'A': 'B')));
     }
     str.append("</tr>");
-    for (i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+    for (i=0; i<GetCurrentFirmware()->getCapability(FlightPhases); i++) {
       PhaseData *pd1=&g_model1->phaseData[i];
       PhaseData *pd2=&g_model2->phaseData[i];
       str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
       color=getColor1(pd1->name,pd2->name);
       str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd2->name).arg(color));
-      if (GetEepromInterface()->getCapability(GvarsFlightPhases)) {
+      if (GetCurrentFirmware()->getCapability(GvarsFlightPhases)) {
         for (k=0; k<gvarnum; k++) {
           color=getColor1(pd1->gvars[k],pd2->gvars[k]);
           if (pd2->gvars[k]<=1024) {
@@ -472,7 +471,7 @@ void compareDialog::printPhases()
           }
         }
       }
-      for (k=0; k<GetEepromInterface()->getCapability(RotaryEncoders); k++) {
+      for (k=0; k<GetCurrentFirmware()->getCapability(RotaryEncoders); k++) {
         color=getColor1(pd1->rotaryEncoders[k],pd2->rotaryEncoders[k]);
         if (pd2->rotaryEncoders[k]<=1024) {
           str.append(QString("<td align=\"right\"><font size=+1 face='Courier New' color=%2>%1").arg(pd2->rotaryEncoders[k]).arg(color)+"</font></td>");
@@ -491,20 +490,20 @@ void compareDialog::printPhases()
   te->append(str);
 }
 
-void compareDialog::printLimits()
+void CompareDialog::printLimits()
 {
   QString color;
   QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\">";
   str.append("<tr><td colspan=2><h2>"+tr("Limits")+"</h2></td></tr>");
   str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"50%\">");
-  if (GetEepromInterface()->getCapability(HasChNames)) {
+  if (GetCurrentFirmware()->getCapability(HasChNames)) {
     str.append("<tr><td>"+tr("Name")+"</td><td align=center><b>"+tr("Offset")+"</b></td><td align=center><b>"+tr("Min")+"</b></td><td align=center><b>"+tr("Max")+"</b></td><td align=center><b>"+tr("Invert")+"</b></td></tr>");
   } else {
     str.append("<tr><td></td><td align=center><b>"+tr("Offset")+"</b></td><td align=center><b>"+tr("Min")+"</b></td><td align=center><b>"+tr("Max")+"</b></td><td align=center><b>"+tr("Invert")+"</b></td></tr>");    
   }
-  for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+  for(int i=0; i<GetCurrentFirmware()->getCapability(Outputs); i++) {
     str.append("<tr>");
-    if (GetEepromInterface()->getCapability(HasChNames)) {
+    if (GetCurrentFirmware()->getCapability(HasChNames)) {
       QString name1=g_model1->limitData[i].name;
       QString name2=g_model2->limitData[i].name;
       color=getColor1(name1,name2);
@@ -529,9 +528,9 @@ void compareDialog::printLimits()
   str.append("</table></td>");
   str.append("<td><table border=1 cellspacing=0 cellpadding=1 width=\"50%\">");
   str.append("<tr><td></td><td align=center><b>"+tr("Offset")+"</b></td><td align=center><b>"+tr("Min")+"</b></td><td align=center><b>"+tr("Max")+"</b></td><td align=center><b>"+tr("Invert")+"</b></td></tr>");
-  for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+  for(int i=0; i<GetCurrentFirmware()->getCapability(Outputs); i++) {
     str.append("<tr>");
-    if (GetEepromInterface()->getCapability(HasChNames)) {
+    if (GetCurrentFirmware()->getCapability(HasChNames)) {
       QString name1=g_model1->limitData[i].name;
       QString name2=g_model2->limitData[i].name;
       color=getColor2(name1,name2);
@@ -557,17 +556,17 @@ void compareDialog::printLimits()
   te->append(str);
 }
 
-void compareDialog::printGvars()
+void CompareDialog::printGvars()
 {
   QString color;
   int gvars=0;
   int gvarnum=0;
-  if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetEepromInterface()->getCapability(HasVariants) && GetEepromInterface()->getCapability(Gvars))) {
+  if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetCurrentFirmware()->getCapability(HasVariants) && GetCurrentFirmware()->getCapability(Gvars))) {
     gvars=1;
-    gvarnum=GetEepromInterface()->getCapability(Gvars);
+    gvarnum=GetCurrentFirmware()->getCapability(Gvars);
   }
 
-  if (!GetEepromInterface()->getCapability(GvarsFlightPhases) && (gvars==1 && GetEepromInterface()->getCapability(Gvars))) {
+  if (!GetCurrentFirmware()->getCapability(GvarsFlightPhases) && (gvars==1 && GetCurrentFirmware()->getCapability(Gvars))) {
     QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
     str.append("<tr><td colspan=2><h2>"+tr("Global Variables")+"</h2></td></tr>");
     str.append("<tr><td width=50%>");
@@ -605,7 +604,7 @@ void compareDialog::printGvars()
   }
 }
 
-void compareDialog::printExpos()
+void CompareDialog::printExpos()
 {
   QString color;
   bool expoused[C9X_MAX_EXPOS]={false};
@@ -614,7 +613,7 @@ void compareDialog::printExpos()
   QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>";
   str.append(tr("Expo/Dr Settings"));
   str.append("</h2></td></tr><tr><td><table border=1 cellspacing=0 cellpadding=3>");
-  for(uint8_t i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+  for(uint8_t i=0; i<GetCurrentFirmware()->getCapability(Outputs); i++) {
     if (ChannelHasExpo(g_model1->expoData, i) || ChannelHasExpo(g_model2->expoData, i)) {
       str.append("<tr>");
       str.append("<td width=\"45%\">");
@@ -651,12 +650,12 @@ void compareDialog::printExpos()
           str += tr("Weight") + QString("%1").arg(getGVarString(ed->weight)).rightJustified(6, ' ');
           str += ed->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
 
-          if (GetEepromInterface()->getCapability(FlightPhases)) {
+          if (GetCurrentFirmware()->getCapability(FlightPhases)) {
             if(ed->phases) {
-              if (ed->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
+              if (ed->phases!=(unsigned int)(1<<GetCurrentFirmware()->getCapability(FlightPhases))-1) {
                 int mask=1;
                 int first=0;
-                for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases);i++) {
+                for (int i=0; i<GetCurrentFirmware()->getCapability(FlightPhases);i++) {
                   if (!(ed->phases & mask)) {
                     first++;
                   }
@@ -669,7 +668,7 @@ void compareDialog::printExpos()
                 }
                 mask=1;
                 first=1;
-                for (int j=0; j<GetEepromInterface()->getCapability(FlightPhases);j++) {
+                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightPhases);j++) {
                   if (!(ed->phases & mask)) {
                     PhaseData *pd = &g_model1->phaseData[j];
                     if (!first) {
@@ -729,12 +728,12 @@ void compareDialog::printExpos()
           str += tr("Weight") + QString("%1").arg(getGVarString(ed->weight)).rightJustified(6, ' ');
           str += ed->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
 
-          if (GetEepromInterface()->getCapability(FlightPhases)) {
+          if (GetCurrentFirmware()->getCapability(FlightPhases)) {
             if(ed->phases) {
-              if (ed->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
+              if (ed->phases!=(unsigned int)(1<<GetCurrentFirmware()->getCapability(FlightPhases))-1) {
                 int mask=1;
                 int first=0;
-                for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases);i++) {
+                for (int i=0; i<GetCurrentFirmware()->getCapability(FlightPhases);i++) {
                   if (!(ed->phases & mask)) {
                     first++;
                   }
@@ -747,7 +746,7 @@ void compareDialog::printExpos()
                 }
                 mask=1;
                 first=1;
-                for (int j=0; j<GetEepromInterface()->getCapability(FlightPhases);j++) {
+                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightPhases);j++) {
                   if (!(ed->phases & mask)) {
                     PhaseData *pd = &g_model2->phaseData[j];
                     if (!first) {
@@ -778,21 +777,21 @@ void compareDialog::printExpos()
   te->append(str);
 }
 
-void compareDialog::printMixers()
+void CompareDialog::printMixers()
 {
   QString color;
   QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>";
   str.append(tr("Mixers"));
   str.append("</h2></td></tr><tr><td><table border=1 cellspacing=0 cellpadding=3>");
-  float scale=GetEepromInterface()->getCapability(SlowScale);
+  float scale=GetCurrentFirmware()->getCapability(SlowScale);
   bool mixused[64]={false};
   bool mixused2[64]={false};
-  for(uint8_t i=1; i<=GetEepromInterface()->getCapability(Outputs); i++) {
+  for(uint8_t i=1; i<=GetCurrentFirmware()->getCapability(Outputs); i++) {
     if (ChannelHasMix(g_model1->mixData, i) || ChannelHasMix(g_model2->mixData, i)) {
       str.append("<tr>");
       str.append("<td width=\"45%\">");
       str.append("<table border=0 cellspacing=0 cellpadding=0>");
-      for (int j=0; j<GetEepromInterface()->getCapability(Mixes); j++) {
+      for (int j=0; j<GetCurrentFirmware()->getCapability(Mixes); j++) {
         if (g_model1->mixData[j].destCh==i) {
           int mix=ModelHasMix(g_model2->mixData, g_model1->mixData[j], mixused);
           if (mix>-1) {
@@ -827,12 +826,12 @@ void compareDialog::printMixers()
           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);
-          if (GetEepromInterface()->getCapability(FlightPhases)) {
+          if (GetCurrentFirmware()->getCapability(FlightPhases)) {
             if(md->phases) {
-              if (md->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
+              if (md->phases!=(unsigned int)(1<<GetCurrentFirmware()->getCapability(FlightPhases))-1) {
                 int mask=1;
                 int first=0;
-                for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases);i++) {
+                for (int i=0; i<GetCurrentFirmware()->getCapability(FlightPhases);i++) {
                   if (!(md->phases & mask)) {
                     first++;
                   }
@@ -845,7 +844,7 @@ void compareDialog::printMixers()
                 }
                 mask=1;
                 first=1;
-                for (int j=0; j<GetEepromInterface()->getCapability(FlightPhases);j++) {
+                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightPhases);j++) {
                   if (!(md->phases & mask)) {
                     PhaseData *pd = &g_model1->phaseData[j];
                     if (!first) {
@@ -870,7 +869,7 @@ void compareDialog::printMixers()
       str.append("<td width=\"10%\" align=\"center\" valign=\"middle\"><b>"+tr("CH")+QString("%1</b></td>").arg(i,2,10,QChar('0')));
       str.append("<td width=\"45%\">");
       str.append("<table border=0 cellspacing=0 cellpadding=0>");
-      for (int j=0; j<GetEepromInterface()->getCapability(Mixes); j++) {
+      for (int j=0; j<GetCurrentFirmware()->getCapability(Mixes); j++) {
         if (g_model2->mixData[j].destCh==i) {
           int mix=ModelHasMix(g_model1->mixData, g_model2->mixData[j],mixused2);
           if (mix>-1) {
@@ -906,12 +905,12 @@ void compareDialog::printMixers()
           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);
-          if (GetEepromInterface()->getCapability(FlightPhases)) {
+          if (GetCurrentFirmware()->getCapability(FlightPhases)) {
             if(md->phases) {
-              if (md->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
+              if (md->phases!=(unsigned int)(1<<GetCurrentFirmware()->getCapability(FlightPhases))-1) {
                 int mask=1;
                 int first=0;
-                for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases);i++) {
+                for (int i=0; i<GetCurrentFirmware()->getCapability(FlightPhases);i++) {
                   if (!(md->phases & mask)) {
                     first++;
                   }
@@ -924,7 +923,7 @@ void compareDialog::printMixers()
                 }
                 mask=1;
                 first=1;
-                for (int j=0; j<GetEepromInterface()->getCapability(FlightPhases);j++) {
+                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightPhases);j++) {
                   if (!(md->phases & mask)) {
                     PhaseData *pd = &g_model2->phaseData[j];
                     if (!first) {
@@ -953,7 +952,7 @@ void compareDialog::printMixers()
   te->append(str);
 }
 
-void compareDialog::printCurves()
+void CompareDialog::printCurves()
 {
 #if 0
   int i,r,g,b,c;
@@ -1033,14 +1032,14 @@ void compareDialog::printCurves()
 #endif
 }
 
-void compareDialog::printSwitches()
+void CompareDialog::printSwitches()
 {
     int sc=0;
     QString color;
     QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
     str.append("<tr><td><h2>"+tr("Logical Switches")+"</h2></td></tr>");
     str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">");
-    for (int i=0; i<GetEepromInterface()->getCapability(LogicalSwitches); i++) {
+    for (int i=0; i<GetCurrentFirmware()->getCapability(LogicalSwitches); i++) {
       QString sw1 = g_model1->customSw[i].toString(*g_model1);
       QString sw2 = g_model2->customSw[i].toString(*g_model2);
       if (!(sw1.isEmpty() && sw2.isEmpty())) {
@@ -1063,7 +1062,7 @@ void compareDialog::printSwitches()
         te->append(str);
 }
 
-void compareDialog::printFSwitches()
+void CompareDialog::printFSwitches()
 {
   QString color1;
   QString color2;
@@ -1083,7 +1082,7 @@ void compareDialog::printFSwitches()
   str.append("<td width=\"7%\" align=\"center\"><b>"+tr("Repeat")+"</b></td>");
   str.append("<td width=\"7%\" align=\"center\"><b>"+tr("Enable")+"</b></td>");
   str.append("</tr>");
-  for(int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++)
+  for(int i=0; i<GetCurrentFirmware()->getCapability(CustomFunctions); i++)
   {
     if (g_model1->funcSw[i].swtch.type || g_model2->funcSw[i].swtch.type) {
       if ((g_model1->funcSw[i].swtch != g_model2->funcSw[i].swtch) || (g_model1->funcSw[i].func!=g_model2->funcSw[i].func) || (g_model1->funcSw[i].adjustMode!=g_model2->funcSw[i].adjustMode) || (g_model1->funcSw[i].param!=g_model2->funcSw[i].param)) {
@@ -1142,7 +1141,7 @@ void compareDialog::printFSwitches()
       te->append(str);
 }
 
-void compareDialog::printFrSky()
+void CompareDialog::printFrSky()
 {
   QString color;
   float value1,value2;
@@ -1212,10 +1211,10 @@ void compareDialog::printFrSky()
   str.append("<td align=\"center\"><font color="+color+">"+QString::number(fd1->rssiAlarms[1].value,10)+"</td>");
   str.append("</table>");
 #if 0
-  if (GetEepromInterface()->getCapability(TelemetryBars) || GetEepromInterface()->getCapability(TelemetryCSFields)) {
-    int cols=GetEepromInterface()->getCapability(TelemetryColsCSFields);
+  if (GetCurrentFirmware()->getCapability(TelemetryBars) || GetCurrentFirmware()->getCapability(TelemetryCSFields)) {
+    int cols=GetCurrentFirmware()->getCapability(TelemetryColsCSFields);
     if (cols==0) cols=2;
-    for (int j=0; j<GetEepromInterface()->getCapability(TelemetryCSFields)/(4*cols); j++) {
+    for (int j=0; j<GetCurrentFirmware()->getCapability(TelemetryCSFields)/(4*cols); j++) {
       QString tcols;
       QString cwidth;
       QString swidth;
@@ -1331,10 +1330,10 @@ void compareDialog::printFrSky()
   str.append("<td align=\"center\"><font color="+color+">"+QString::number(fd2->rssiAlarms[1].value,10)+"</td>");
   str.append("</table></br>");
 #if 0
-  if (GetEepromInterface()->getCapability(TelemetryBars) || GetEepromInterface()->getCapability(TelemetryCSFields)) {
-    int cols=GetEepromInterface()->getCapability(TelemetryColsCSFields);
+  if (GetCurrentFirmware()->getCapability(TelemetryBars) || GetCurrentFirmware()->getCapability(TelemetryCSFields)) {
+    int cols=GetCurrentFirmware()->getCapability(TelemetryColsCSFields);
     if (cols==0) cols=2;
-    for (int j=0; j<GetEepromInterface()->getCapability(TelemetryCSFields)/(4*cols); j++) {
+    for (int j=0; j<GetCurrentFirmware()->getCapability(TelemetryCSFields)/(4*cols); j++) {
       QString tcols;
       QString cwidth;
       QString swidth;
@@ -1391,7 +1390,7 @@ void compareDialog::printFrSky()
   te->append(str);
 }
 
-void compareDialog::on_printButton_clicked()
+void CompareDialog::on_printButton_clicked()
 {
     QPrinter printer;
     printer.setPageMargins(10.0,10.0,10.0,10.0,printer.Millimeter);
@@ -1402,7 +1401,7 @@ void compareDialog::on_printButton_clicked()
     te->print(&printer);
 }
 
-void compareDialog::on_printFileButton_clicked()
+void CompareDialog::on_printFileButton_clicked()
 {
     QPrinter printer;
     QString filename = QFileDialog::getSaveFileName(this,tr("Select PDF output file"),QString(),"Pdf File(*.pdf)"); 
diff --git a/companion/src/comparedialog.h b/companion/src/comparedialog.h
index e955ea2db..6f1c83875 100644
--- a/companion/src/comparedialog.h
+++ b/companion/src/comparedialog.h
@@ -7,29 +7,27 @@
 #include "eeprominterface.h"
 
 namespace Ui {
-    class compareDialog;
+  class CompareDialog;
 }
 
-class compareDialog : public QDialog
+class CompareDialog : public QDialog
 {
     Q_OBJECT
 
-public:
-    explicit compareDialog(QWidget *parent = 0, GeneralSettings *gg = 0);
-    
-    ~compareDialog();
-    void  closeEvent(QCloseEvent *event);
-    
+  public:
+    CompareDialog(QWidget *parent);
+    ~CompareDialog();
+
+  protected:
     ModelData * g_model1;
     ModelData * g_model2;
     ModelData * modeltemp;
     int model1;
     int model2;
-    GeneralSettings *g_eeGeneral;
-    EEPROMInterface *eepromInterface;
   
-private:
-    Ui::compareDialog *ui;
+  private:
+    void  closeEvent(QCloseEvent *event);
+    Ui::CompareDialog *ui;
     QString doTC(const QString s, const QString color, bool bold);
     QString doTR(const QString s, const QString color, bool bold);
     QString doTL(const QString s, const QString color, bool bold);
diff --git a/companion/src/comparedialog.ui b/companion/src/comparedialog.ui
index 4a26482b0..8aece1ce2 100644
--- a/companion/src/comparedialog.ui
+++ b/companion/src/comparedialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>compareDialog</class>
- <widget class="QDialog" name="compareDialog">
+ <class>CompareDialog</class>
+ <widget class="QDialog" name="CompareDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index ada1e3f63..868e107ce 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -592,7 +592,7 @@ QString LogicalSwitchData::toString(const ModelData & model)
     result += RawSwitch(andsw).toString();
   }
 
-  if (GetEepromInterface()->getCapability(LogicalSwitchesExt)) {
+  if (GetCurrentFirmware()->getCapability(LogicalSwitchesExt)) {
     if (delay)
       result += QObject::tr(" Delay %1 sec").arg(delay/10.0);
     if (duration)
@@ -644,7 +644,7 @@ QStringList FuncSwData::toStringList()
     result << item.toString();
   }
   else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) {
-    if ( GetEepromInterface()->getCapability(VoicesAsNumbers)) {
+    if ( GetCurrentFirmware()->getCapability(VoicesAsNumbers)) {
       result << QString("%1").arg(param);
     } else {
       result << paramarm;
@@ -774,7 +774,7 @@ QString FuncSwData::paramToString()
     return item.toString();
   }
   else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) {
-    if ( GetEepromInterface()->getCapability(VoicesAsNumbers)) {
+    if ( GetCurrentFirmware()->getCapability(VoicesAsNumbers)) {
       return QString("%1").arg(param);
     } else {
       return paramarm;
@@ -839,7 +839,7 @@ GeneralSettings::GeneralSettings()
   stickMode = g.profile[g.id()].defaultMode();
 
   QString t_calib=g.profile[g.id()].stickPotCalib();
-  int potsnum=GetEepromInterface()->getCapability(Pots);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots);
   if (t_calib.isEmpty()) {
     return;
   }
@@ -1186,13 +1186,13 @@ ModelData ModelData::removeGlobalVars()
 QList<EEPROMInterface *> eepromInterfaces;
 void RegisterEepromInterfaces()
 {
-  eepromInterfaces.push_back(new OpenTxInterface(BOARD_STOCK));
-  eepromInterfaces.push_back(new OpenTxInterface(BOARD_M128));
-  eepromInterfaces.push_back(new OpenTxInterface(BOARD_GRUVIN9X));
-  eepromInterfaces.push_back(new OpenTxInterface(BOARD_SKY9X));
-  eepromInterfaces.push_back(new OpenTxInterface(BOARD_TARANIS));
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_STOCK));
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_M128));
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_GRUVIN9X));
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_SKY9X));
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS));
   if (g.rev4aSupport())
-    eepromInterfaces.push_back(new OpenTxInterface(BOARD_TARANIS_REV4a));
+    eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_REV4a));
   eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_STOCK));
   eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_GRUVIN9X));
   eepromInterfaces.push_back(new Ersky9xInterface());
@@ -1203,31 +1203,23 @@ void RegisterEepromInterfaces()
 void UnregisterEepromInterfaces()
 {
   foreach(EEPROMInterface * intf, eepromInterfaces) {
-    qDebug() << "UnregisterEepromInterfaces(): deleting " <<  QString::number( reinterpret_cast<uint64_t>(intf), 16 );
+    // qDebug() << "UnregisterEepromInterfaces(): deleting " <<  QString::number( reinterpret_cast<uint64_t>(intf), 16 );
     delete intf;
   } 
   OpenTxEepromCleanup();
 }
 
-QList<FirmwareInfo *> firmwares;
+QList<FirmwareInterface *> firmwares;
 FirmwareVariant default_firmware_variant;
 FirmwareVariant current_firmware_variant;
 
-void RegisterFirmwares()
-{
-  RegisterOpen9xFirmwares();
-  default_firmware_variant = GetFirmwareVariant("opentx-9x-heli-templates-en");
-  current_firmware_variant = default_firmware_variant;
-  RegisterEepromInterfaces();
-}
-
 void UnregisterFirmwares() 
 {
-  UnregisterEepromInterfaces();
-  UnregisterOpen9xFirmwares();
+  foreach (FirmwareInterface * f, firmwares) {
+    delete f;
+  }
 }
 
-
 bool LoadEeprom(RadioData &radioData, const uint8_t *eeprom, const int size)
 {
   foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
@@ -1264,7 +1256,7 @@ FirmwareVariant GetFirmwareVariant(QString id)
 {
   FirmwareVariant result;
 
-  foreach(FirmwareInfo * firmware, firmwares) {
+  foreach(FirmwareInterface * firmware, firmwares) {
     if (id.contains(firmware->id+"-") || (!id.contains("-") && id.contains(firmware->id))) {
       result.id = id;
       result.firmware = firmware;
@@ -1276,13 +1268,13 @@ FirmwareVariant GetFirmwareVariant(QString id)
   return default_firmware_variant;
 }
 
-void FirmwareInfo::addOption(const char *option, QString tooltip, uint32_t variant)
+void FirmwareInterface::addOption(const char *option, QString tooltip, uint32_t variant)
 {
   Option options[] = { { option, tooltip, variant }, { NULL } };
   addOptions(options);
 }
 
-unsigned int FirmwareInfo::getVariant(const QString & variantId)
+unsigned int FirmwareInterface::getVariant(const QString & variantId)
 {
   unsigned int variant = variantBase;
   QStringList options = variantId.mid(id.length()+1).split("-", QString::SkipEmptyParts);
@@ -1298,17 +1290,17 @@ unsigned int FirmwareInfo::getVariant(const QString & variantId)
   return variant;
 }
 
-void FirmwareInfo::addLanguage(const char *lang)
+void FirmwareInterface::addLanguage(const char *lang)
 {
   languages.push_back(lang);
 }
 
-void FirmwareInfo::addTTSLanguage(const char *lang)
+void FirmwareInterface::addTTSLanguage(const char *lang)
 {
   ttslanguages.push_back(lang);
 }
 
-void FirmwareInfo::addOptions(Option options[])
+void FirmwareInterface::addOptions(Option options[])
 {
   QList<Option> opts;
   for (int i=0; options[i].name; i++) {
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index b9845163f..edb779d72 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -504,6 +504,7 @@ class GeneralSettings {
     unsigned int switchUnlockStates;
     unsigned int hw_uartMode;
     unsigned int potsType[8];
+    unsigned int backlightColor;
 };
 
 class CurveReference {
@@ -1129,12 +1130,8 @@ class EEPROMInterface
     
     virtual int getSize(GeneralSettings &) = 0;
     
-    virtual int getCapability(const Capability) = 0;
-    
     virtual int isAvailable(Protocol proto, int port=0) = 0;
 
-    virtual SimulatorInterface * getSimulator() { return NULL; }
-
     virtual const int getEEpromSize() = 0;
 
     virtual const int getMaxModels() = 0;
@@ -1243,8 +1240,9 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
     model.swashRingData.collectiveSource.index = applyStickMode(model.swashRingData.collectiveSource.index + 1, mode) - 1;
 }
 
-void RegisterFirmwares();
+void RegisterEepromInterfaces();
 void UnregisterFirmwares();
+void registerOpenTxFirmwares();
 
 bool LoadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index);
 bool LoadEeprom(RadioData &radioData, const uint8_t *eeprom, int size);
@@ -1256,50 +1254,27 @@ struct Option {
   uint32_t variant;
 };
 
-class FirmwareInfo {
-  public:
-    FirmwareInfo():
-      parent(NULL),
-      id(QString::null),
-      eepromInterface(NULL),
-      voice(false),
-      variantBase(0)
-    {
-    }
+class FirmwareInterface {
 
-    virtual ~FirmwareInfo()
+  public:
+    virtual ~FirmwareInterface()
     {
       delete eepromInterface;
     }
 
-    FirmwareInfo(const QString & id, const QString & name, EEPROMInterface * eepromInterface, const QString & url = QString(), const QString & stamp = QString(), const QString & rnurl = QString(), bool voice = false):
-      parent(NULL),
+    FirmwareInterface(const QString & id, const QString & name, const BoardEnum board, EEPROMInterface * eepromInterface, bool voice = false):
       id(id),
       name(name),
+      board(board),
       eepromInterface(eepromInterface),
-      url(url),
-      stamp(stamp),
-      rnurl(rnurl),
       voice(voice),
       variantBase(0)
     {
     }
 
-    FirmwareInfo(const QString & id, EEPROMInterface * eepromInterface, const QString & url, const QString & stamp = QString(), const QString & rnurl = QString(), bool voice=false):
-      parent(NULL),
-      id(id),
-      name(QString::null),
-      eepromInterface(eepromInterface),
-      url(url),
-      stamp(stamp),
-      rnurl(rnurl),
-      voice(voice),
-      variantBase(0)
+    inline void setVariantBase(unsigned int variant)
     {
-    }
-
-    void setVariantBase(unsigned int variant) {
-      this->variantBase = variant;
+      variantBase = variant;
     }
 
     unsigned int getVariant(const QString & id);
@@ -1312,71 +1287,104 @@ class FirmwareInfo {
 
     virtual void addOptions(Option options[]);
 
-    QStringList get_options() {
-      if (parent)
-        return id.mid(parent->id.length()+1).split("-", QString::SkipEmptyParts);
-      else
-        return QStringList();
-    }
-
-    int saveEEPROM(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, unsigned int version=0) {
+    inline int saveEEPROM(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, unsigned int version=0)
+    {
       return eepromInterface->save(eeprom, radioData, variant, version);
     }
 
-    virtual QString getUrl(const QString &fwId) {
-      if (url.contains("%1"))
-        return url.arg(fwId);
-      else
-        return url;
+    virtual QString getStampUrl() = 0;
+
+    virtual QString getReleaseNotesUrl() = 0;
+
+    virtual QString getFirmwareUrl(QString & id) = 0;
+
+    inline BoardEnum getBoard()
+    {
+      return board;
     }
 
-    virtual QString getRnUrl(const QString &fwId) {
-      if (rnurl.contains("%1"))
-        return rnurl.arg(fwId);
-      else
-        return rnurl;
+    inline EEPROMInterface * getEepromInterface()
+    {
+      return eepromInterface;
     }
 
-    
+    virtual int getCapability(const Capability) = 0;
+
+    virtual SimulatorInterface * getSimulator()
+    {
+      return NULL;
+    }
+
+  public:
     QList<const char *> languages;
     QList<const char *> ttslanguages;
     QList< QList<Option> > opts;
-    FirmwareInfo *parent;
     QString id;
     QString name;
+
+  protected:
+    BoardEnum board;
     EEPROMInterface * eepromInterface;
-    QString url;
-    QString stamp;
-    QString rnurl;
+
+  public:
     bool voice;
+
+  protected:
     unsigned int variantBase;
+
+  private:
+    FirmwareInterface();
+
 };
 
-struct FirmwareVariant {
-  QString id;
-  FirmwareInfo *firmware;
-  unsigned int variant;
+class FirmwareVariant
+{
+  public:
+    FirmwareVariant():
+      firmware(NULL),
+      variant(0)
+    {
+    }
+
+    FirmwareVariant(QString & id, FirmwareInterface * firmware, unsigned int variant):
+      id(id),
+      firmware(firmware),
+      variant(variant)
+    {
+    }
+
+    QString getFirmwareUrl()
+    {
+      if (firmware)
+        return firmware->getFirmwareUrl(id);
+      else
+        return "";
+    }
+
+    QString id;
+    FirmwareInterface * firmware;
+    unsigned int variant;
 };
 
-extern QList<FirmwareInfo *> firmwares;
+extern QList<FirmwareInterface *> firmwares;
 extern FirmwareVariant default_firmware_variant;
 extern FirmwareVariant current_firmware_variant;
 
 FirmwareVariant GetFirmwareVariant(QString id);
 
-inline FirmwareInfo * GetFirmware(QString id)
+inline FirmwareInterface * GetFirmware(QString id)
 {
   return GetFirmwareVariant(id).firmware;
 }
 
-inline FirmwareInfo * GetCurrentFirmware()
+inline FirmwareInterface * GetCurrentFirmware()
 {
   return current_firmware_variant.firmware;
 }
 
 inline EEPROMInterface * GetEepromInterface()
 {
-  return GetCurrentFirmware()->eepromInterface;
+  return GetCurrentFirmware()->getEepromInterface();
 }
 
 inline unsigned int GetCurrentFirmwareVariant()
@@ -1384,6 +1392,8 @@ inline unsigned int GetCurrentFirmwareVariant()
   return current_firmware_variant.variant;
 }
 
+void UnregisterEepromInterfaces();
+
 inline int divRoundClosest(const int n, const int d)
 {
   return ((n < 0) ^ (d < 0)) ? ((n - d/2)/d) : ((n + d/2)/d);
diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp
index d3c7e2af5..5a9d3f5a0 100644
--- a/companion/src/firmwares/er9x/er9xinterface.cpp
+++ b/companion/src/firmwares/er9x/er9xinterface.cpp
@@ -200,75 +200,6 @@ int Er9xInterface::getSize(GeneralSettings &settings)
   return 0;
 }
 
-int Er9xInterface::getCapability(const Capability capability)
-{
-  switch (capability) {
-    case FlightPhases:
-        return 4;
-    case Mixes:
-      return ER9X_MAX_MIXERS;
-    case PPMExtCtrl:
-      return 1;
-    case ModelTrainerEnable:
-      return 1;
-    case Timer2ThrTrig:
-      return 1;
-    case OffsetWeight:
-      return 125;
-    case SoundMod:
-      return 1;
-    case SoundPitch:
-      return 1;
-    case Haptic:
-      return 1;
-    case Timers:
-      return 1;
-    case Pots:
-      return 3;
-    case Switches:
-      return 7;
-    case SwitchesPositions:
-      return 9;
-    case CustomFunctions:
-      return 0;
-    case LogicalSwitches:
-      return 12;
-    case CustomAndSwitches:
-        return 5;
-    case CSFunc:
-      return 13;
-    case Outputs:
-      return 16;
-    case Simulation:
-      return 1;
-    case Telemetry:
-      return TM_HASTELEMETRY|TM_HASWSHH;
-    case TelemetryUnits:
-      return 1;
-    case TelemetryMaxMultiplier:
-      return 2;
-    case MaxVolume:
-      return 7;
-    case SlowScale:
-      return 1;
-    case SlowRange:
-      return 15;
-    case LCDWidth:
-      return 128;
-    case VoicesAsNumbers:
-    case HasAltitudeSel:
-    case HasContrast:
-    case HasVolume:
-    case ModelVoice:
-    case Gvars:
-      return 7;
-    case GetThrSwitch:
-      return DSW_THR;     
-    default:
-      return 0;
-  }
-}
-
 int Er9xInterface::isAvailable(Protocol prot, int port)
 {
   switch (prot) {
@@ -282,13 +213,6 @@ int Er9xInterface::isAvailable(Protocol prot, int port)
   }
 }
 
-SimulatorInterface * Er9xInterface::getSimulator()
-{
-  return NULL; // new Er9xSimulator(this);
-}
-
-
-
 void Er9xInterface::appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value)
 {
     QDomElement e = qdoc->createElement(name);
diff --git a/companion/src/firmwares/er9x/er9xinterface.h b/companion/src/firmwares/er9x/er9xinterface.h
index 9ea4854be..7f1dedd85 100644
--- a/companion/src/firmwares/er9x/er9xinterface.h
+++ b/companion/src/firmwares/er9x/er9xinterface.h
@@ -46,12 +46,8 @@ class Er9xInterface : public EEPROMInterface
     
     virtual int getSize(GeneralSettings &settings);
 
-    virtual int getCapability(const Capability);
-    
     virtual int isAvailable(Protocol proto, int port=0);
 
-    virtual SimulatorInterface * getSimulator();
-    
   protected:
 
     EFile *efile;
diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
index 262ee48de..f048b19c7 100644
--- a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
+++ b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp
@@ -244,74 +244,6 @@ int Ersky9xInterface::getSize(GeneralSettings &settings)
   return 0;
 }
 
-int Ersky9xInterface::getCapability(const Capability capability)
-{
-  switch (capability) {
-    case Mixes:
-      return ERSKY9X_MAX_MIXERS_V11;
-    case PPMExtCtrl:
-      return 1;
-    case ModelTrainerEnable:
-      return 1;
-    case Timer2ThrTrig:
-      return 1;
-    case SoundMod:
-      return 1;
-    case SoundPitch:
-      return 1;
-    case Haptic:
-      return 1;
-    case ModelVoice:
-      return 1;
-    case Timers:
-      return 2;
-    case Pots:
-      return 3;
-    case Gvars:
-      return 7;
-    case Switches:
-      return 7;
-    case SwitchesPositions:
-      return 9;
-    case CustomFunctions:
-      return 0;
-    case LogicalSwitches:
-      return ERSKY9X_NUM_CSW_V11;
-    case CustomAndSwitches:
-      return 1;
-    case CSFunc:
-      return 13;
-    case Outputs:
-      return ERSKY9X_NUM_CHNOUT_V11;
-    case Simulation:
-      return 1;
-    case Telemetry:
-      return TM_HASTELEMETRY|TM_HASWSHH;
-    case TelemetryUnits:
-      return 1;
-    case OptrexDisplay:
-      return 1;
-    case HasAltitudeSel:
-    case HasCurrentCalibration:
-    case HasVolume:
-    case HasBrightness:
-    case HasContrast:
-      return 1;
-    case OffsetWeight:
-      return 125;
-    case MaxVolume:
-      return 23;
-    case TelemetryMaxMultiplier:
-      return 2;
-    case LCDWidth:
-      return 128;
-    case GetThrSwitch:
-      return DSW_THR;      
-    default:
-      return 0;
-  }
-}
-
 int Ersky9xInterface::isAvailable(Protocol prot, int port)
 {
   switch (prot) {
@@ -325,13 +257,6 @@ int Ersky9xInterface::isAvailable(Protocol prot, int port)
   }
 }
 
-SimulatorInterface * Ersky9xInterface::getSimulator()
-{
-  return NULL; // new Ersky9xSimulator(this);
-}
-
-
-
 void Ersky9xInterface::appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value)
 {
     QDomElement e = qdoc->createElement(name);
diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.h b/companion/src/firmwares/ersky9x/ersky9xinterface.h
index d37151c05..f1bd498e2 100644
--- a/companion/src/firmwares/ersky9x/ersky9xinterface.h
+++ b/companion/src/firmwares/ersky9x/ersky9xinterface.h
@@ -46,12 +46,8 @@ class Ersky9xInterface : public EEPROMInterface
     
     virtual int getSize(GeneralSettings &settings);
 
-    virtual int getCapability(const Capability);
-    
     virtual int isAvailable(Protocol proto, int port=0);
 
-    virtual SimulatorInterface * getSimulator();
-    
   protected:
 
     EFile *efile;
diff --git a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
index 3feffa44b..be982aa56 100644
--- a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
+++ b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp
@@ -216,59 +216,6 @@ int Gruvin9xInterface::getSize(GeneralSettings &settings)
   return 0;
 }
 
-int Gruvin9xInterface::getCapability(const Capability capability)
-{
-  switch (capability) {
-    case Mixes:
-      return G9X_MAX_MIXERS;
-    case FlightPhases:
-      return G9X_MAX_PHASES;
-    case FlightPhasesHaveFades:
-      return 1;
-    case Timers:
-      return 2;
-    case Pots:
-      return 3;
-    case Switches:
-      return 7;
-    case SwitchesPositions:
-      return 9;
-    case CustomFunctions:
-      return 12;
-    case LogicalSwitches:
-      return 12;
-    case CSFunc:
-      return 13;
-    case Outputs:
-      return 16;
-    case ExtendedTrims:
-      return 500;
-    case Simulation:
-      return true;
-    case OffsetWeight:
-      return 125;
-    case HasContrast:
-      return true;           
-    case Telemetry:
-      return TM_HASTELEMETRY|TM_HASWSHH;
-    case TelemetryMaxMultiplier:
-      return 1;
-    case SlowScale:
-      return 2;
-    case SlowRange:
-      return 15;
-    case LCDWidth:
-      return 128;      
-    case HasSDLogs:
-    case Haptic:
-      return 1;
-    case GetThrSwitch:
-      return DSW_THR; 
-    default:
-      return false;
-  }
-}
-
 int Gruvin9xInterface::isAvailable(Protocol proto, int port)
 {
   switch (proto) {
@@ -283,8 +230,3 @@ int Gruvin9xInterface::isAvailable(Protocol proto, int port)
       return 0;
   }
 }
-
-SimulatorInterface * Gruvin9xInterface::getSimulator()
-{
-  return NULL;
-}
diff --git a/companion/src/firmwares/gruvin9x/gruvin9xinterface.h b/companion/src/firmwares/gruvin9x/gruvin9xinterface.h
index 2c8a28dc2..7f3438082 100644
--- a/companion/src/firmwares/gruvin9x/gruvin9xinterface.h
+++ b/companion/src/firmwares/gruvin9x/gruvin9xinterface.h
@@ -47,12 +47,8 @@ class Gruvin9xInterface : public EEPROMInterface
     
     virtual int getSize(GeneralSettings &settings);
 
-    virtual int getCapability(const Capability);
-    
     virtual int isAvailable(Protocol proto, int port=0);
 
-    virtual SimulatorInterface * getSimulator();
-
   protected:
 
     template <class T>
diff --git a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
index bca5842ad..63a0075d1 100644
--- a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
@@ -106,8 +106,7 @@ uint8_t getStickMode()
 
 using namespace Open9xGruvin9x;
 
-Open9xGruvin9xSimulator::Open9xGruvin9xSimulator(OpenTxInterface * open9xInterface):
-  open9xInterface(open9xInterface)
+Open9xGruvin9xSimulator::Open9xGruvin9xSimulator()
 {
 }
 
diff --git a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.h b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.h
index 6fb3e320a..163d1ec68 100644
--- a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.h
+++ b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.h
@@ -20,13 +20,13 @@
 #include "simulatorinterface.h"
 
 class RadioData;
-class OpenTxInterface;
+class OpenTxEepromInterface;
 
 class Open9xGruvin9xSimulator : public SimulatorInterface {
 
   public:
 
-    Open9xGruvin9xSimulator(OpenTxInterface *);
+    Open9xGruvin9xSimulator();
 
     virtual void start(QByteArray & eeprom, bool tests=true);
 
@@ -54,9 +54,6 @@ class Open9xGruvin9xSimulator : public SimulatorInterface {
 
     virtual const char * getError();
 
-  protected:
-
-    OpenTxInterface * open9xInterface;
 };
 
 #endif
diff --git a/companion/src/firmwares/opentx/opentxM128simulator.cpp b/companion/src/firmwares/opentx/opentxM128simulator.cpp
index 14100e857..3689b8bc8 100644
--- a/companion/src/firmwares/opentx/opentxM128simulator.cpp
+++ b/companion/src/firmwares/opentx/opentxM128simulator.cpp
@@ -104,8 +104,7 @@ uint8_t getStickMode()
 
 using namespace Open9xM128;
 
-Open9xM128Simulator::Open9xM128Simulator(OpenTxInterface * open9xInterface):
-  open9xInterface(open9xInterface)
+Open9xM128Simulator::Open9xM128Simulator()
 {
 }
 
diff --git a/companion/src/firmwares/opentx/opentxM128simulator.h b/companion/src/firmwares/opentx/opentxM128simulator.h
index 862c7ada9..1efd990af 100644
--- a/companion/src/firmwares/opentx/opentxM128simulator.h
+++ b/companion/src/firmwares/opentx/opentxM128simulator.h
@@ -20,13 +20,13 @@
 #include "simulatorinterface.h"
 
 class RadioData;
-class OpenTxInterface;
+class OpenTxEepromInterface;
 
 class Open9xM128Simulator : public SimulatorInterface {
 
   public:
 
-    Open9xM128Simulator(OpenTxInterface *);
+    Open9xM128Simulator();
 
     virtual void start(QByteArray & eeprom, bool tests=true);
 
@@ -54,9 +54,6 @@ class Open9xM128Simulator : public SimulatorInterface {
 
     virtual const char * getError();
 
-  protected:
-
-    OpenTxInterface * open9xInterface;
 };
 
 #endif
diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
index 21d9df740..fde902900 100644
--- a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
@@ -135,8 +135,7 @@ uint8_t getStickMode()
 
 using namespace Open9xSky9x;
 
-Open9xSky9xSimulator::Open9xSky9xSimulator(OpenTxInterface * open9xInterface):
-  open9xInterface(open9xInterface)
+Open9xSky9xSimulator::Open9xSky9xSimulator()
 {
     QString path=g.profile[g.id()].sdPath()+"/";
     int i=0;
diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.h b/companion/src/firmwares/opentx/opentxSky9xsimulator.h
index 0489fea1d..46355a072 100644
--- a/companion/src/firmwares/opentx/opentxSky9xsimulator.h
+++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.h
@@ -20,13 +20,13 @@
 #include "simulatorinterface.h"
 
 class RadioData;
-class OpenTxInterface;
+class OpenTxEepromInterface;
 
 class Open9xSky9xSimulator : public SimulatorInterface {
 
   public:
 
-    Open9xSky9xSimulator(OpenTxInterface *);
+    Open9xSky9xSimulator();
 
     virtual void start(QByteArray & eeprom, bool tests=true);
 
@@ -54,9 +54,6 @@ class Open9xSky9xSimulator : public SimulatorInterface {
 
     virtual const char * getError();
 
-  protected:
-
-    OpenTxInterface * open9xInterface;
 };
 
 #endif
diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index dfe271830..b2e92ee81 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -176,8 +176,7 @@ void resetTrims()
 
 using namespace Open9xX9D;
 
-OpentxTaranisSimulator::OpentxTaranisSimulator(OpenTxInterface * open9xInterface):
-  open9xInterface(open9xInterface)
+OpentxTaranisSimulator::OpentxTaranisSimulator()
 {
   taranisSimulatorBoard = GetEepromInterface()->getBoard();
   QString path=g.profile[g.id()].sdPath()+"/";
diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.h b/companion/src/firmwares/opentx/opentxTaranisSimulator.h
index bd2da1d2a..be7350799 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.h
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.h
@@ -20,13 +20,13 @@
 #include "simulatorinterface.h"
 
 class RadioData;
-class OpenTxInterface;
+class OpenTxEepromInterface;
 
 class OpentxTaranisSimulator : public SimulatorInterface {
 
   public:
 
-    OpentxTaranisSimulator(OpenTxInterface *);
+    OpentxTaranisSimulator();
 
     virtual void start(QByteArray & eeprom, bool tests=true);
 
@@ -54,9 +54,6 @@ class OpentxTaranisSimulator : public SimulatorInterface {
 
     virtual const char * getError();
 
-  protected:
-
-    OpenTxInterface * open9xInterface;
 };
 
 #endif
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 90c5b5125..b74433cff 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -2180,7 +2180,7 @@ class FrskyField: public StructField {
       rssiConversionTable[1] = RSSIConversionTable(1);
 
       if (IS_ARM(board)) {
-        for (int i=0; i<2; i++) {
+        for (int i=0; i < ((version >= 216) ? 4 : 2); i++) {
           Append(new UnsignedField<8>(frsky.channels[i].ratio, "Ratio"));
           Append(new SignedField<12>(frsky.channels[i].offset, "Offset"));
           Append(new UnsignedField<4>(frsky.channels[i].type, "Type"));
@@ -2475,7 +2475,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
 
   if (board==BOARD_SKY9X && version >= 216) {
     internalField.Append(new UnsignedField<8>(modelData.nPotsToWarn));
-    for (int i=0; i < GetEepromInterface()->getCapability(Pots); i++) {
+    for (int i=0; i < GetCurrentFirmware()->getCapability(Pots); i++) {
       internalField.Append(new SignedField<8>(modelData.potPosition[i]));
     }
   }
@@ -2499,7 +2499,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
       internalField.Append(new ZCharField<4>(modelData.inputNames[i]));
     }
     internalField.Append(new UnsignedField<8>(modelData.nPotsToWarn));
-    for (int i=0; i < GetEepromInterface()->getCapability(Pots); i++) {
+    for (int i=0; i < GetCurrentFirmware()->getCapability(Pots); i++) {
       internalField.Append(new SignedField<8>(modelData.potPosition[i]));
     }    
   }
@@ -2693,6 +2693,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
       for (int i=0; i<4; i++) {
         internalField.Append(new UnsignedField<2>(potsType[i]));
       }
+      internalField.Append(new UnsignedField<8>(generalData.backlightColor));
     }
   }
 }
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index b80113ad5..13b7c86f5 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -43,18 +43,18 @@ size_t SizeOfArray( T(&)[ N ] )
   return N;
 }
 
-OpenTxInterface::OpenTxInterface(BoardEnum board):
+OpenTxEepromInterface::OpenTxEepromInterface(BoardEnum board):
   EEPROMInterface(board),
   efile(new EFile())
 {
 }
 
-OpenTxInterface::~OpenTxInterface()
+OpenTxEepromInterface::~OpenTxEepromInterface()
 {
   delete efile;
 }
 
-const char * OpenTxInterface::getName()
+const char * OpenTxEepromInterface::getName()
 {
   switch (board) {
     case BOARD_STOCK:
@@ -74,7 +74,7 @@ const char * OpenTxInterface::getName()
   }
 }
 
-const int OpenTxInterface::getEEpromSize()
+const int OpenTxEepromInterface::getEEpromSize()
 {
   switch (board) {
     case BOARD_STOCK:
@@ -94,7 +94,7 @@ const int OpenTxInterface::getEEpromSize()
   }
 }
 
-const int OpenTxInterface::getMaxModels()
+const int OpenTxEepromInterface::getMaxModels()
 {
   if (IS_ARM(board))
     return 60;
@@ -107,7 +107,7 @@ const int OpenTxInterface::getMaxModels()
 }
 
 template <class T>
-bool OpenTxInterface::loadModel(ModelData &model, uint8_t *data, int index, unsigned int stickMode)
+bool OpenTxEepromInterface::loadModel(ModelData &model, uint8_t *data, int index, unsigned int stickMode)
 {
   T _model;
   
@@ -140,7 +140,7 @@ bool OpenTxInterface::loadModel(ModelData &model, uint8_t *data, int index, unsi
 }
 
 template <class T>
-bool OpenTxInterface::loadModelVariant(unsigned int index, ModelData &model, uint8_t *data, unsigned int version, unsigned int variant)
+bool OpenTxEepromInterface::loadModelVariant(unsigned int index, ModelData &model, uint8_t *data, unsigned int version, unsigned int variant)
 {
   T open9xModel(model, board, version, variant);
 
@@ -167,7 +167,7 @@ bool OpenTxInterface::loadModelVariant(unsigned int index, ModelData &model, uin
   return true;
 }
 
-bool OpenTxInterface::loadModel(uint8_t version, ModelData &model, uint8_t *data, int index, unsigned int variant, unsigned int stickMode)
+bool OpenTxEepromInterface::loadModel(uint8_t version, ModelData &model, uint8_t *data, int index, unsigned int variant, unsigned int stickMode)
 {
   if (version == 201) {
     return loadModel<Open9xModelData_v201>(model, data, index, stickMode);
@@ -248,7 +248,7 @@ bool OpenTxInterface::loadModel(uint8_t version, ModelData &model, uint8_t *data
 }
 
 template <class T>
-bool OpenTxInterface::loadGeneral(GeneralSettings &settings, unsigned int version)
+bool OpenTxEepromInterface::loadGeneral(GeneralSettings &settings, unsigned int version)
 {
   QByteArray eepromData(sizeof(settings), 0); // GeneralSettings should be always bigger than the EEPROM struct
   T open9xSettings(settings, board, version);
@@ -264,7 +264,7 @@ bool OpenTxInterface::loadGeneral(GeneralSettings &settings, unsigned int versio
 }
 
 template <class T>
-bool OpenTxInterface::saveGeneral(GeneralSettings &settings, BoardEnum board, uint32_t version, uint32_t variant)
+bool OpenTxEepromInterface::saveGeneral(GeneralSettings &settings, BoardEnum board, uint32_t version, uint32_t variant)
 {
   T open9xSettings(settings, board, version, variant);
   // open9xSettings.Dump();
@@ -275,7 +275,7 @@ bool OpenTxInterface::saveGeneral(GeneralSettings &settings, BoardEnum board, ui
 }
 
 template <class T>
-bool OpenTxInterface::saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant)
+bool OpenTxEepromInterface::saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant)
 {
   T open9xModel(model, board, version, variant);
   // open9xModel.Dump();
@@ -285,12 +285,12 @@ bool OpenTxInterface::saveModel(unsigned int index, ModelData &model, unsigned i
   return (sz == eeprom.size());
 }
 
-bool OpenTxInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+bool OpenTxEepromInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
   return false;
 }
 
-bool OpenTxInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
   std::cout << "trying " << getName() << " import...";
 
@@ -352,7 +352,7 @@ bool OpenTxInterface::load(RadioData &radioData, const uint8_t *eeprom, int size
   return true;
 }
 
-int OpenTxInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
+int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
 {
   EEPROMWarnings.clear();
 
@@ -364,6 +364,7 @@ int OpenTxInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t varian
         version = 216;
         break;
       case BOARD_GRUVIN9X:
+      case BOARD_MEGA2560:
         version = 216;
         break;
       case BOARD_M128:
@@ -405,7 +406,7 @@ int OpenTxInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t varian
   return size;
 }
 
-int OpenTxInterface::getSize(ModelData &model)
+int OpenTxEepromInterface::getSize(ModelData &model)
 {
   if (board == BOARD_SKY9X)
     return 0;
@@ -428,7 +429,7 @@ int OpenTxInterface::getSize(ModelData &model)
   return efile->size(0);
 }
 
-int OpenTxInterface::getSize(GeneralSettings &settings)
+int OpenTxEepromInterface::getSize(GeneralSettings &settings)
 {
   if (board == BOARD_SKY9X)
     return 0;
@@ -448,7 +449,7 @@ int OpenTxInterface::getSize(GeneralSettings &settings)
   return efile->size(0);
 }
 
-int OpenTxInterface::getCapability(const Capability capability)
+int OpenTxFirmware::getCapability(const Capability capability)
 {
   switch (capability) {
     case ModelImage:
@@ -692,7 +693,7 @@ int OpenTxInterface::getCapability(const Capability capability)
   }
 }
 
-int OpenTxInterface::isAvailable(Protocol proto, int port)
+int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
 {
   if (IS_TARANIS(board)) {
     switch (port) {
@@ -777,31 +778,14 @@ int OpenTxInterface::isAvailable(Protocol proto, int port)
   }
 }
 
-SimulatorInterface * OpenTxInterface::getSimulator()
-{
-  switch (board) {
-    case BOARD_STOCK:
-      return new Open9xSimulator(this);
-    case BOARD_M128:
-      return new Open9xM128Simulator(this);
-    case BOARD_GRUVIN9X:
-      return new Open9xGruvin9xSimulator(this);
-    case BOARD_SKY9X:
-      return new Open9xSky9xSimulator(this);
-    case BOARD_TARANIS:
-    case BOARD_TARANIS_REV4a:
-      return new OpentxTaranisSimulator(this);
-    default:
-      return NULL;
-  }
-}
+
 
 template<typename T, size_t SIZE>
 size_t getSizeA(T (&)[SIZE]) {
     return SIZE;
 }
 
-bool OpenTxInterface::checkVersion(unsigned int version)
+bool OpenTxEepromInterface::checkVersion(unsigned int version)
 {
   switch(version) {
     case 201:
@@ -867,7 +851,7 @@ bool OpenTxInterface::checkVersion(unsigned int version)
   return true;
 }
 
-bool OpenTxInterface::checkVariant(unsigned int version, unsigned int variant)
+bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int variant)
 {
   if (board == BOARD_M128 && !(variant & 0x8000)) {
     if (version == 212) {
@@ -889,7 +873,7 @@ bool OpenTxInterface::checkVariant(unsigned int version, unsigned int variant)
   }
 }
 
-bool OpenTxInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
   std::cout << "trying " << getName() << " backup import...";
 
@@ -930,311 +914,327 @@ bool OpenTxInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esiz
   return true;
 }
 
-QString geturl( int board)
+QString OpenTxFirmware::getFirmwareUrl(QString & id)
 {
-   QString url = g.compileServer();
-   if (url.isEmpty()){
-      url= OPENTX_FIRMWARE_DOWNLOADS;
-      g.compileServer(url);
-   }
-    switch(board) {
-      case BOARD_STOCK:
-      case BOARD_M128:
-      case BOARD_GRUVIN9X:
-        url.append("/getfw.php?fw=%1.hex");
-        break;
-      case BOARD_SKY9X:
-      case BOARD_TARANIS:
-      case BOARD_TARANIS_REV4a:
-        url.append("/getfw.php?fw=%1.bin");
-        break;
-      default:
-        url.clear();
-        break;
-    }
-    return url;
+  QString url = g.compileServer();
+  if (url.isEmpty()){
+    url = OPENTX_FIRMWARE_DOWNLOADS;
+    g.compileServer(url);
+  }
+  switch(board) {
+    case BOARD_STOCK:
+    case BOARD_M128:
+    case BOARD_GRUVIN9X:
+      url.append(QString("/getfw.php?fw=%1.hex").arg(id));
+      break;
+    case BOARD_SKY9X:
+    case BOARD_TARANIS:
+    case BOARD_TARANIS_REV4a:
+      url.append(QString("/getfw.php?fw=%1.bin").arg(id));
+      break;
+    default:
+      url.clear();
+      break;
+  }
+  return url;
 }
 
-QString getstamp( int board)
+QString OpenTxFirmware::getReleaseNotesUrl()
 {
-   QString url = g.compileServer();
-   if (url.isEmpty()){
-      url= OPENTX_FIRMWARE_DOWNLOADS;
-      g.compileServer(url);
-   }
-    url.append("/stamp-opentx-");
-    switch(board) {
-      case BOARD_STOCK:
-        url.append("9x.txt");
-        break;
-      case BOARD_M128:
-        url.append("9x128.txt");
-        break;
-      case BOARD_GRUVIN9X:
-        url.append("gruvin9x.txt");
-        break;
-      case BOARD_SKY9X:
-        url.append("sky9x.txt");
-        break;
-      case BOARD_TARANIS:
-      case BOARD_TARANIS_REV4a:
-        url.append("taranis.txt");
-        break;
-      default:
-        url.clear();
-        break;
-    }
-    return url;
+  QString url = g.compileServer();
+  if (url.isEmpty()){
+    url = OPENTX_FIRMWARE_DOWNLOADS;
+    g.compileServer(url);
+  }
+  url.append("/releasenotes-");
+  switch(board) {
+    case BOARD_STOCK:
+    case BOARD_M128:
+    case BOARD_GRUVIN9X:
+    case BOARD_SKY9X:
+      url.append("9x.txt");
+      break;
+    case BOARD_TARANIS:
+    case BOARD_TARANIS_REV4a:
+      url.append("taranis.txt");
+      break;
+    default:
+      url.clear();
+      break;
+  }
+  return url;
 }
 
-QString getrnurl( int board)
+QString OpenTxFirmware::getStampUrl()
 {
-   QString url = g.compileServer();
-   if (url.isEmpty()){
-      url= OPENTX_FIRMWARE_DOWNLOADS;
-      g.compileServer(url);
-   }
-   url.append("/releasenotes-");
-   switch(board) {
-      case BOARD_STOCK:
-      case BOARD_M128:
-      case BOARD_GRUVIN9X:
-      case BOARD_SKY9X:
-        url.append("9x.txt");
-        break;
-      case BOARD_TARANIS:
-      case BOARD_TARANIS_REV4a:
-        url.append("taranis.txt");
-        break;
-      default:
-        url.clear();
-        break;
-    }
-    return url;
+  QString url = g.compileServer();
+  if (url.isEmpty()){
+    url= OPENTX_FIRMWARE_DOWNLOADS;
+    g.compileServer(url);
+  }
+  url.append("/stamp-opentx-");
+  switch(board) {
+    case BOARD_STOCK:
+      url.append("9x.txt");
+      break;
+    case BOARD_M128:
+      url.append("9x128.txt");
+      break;
+    case BOARD_GRUVIN9X:
+      url.append("gruvin9x.txt");
+      break;
+    case BOARD_SKY9X:
+      url.append("sky9x.txt");
+      break;
+    case BOARD_TARANIS:
+    case BOARD_TARANIS_REV4a:
+      url.append("taranis.txt");
+      break;
+    default:
+      url.clear();
+      break;
+  }
+  return url;
 }
 
-void RegisterOpen9xFirmwares()
+SimulatorInterface * OpenTxFirmware::getSimulator()
 {
-  Open9xFirmware * open9x;
+  switch (board) {
+    case BOARD_STOCK:
+      return new Open9xSimulator();
+    case BOARD_M128:
+      return new Open9xM128Simulator();
+    case BOARD_GRUVIN9X:
+      return new Open9xGruvin9xSimulator();
+    case BOARD_SKY9X:
+      return new Open9xSky9xSimulator();
+    case BOARD_TARANIS:
+    case BOARD_TARANIS_REV4a:
+      return new OpentxTaranisSimulator();
+    default:
+      return NULL;
+  }
+}
+
+void registerOpenTxFirmwares()
+{
+  OpenTxFirmware * openTx;
 
   Option ext_options[] = { { "frsky", QObject::tr("Support for frsky telemetry mod"), FRSKY_VARIANT }, { "telemetrez", QObject::tr("Support for telemetry easy board"), FRSKY_VARIANT }, { "jeti", QObject::tr("Support for jeti telemetry mod"), 0 }, { "ardupilot", QObject::tr("Support for receiving ardupilot data"), 0 }, { "nmea", QObject::tr("Support for receiving NMEA data"), 0 }, { "mavlink", QObject::tr("Support for MAVLINK devices"), MAVLINK_VARIANT }, { NULL } };
   Option nav_options[] = { { "rotenc", QObject::tr("Rotary Encoder use in menus navigation") }, { "potscroll", QObject::tr("Pots use in menus navigation") }, { NULL } };
   Option extr_options[] = { { "frsky", QObject::tr("Support for frsky telemetry mod"), FRSKY_VARIANT }, { "jeti", QObject::tr("Support for jeti telemetry mod"), 0 }, { "ardupilot", QObject::tr("Support for receiving ardupilot data"), 0 }, { "nmea", QObject::tr("Support for receiving NMEA data"), 0 }, { "mavlink", QObject::tr("Support for MAVLINK devices"), MAVLINK_VARIANT }, { NULL } };
   Option fai_options[] = { { "faichoice", QObject::tr("Possibility to enable FAI MODE at field") }, { "faimode", QObject::tr("FAI MODE always enabled") }, { NULL } };
+
   /* 9x board */
-  open9x = new Open9xFirmware("opentx-9x", QObject::tr("OpenTX for 9X board"), new OpenTxInterface(BOARD_STOCK), geturl(BOARD_STOCK), getstamp(BOARD_STOCK), getrnurl(BOARD_STOCK), false);
-  open9x->addOptions(ext_options);
-  open9x->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
-  open9x->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  open9x->addOption("nosplash", QObject::tr("No splash screen"));
-  open9x->addOption("nofp", QObject::tr("No flight modes"));
-  open9x->addOption("nocurves", QObject::tr("Disable curves menus"));
-  open9x->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  open9x->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  open9x->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
-  // NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
-  open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
-  open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  open9x->addOptions(nav_options);
-  open9x->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support"));
-  open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
-  open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  open9x->addOption("battgraph", QObject::tr("Battery graph"));
-  open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  open9x->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
-  open9x->addOption("pgbar", QObject::tr("EEprom write progress bar"));
-  open9x->addOption("imperial", QObject::tr("Imperial units"));
-  open9x->addOption("nowshh", QObject::tr("No Winged Shadow How High support"));
-  open9x->addOption("novario", QObject::tr("No vario support"));
-  open9x->addOption("nogps", QObject::tr("No GPS support"));
-  open9x->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
-  open9x->addOption("fasoffset", QObject::tr("Allow compensating for offset errors in FrSky FAS current sensors"));
-  open9x->addOptions(fai_options);
-  firmwares.push_back(open9x);
+  openTx = new OpenTxFirmware("opentx-9x", QObject::tr("OpenTX for 9X board"), BOARD_STOCK, false);
+  openTx->addOptions(ext_options);
+  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  openTx->addOption("nosplash", QObject::tr("No splash screen"));
+  openTx->addOption("nofp", QObject::tr("No flight modes"));
+  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
+  openTx->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  openTx->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  openTx->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
+  // NOT TESTED openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  openTx->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
+  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  openTx->addOptions(nav_options);
+  openTx->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support"));
+  openTx->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  openTx->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  openTx->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
+  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  openTx->addOption("battgraph", QObject::tr("Battery graph"));
+  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  openTx->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
+  openTx->addOption("pgbar", QObject::tr("EEprom write progress bar"));
+  openTx->addOption("imperial", QObject::tr("Imperial units"));
+  openTx->addOption("nowshh", QObject::tr("No Winged Shadow How High support"));
+  openTx->addOption("novario", QObject::tr("No vario support"));
+  openTx->addOption("nogps", QObject::tr("No GPS support"));
+  openTx->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
+  openTx->addOption("fasoffset", QObject::tr("Allow compensating for offset errors in FrSky FAS current sensors"));
+  openTx->addOptions(fai_options);
+  firmwares.push_back(openTx);
 
   /* 9x board with M128 chip */
-  open9x = new Open9xFirmware("opentx-9x128", QObject::tr("OpenTX for M128 / 9X board"), new OpenTxInterface(BOARD_M128), geturl(BOARD_M128), getstamp(BOARD_M128),getrnurl(BOARD_M128), false);
-  open9x->addOptions(ext_options);
-  open9x->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
-  open9x->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  open9x->addOption("nosplash", QObject::tr("No splash screen"));
-  open9x->addOption("nofp", QObject::tr("No flight modes"));
-  open9x->addOption("nocurves", QObject::tr("Disable curves menus"));
-  open9x->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  open9x->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  open9x->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
-  // NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
-  open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
-  open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  open9x->addOptions(nav_options);
-  open9x->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support"));
-  open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
-  open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  open9x->addOption("battgraph", QObject::tr("Battery graph"));
-  open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  open9x->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
-  open9x->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
-  open9x->addOption("imperial", QObject::tr("Imperial units"));
-  open9x->addOptions(fai_options);
-  firmwares.push_back(open9x);
+  openTx = new OpenTxFirmware("opentx-9x128", QObject::tr("OpenTX for M128 / 9X board"), BOARD_M128, false);
+  openTx->addOptions(ext_options);
+  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  openTx->addOption("nosplash", QObject::tr("No splash screen"));
+  openTx->addOption("nofp", QObject::tr("No flight modes"));
+  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
+  openTx->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  openTx->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  openTx->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
+  // NOT TESTED openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  openTx->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
+  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  openTx->addOptions(nav_options);
+  openTx->addOption("sp22", QObject::tr("SmartieParts 2.2 Backlight support"));
+  openTx->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  openTx->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  openTx->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
+  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  openTx->addOption("battgraph", QObject::tr("Battery graph"));
+  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  openTx->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
+  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  openTx->addOption("imperial", QObject::tr("Imperial units"));
+  openTx->addOptions(fai_options);
+  firmwares.push_back(openTx);
 
   /* 9XR board */
-  open9x = new Open9xFirmware("opentx-9xr", QObject::tr("OpenTX for 9XR"), new OpenTxInterface(BOARD_STOCK), geturl(BOARD_STOCK), getstamp(BOARD_STOCK),getrnurl(BOARD_STOCK), false);
-  open9x->addOptions(extr_options);
-  open9x->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
-  open9x->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  open9x->addOption("nosplash", QObject::tr("No splash screen"));
-  open9x->addOption("nofp", QObject::tr("No flight modes"));
-  open9x->addOption("nocurves", QObject::tr("Disable curves menus"));
-  open9x->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  open9x->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  open9x->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
-  // NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
-  open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
-  open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  open9x->addOption("battgraph", QObject::tr("Battery graph"));
-  open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  open9x->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
-  open9x->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
-  open9x->addOption("imperial", QObject::tr("Imperial units"));
-  open9x->addOption("nowshh", QObject::tr("No Winged Shadow How High support"));
-  open9x->addOption("novario", QObject::tr("No vario support"));
-  open9x->addOption("nogps", QObject::tr("No GPS support"));
-  open9x->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
-  open9x->addOptions(fai_options);
-  firmwares.push_back(open9x);
+  openTx = new OpenTxFirmware("opentx-9xr", QObject::tr("OpenTX for 9XR"), BOARD_STOCK, false);
+  openTx->addOptions(extr_options);
+  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  openTx->addOption("nosplash", QObject::tr("No splash screen"));
+  openTx->addOption("nofp", QObject::tr("No flight modes"));
+  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
+  openTx->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  openTx->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  openTx->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
+  // NOT TESTED openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  openTx->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
+  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  openTx->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  openTx->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  openTx->addOption("battgraph", QObject::tr("Battery graph"));
+  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  openTx->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
+  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  openTx->addOption("imperial", QObject::tr("Imperial units"));
+  openTx->addOption("nowshh", QObject::tr("No Winged Shadow How High support"));
+  openTx->addOption("novario", QObject::tr("No vario support"));
+  openTx->addOption("nogps", QObject::tr("No GPS support"));
+  openTx->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
+  openTx->addOptions(fai_options);
+  firmwares.push_back(openTx);
 
   /* 9XR board with M128 chip */
-  open9x = new Open9xFirmware("opentx-9xr128", QObject::tr("OpenTX for 9XR with M128 chip"), new OpenTxInterface(BOARD_M128), geturl(BOARD_M128), getstamp(BOARD_M128),getrnurl(BOARD_M128), false);
-  open9x->addOptions(extr_options);
-  open9x->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
-  open9x->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  open9x->addOption("nosplash", QObject::tr("No splash screen"));
-  open9x->addOption("nofp", QObject::tr("No flight modes"));
-  open9x->addOption("nocurves", QObject::tr("Disable curves menus"));
-  open9x->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  open9x->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  open9x->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
-  // NOT TESTED open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
-  open9x->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
-  open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  open9x->addOption("battgraph", QObject::tr("Battery graph"));
-  open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  open9x->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
-  open9x->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
-  open9x->addOption("imperial", QObject::tr("Imperial units"));
-  open9x->addOptions(fai_options);
-  firmwares.push_back(open9x);
+  openTx = new OpenTxFirmware("opentx-9xr128", QObject::tr("OpenTX for 9XR with M128 chip"), BOARD_M128, false);
+  openTx->addOptions(extr_options);
+  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  openTx->addOption("nosplash", QObject::tr("No splash screen"));
+  openTx->addOption("nofp", QObject::tr("No flight modes"));
+  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
+  openTx->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  openTx->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  openTx->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
+  // NOT TESTED openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  openTx->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
+  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  openTx->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  openTx->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  openTx->addOption("battgraph", QObject::tr("Battery graph"));
+  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  openTx->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
+  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  openTx->addOption("imperial", QObject::tr("Imperial units"));
+  openTx->addOptions(fai_options);
+  firmwares.push_back(openTx);
 
   /* Gruvin9x board */
-  open9x = new Open9xFirmware("opentx-gruvin9x", QObject::tr("OpenTX for Gruvin9x board / 9X"), new OpenTxInterface(BOARD_GRUVIN9X), geturl(BOARD_GRUVIN9X), getstamp(BOARD_GRUVIN9X),getrnurl(BOARD_GRUVIN9X), false);
-  open9x->setVariantBase(FRSKY_VARIANT);
-  open9x->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
-  open9x->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  open9x->addOption("nofp", QObject::tr("No flight modes"));
-  open9x->addOption("nocurves", QObject::tr("Disable curves menus"));
-  open9x->addOption("sdcard", QObject::tr("Support for SD memory card"));
-  open9x->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  open9x->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  openTx = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("OpenTX for Gruvin9x board / 9X"), BOARD_GRUVIN9X, false);
+  openTx->setVariantBase(FRSKY_VARIANT);
+  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  openTx->addOption("nofp", QObject::tr("No flight modes"));
+  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
+  openTx->addOption("sdcard", QObject::tr("Support for SD memory card"));
+  openTx->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
   Option dsm2_options[] = { { "DSM2", QObject::tr("Support for DSM2 modules"), 0 }, { "DSM2PPM", QObject::tr("Support for DSM2 modules using ppm instead of true serial"), 0 }, { NULL } };
-  open9x->addOptions(dsm2_options);
-  open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
-  open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  open9x->addOption("battgraph", QObject::tr("Battery graph"));
-  open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  open9x->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
-  open9x->addOption("imperial", QObject::tr("Imperial units"));
-  open9x->addOptions(fai_options);
-  firmwares.push_back(open9x);
+  openTx->addOptions(dsm2_options);
+  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  openTx->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  openTx->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  openTx->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
+  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  openTx->addOption("battgraph", QObject::tr("Battery graph"));
+  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  openTx->addOption("imperial", QObject::tr("Imperial units"));
+  openTx->addOptions(fai_options);
+  firmwares.push_back(openTx);
 
 #ifndef __APPLE__
   /* SKY9X board */
-  open9x = new Open9xFirmware("opentx-sky9x", QObject::tr("OpenTX for Sky9x board / 9X"), new OpenTxInterface(BOARD_SKY9X), geturl(BOARD_SKY9X), getstamp(BOARD_SKY9X),getrnurl(BOARD_SKY9X), true);
-  open9x->setVariantBase(FRSKY_VARIANT);
-  open9x->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
-  open9x->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  open9x->addOption("nofp", QObject::tr("No flight modes"));
-  open9x->addOption("nocurves", QObject::tr("Disable curves menus"));
-  open9x->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  open9x->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  open9x->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  open9x->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  open9x->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  open9x->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  open9x->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
-  open9x->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  open9x->addOption("battgraph", QObject::tr("Battery graph"));
-  open9x->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  open9x->addOption("tsticks", QObject::tr("Use FrSky Taranis sticks in a 9X/9XR"));
-  open9x->addOption("bluetooth", QObject::tr("Bluetooth interface"));
-  open9x->addOptions(fai_options);
-  firmwares.push_back(open9x);
+  openTx = new OpenTxFirmware("opentx-sky9x", QObject::tr("OpenTX for Sky9x board / 9X"), BOARD_SKY9X, true);
+  openTx->setVariantBase(FRSKY_VARIANT);
+  openTx->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
+  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  openTx->addOption("nofp", QObject::tr("No flight modes"));
+  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
+  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  openTx->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  openTx->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  openTx->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
+  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  openTx->addOption("battgraph", QObject::tr("Battery graph"));
+  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  openTx->addOption("tsticks", QObject::tr("Use FrSky Taranis sticks in a 9X/9XR"));
+  openTx->addOption("bluetooth", QObject::tr("Bluetooth interface"));
+  openTx->addOptions(fai_options);
+  firmwares.push_back(openTx);
 #endif
   
   /* Taranis board */
-  open9x = new Open9xFirmware("opentx-taranis", QObject::tr("OpenTX for FrSky Taranis"), new OpenTxInterface(BOARD_TARANIS), geturl(BOARD_TARANIS), getstamp(BOARD_TARANIS),getrnurl(BOARD_TARANIS), true);
-  open9x->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
-  open9x->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
-  open9x->addOption("nogvars", QObject::tr("Disable Global variables"));
-  open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  open9x->addOptions(fai_options);
-  firmwares.push_back(open9x);
+  openTx = new OpenTxFirmware("opentx-taranis", QObject::tr("OpenTX for FrSky Taranis"), BOARD_TARANIS, true);
+  openTx->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
+  openTx->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
+  openTx->addOption("nogvars", QObject::tr("Disable Global variables"));
+  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  openTx->addOptions(fai_options);
+  firmwares.push_back(openTx);
 
   if (g.rev4aSupport()) {
-    open9x = new Open9xFirmware("opentx-taranisrev4a", QObject::tr("OpenTX for FrSky Taranis Rev4a"), new OpenTxInterface(BOARD_TARANIS_REV4a), geturl(BOARD_TARANIS_REV4a), getstamp(BOARD_TARANIS_REV4a),getrnurl(BOARD_TARANIS), true);
-    open9x->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
-    open9x->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
-    open9x->addOption("nogvars", QObject::tr("Disable Global variables"));
-    open9x->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-    open9x->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-    open9x->addOptions(fai_options);
-    firmwares.push_back(open9x);
+    openTx = new OpenTxFirmware("opentx-taranisrev4a", QObject::tr("OpenTX for FrSky Taranis Rev4a"), BOARD_TARANIS_REV4a, true);
+    openTx->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
+    openTx->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
+    openTx->addOption("nogvars", QObject::tr("Disable Global variables"));
+    openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+    openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+    openTx->addOptions(fai_options);
+    firmwares.push_back(openTx);
   }
+
+  default_firmware_variant = GetFirmwareVariant("opentx-9x-heli-templates-en");
+  current_firmware_variant = default_firmware_variant;
 }
 
-void UnregisterOpen9xFirmwares() 
-{
-  foreach (FirmwareInfo * f, firmwares) {
-    qDebug() << "UnregisterOpen9xFirmwares(): deleting " <<  QString::number(reinterpret_cast<uint64_t>(f), 16 );
-    delete f;
-  }
-}
diff --git a/companion/src/firmwares/opentx/opentxinterface.h b/companion/src/firmwares/opentx/opentxinterface.h
index 03bcf34f0..b2039dd26 100644
--- a/companion/src/firmwares/opentx/opentxinterface.h
+++ b/companion/src/firmwares/opentx/opentxinterface.h
@@ -23,13 +23,13 @@
 
 class EFile;
 
-class OpenTxInterface : public EEPROMInterface
+class OpenTxEepromInterface : public EEPROMInterface
 {
   public:
 
-    OpenTxInterface(BoardEnum board);
+    OpenTxEepromInterface(BoardEnum board);
 
-    virtual ~OpenTxInterface();
+    virtual ~OpenTxEepromInterface();
 
     virtual const char * getName();
 
@@ -49,12 +49,8 @@ class OpenTxInterface : public EEPROMInterface
 
     virtual int getSize(GeneralSettings &);
     
-    virtual int getCapability(const Capability);
-    
     virtual int isAvailable(Protocol proto, int port=0);
     
-    virtual SimulatorInterface * getSimulator();
-
   protected:
 
     bool checkVersion(unsigned int version);
@@ -82,10 +78,10 @@ class OpenTxInterface : public EEPROMInterface
 
 };
 
-class Open9xFirmware: public FirmwareInfo {
+class OpenTxFirmware: public FirmwareInterface {
   public:
-    Open9xFirmware(const QString & id, const QString & name, EEPROMInterface * eepromInterface, const QString & url = QString(), const QString & stamp = QString(), const QString & rnurl = QString(), bool voice = false):
-      FirmwareInfo(id, name, eepromInterface, url, stamp, rnurl, voice)
+    OpenTxFirmware(const QString & id, const QString & name, const BoardEnum board, bool voice = false):
+      FirmwareInterface(id, name, board, new OpenTxEepromInterface(board), voice)
     {
       addLanguage("en");
       addLanguage("fr");
@@ -109,61 +105,19 @@ class Open9xFirmware: public FirmwareInfo {
       addTTSLanguage("es");
     }
     
-    virtual unsigned int getEepromVersion(unsigned int revision) {
-      switch(this->eepromInterface->getBoard()) {
-        case BOARD_SKY9X:
-          if (revision == 0)
-            return 212;
-          if (revision >= 1217)
-            return 212;
-          if (revision >= 1174)
-            return 211;
-          if (revision >= 1031)
-            return 210;
-          if (revision >= 791)
-            return 209;
-          if (revision >= 641)
-            return 208;
-          break;
-        case BOARD_GRUVIN9X:
-          if (revision == 0)
-            return 211;
-          if (revision >= 1217)
-            return 211;
-          if (revision >= 1174)
-            return 210;
-          if (revision >= 791)
-            return 209;
-          if (revision >= 641)
-            return 208;
-          if (revision >= 547)
-            return 207;
-          break;
-        default:
-          if (revision == 0)
-            return 211;
-          if (revision >= 1217)
-            return 211;
-          if (revision >= 1174)
-            return 210;
-          if (revision >= 791)
-            return 209;
-          if (revision >= 641)
-            return 208;
-          break;
-      }
-      if (revision >= 321)
-        return 205;
-      else if (revision >= 217)
-        return 204;
-      else if (revision >= 184)
-        return 203;
-      else
-        return 202;
-    }
+    virtual QString getStampUrl();
+
+    virtual QString getReleaseNotesUrl();
+
+    virtual QString getFirmwareUrl(QString & id);
+
+    virtual int getCapability(const Capability);
+
+    virtual SimulatorInterface * getSimulator();
+
+
 };
 
-void RegisterOpen9xFirmwares();
-void UnregisterOpen9xFirmwares();
+void registerOpenTxFirmwares();
 
 #endif
diff --git a/companion/src/firmwares/opentx/opentxsimulator.cpp b/companion/src/firmwares/opentx/opentxsimulator.cpp
index 05e680073..49050cdc9 100644
--- a/companion/src/firmwares/opentx/opentxsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxsimulator.cpp
@@ -110,8 +110,7 @@ uint8_t getStickMode()
 
 using namespace Open9x;
 
-Open9xSimulator::Open9xSimulator(OpenTxInterface * open9xInterface):
-    open9xInterface(open9xInterface)
+Open9xSimulator::Open9xSimulator()
 {
 #define INIT_IMPORT
 #include "simulatorimport.h"
@@ -144,7 +143,6 @@ void Open9xSimulator::start(QByteArray & eeprom, bool tests)
 
 void Open9xSimulator::start(const char * filename, bool tests)
 {
-  // open9xInterface->save(&Open9x::eeprom[0], radioData, SIMU_STOCK_VARIANTS);
   StartEepromThread(filename);
   StartMainThread(tests);
 }
diff --git a/companion/src/firmwares/opentx/opentxsimulator.h b/companion/src/firmwares/opentx/opentxsimulator.h
index a4e24b3ba..c563b12d8 100644
--- a/companion/src/firmwares/opentx/opentxsimulator.h
+++ b/companion/src/firmwares/opentx/opentxsimulator.h
@@ -19,13 +19,13 @@
 
 #include "simulatorinterface.h"
 
-class OpenTxInterface;
+class OpenTxEepromInterface;
 
 class Open9xSimulator : public SimulatorInterface {
 
   public:
 
-    Open9xSimulator(OpenTxInterface *);
+    Open9xSimulator();
 
     virtual void start(QByteArray & eeprom, bool tests=true);
 
@@ -53,10 +53,6 @@ class Open9xSimulator : public SimulatorInterface {
 
     virtual const char * getError();
 
-  protected:
-
-      OpenTxInterface * open9xInterface;
-
 };
 
 #endif
diff --git a/companion/src/firmwares/th9x/th9xinterface.cpp b/companion/src/firmwares/th9x/th9xinterface.cpp
index 01030b1b8..16b7a3845 100644
--- a/companion/src/firmwares/th9x/th9xinterface.cpp
+++ b/companion/src/firmwares/th9x/th9xinterface.cpp
@@ -140,45 +140,6 @@ int Th9xInterface::getSize(GeneralSettings &settings)
   return 0;
 }
 
-int Th9xInterface::getCapability(const Capability capability)
-{
-  switch (capability) {
-    case Mixes:
-      return TH9X_MAX_MIXERS;
-    case Timers:
-      return 1;
-    case Pots:
-      return 3;
-    case Switches:
-      return 7;
-    case SwitchesPositions:
-      return 9;
-    case CustomFunctions:
-      return 0;
-    case LogicalSwitches:
-      return TH9X_MAX_SWITCHES;
-    case Outputs:
-      return 8;
-    case OffsetWeight:
-      return 125;      
-    case Simulation:
-      return 1;
-    case HasContrast:  
-    case CSFunc:
-      return 13;
-    case SlowScale:
-      return 1;
-    case SlowRange:
-      return 10;
-    case LCDWidth:
-      return 128;
-    case GetThrSwitch:
-      return DSW_THR;
-    default:
-      return 0;
-  }
-}
-
 int Th9xInterface::isAvailable(Protocol proto, int port)
 {
   switch (proto) {
@@ -192,9 +153,3 @@ int Th9xInterface::isAvailable(Protocol proto, int port)
       return 0;
   }
 }
-
-
-SimulatorInterface * Th9xInterface::getSimulator()
-{
-  return NULL; // new Th9xSimulator(this);
-}
diff --git a/companion/src/firmwares/th9x/th9xinterface.h b/companion/src/firmwares/th9x/th9xinterface.h
index 9b63e7695..b5b842915 100644
--- a/companion/src/firmwares/th9x/th9xinterface.h
+++ b/companion/src/firmwares/th9x/th9xinterface.h
@@ -46,12 +46,8 @@ class Th9xInterface : public EEPROMInterface
 
     virtual int getSize(GeneralSettings &);
 
-    virtual int getCapability(const Capability);
-    
     virtual int isAvailable(Protocol proto, int port=0);
 
-    virtual SimulatorInterface * getSimulator();
-
   protected:
 
     EFile *efile;
diff --git a/companion/src/fwpreferencesdialog.cpp b/companion/src/fwpreferencesdialog.cpp
index ec2585ddc..3dba1a94a 100644
--- a/companion/src/fwpreferencesdialog.cpp
+++ b/companion/src/fwpreferencesdialog.cpp
@@ -7,316 +7,50 @@
 #include <QDesktopServices>
 #include <QtGui>
 
-fwPreferencesDialog::fwPreferencesDialog(QWidget *parent) :
+FirmwarePreferencesDialog::FirmwarePreferencesDialog(QWidget *parent) :
   QDialog(parent),
-  ui(new Ui::fwPreferencesDialog),
-  updateLock(false)
+  ui(new Ui::FirmwarePreferencesDialog)
 {
   ui->setupUi(this);
   setWindowIcon(CompanionIcon("fwpreferences.png"));
-
-  QCheckBox * OptionCheckBox[]= {
-      ui->optionCheckBox_1, ui->optionCheckBox_2, ui->optionCheckBox_3, ui->optionCheckBox_4,  ui->optionCheckBox_5, ui->optionCheckBox_6,  ui->optionCheckBox_7,
-      ui->optionCheckBox_8, ui->optionCheckBox_9, ui->optionCheckBox_10,  ui->optionCheckBox_11, ui->optionCheckBox_12, ui->optionCheckBox_13, ui->optionCheckBox_14,
-      ui->optionCheckBox_15,ui->optionCheckBox_16, ui->optionCheckBox_17, ui->optionCheckBox_18, ui->optionCheckBox_19, ui->optionCheckBox_20, ui->optionCheckBox_21,
-      ui->optionCheckBox_22, ui->optionCheckBox_23, ui->optionCheckBox_24, ui->optionCheckBox_25, ui->optionCheckBox_26, ui->optionCheckBox_27, ui->optionCheckBox_28,
-      ui->optionCheckBox_29, ui->optionCheckBox_30, ui->optionCheckBox_31, ui->optionCheckBox_32, ui->optionCheckBox_33, ui->optionCheckBox_34, ui->optionCheckBox_35,
-      ui->optionCheckBox_36, ui->optionCheckBox_37, ui->optionCheckBox_38, ui->optionCheckBox_39, ui->optionCheckBox_40, ui->optionCheckBox_41, ui->optionCheckBox_42,
-      NULL };
-
-  voice=NULL;
-  
-  connect(ui->langCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged()));
-  connect(ui->voiceCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged()));
-
-  for (int i=0; OptionCheckBox[i]; i++) {
-    optionsCheckBoxes.push_back(OptionCheckBox[i]);
-    connect(OptionCheckBox[i], SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
-  }
-
   initSettings();
-
-  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
-  connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
-
-  shrink();
 }
 
-
-fwPreferencesDialog::~fwPreferencesDialog()
+FirmwarePreferencesDialog::~FirmwarePreferencesDialog()
 {
   delete ui;
 }
 
-void fwPreferencesDialog::showVoice(bool show)
+void FirmwarePreferencesDialog::initSettings()
 {
-  if (show)
-    showVoice();
-  else
-    hideVoice();
+  ui->fwTypeLbl->setText(g.profile[g.id()].fwType());
+  int revision = g.fwRev.get(g.profile[g.id()].fwType());
+  if (revision > 0)
+    ui->lastRevisionLbl->setText(QString("%1").arg(revision));
 }
 
-void fwPreferencesDialog::showVoice()
-{
-  ui->voiceLine->show(); 
-  ui->voiceLabel->show();
-  ui->voiceCombo->show();
-  ui->voice_dnld->show();
-}
-
-void fwPreferencesDialog::hideVoice()
-{
-  ui->voiceLine->hide(); 
-  ui->voiceLabel->hide();
-  ui->voiceCombo->hide();
-  ui->voice_dnld->hide();  
-  QTimer::singleShot(0, this, SLOT(shrink()));
-}
-
-void fwPreferencesDialog::shrink()
-{
-    resize(0,0);
-}
-
-void fwPreferencesDialog::baseFirmwareChanged()
-{
-  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-  voice=NULL;
-  foreach(FirmwareInfo * firmware, firmwares) {
-    if (firmware->id == selected_firmware) {
-      showVoice(firmware->voice);
-      populateFirmwareOptions(firmware);
-      break;
-    }
-  }
-  firmwareChanged();
-}
-
-FirmwareVariant fwPreferencesDialog::getFirmwareVariant()
-{
-  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-  bool voice=false;
-  foreach(FirmwareInfo * firmware, firmwares) {
-    if (firmware->id == selected_firmware) {
-      QString id = firmware->id;
-      foreach(QCheckBox *cb, optionsCheckBoxes) {
-        if (cb->isChecked()) {
-          if (cb->text()=="voice" && cb->isChecked())
-            voice=true;
-          id += QString("-") + cb->text();
-        }
-      }
-      if (! firmware->eepromInterface->getCapability(MultiLangVoice)) {
-        if (ui->voiceCombo->count() && (voice || firmware->voice))
-          id += QString("-tts") + ui->voiceCombo->currentText();
-      }
-      if (ui->langCombo->count())
-        id += QString("-") + ui->langCombo->currentText();
-
-      return GetFirmwareVariant(id);
-    }
-  }
-
-  // Should never occur...
-  return default_firmware_variant;
-}
-
-void fwPreferencesDialog::firmwareOptionChanged(bool state)
-{
-  QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
-  FirmwareInfo * firmware=NULL;
-  if (cb && state) {
-    QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-    foreach(firmware, firmwares) {
-      if (firmware->id == selected_firmware) {
-        foreach(QList<Option> opts, firmware->opts) {
-          foreach(Option opt, opts) {
-            if (cb->text() == opt.name) {
-              foreach(Option other, opts) {
-                if (other.name != opt.name) {
-                  foreach(QCheckBox *ocb, optionsCheckBoxes) {
-                    if (ocb->text() == other.name)
-                      ocb->setChecked(false);
-                  }
-                }
-              }
-              if (voice) {
-                showVoice(voice->isChecked());
-              }
-              
-              return firmwareChanged();
-            }
-          }
-        }
-      }
-    }
-  } else if (cb && !state) {
-    if (cb->text()=="voice") {
-      hideVoice();
-    }
-  }
-  if (voice) {
-    showVoice(voice->isChecked());
-  }  else if (firmware) {
-    if (firmware->voice) {
-      showVoice();    
-    }
-  }
-  return firmwareChanged();
-}
-
-void fwPreferencesDialog::firmwareLangChanged()
-{
-  firmwareChanged();
-}
-
-void fwPreferencesDialog::firmwareChanged()
-{
-  if (updateLock)
-    return;
-  
-  FirmwareVariant variant = getFirmwareVariant();
-  QString stamp;
-  stamp.append(variant.firmware->stamp);
-  ui->fw_dnld->setEnabled(!variant.firmware->getUrl(variant.id).isNull());
-  QString url=variant.firmware->getUrl(variant.id);
-  // B-Plan 
-  if (false) {
-    ui->CPU_ID_LE->show();
-    ui->CPU_ID_LABEL->show();
-  } else {
-    ui->CPU_ID_LE->hide();
-    ui->CPU_ID_LABEL->hide();
-  }
-  int fwrev = g.fwRev.get(variant.id);
-  if (fwrev != 0) {
-    ui->FwInfo->setText(tr("Last downloaded release: %1").arg(fwrev));
-    if (!stamp.isEmpty()) {
-      ui->checkFWUpdates->show();
-    } else {
-      ui->checkFWUpdates->hide();
-    }
-  }
-  else {
-    if (ui->fw_dnld->isEnabled()) {
-      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 Companion."));
-      ui->checkFWUpdates->hide();
-    }
-  }
-}
-
-void fwPreferencesDialog::writeValues()
-{
-  g.cpuId( ui->CPU_ID_LE->text() );
-  current_firmware_variant = getFirmwareVariant();
-  g.profile[g.id()].fwType( current_firmware_variant.id );
-}
-
-void fwPreferencesDialog::populateFirmwareOptions(const FirmwareInfo * firmware)
-{
-  const FirmwareInfo * parent = firmware->parent ? firmware->parent : firmware;
-
-  updateLock = true;
-
-  ui->langCombo->clear();
-  foreach(const char *lang, parent->languages) {
-    ui->langCombo->addItem(lang);
-    if (current_firmware_variant.id.endsWith(lang))
-      ui->langCombo->setCurrentIndex(ui->langCombo->count() - 1);
-  }
-  ui->voiceCombo->clear();
-  foreach(const char *lang, parent->ttslanguages) {
-    ui->voiceCombo->addItem(lang);
-    if (current_firmware_variant.id.contains(QString("-tts%1").arg(lang)))
-      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
-  }
-
-  showVoice(ui->langCombo->count()!=0);
-
-  int index = 0;
-  foreach(QList<Option> opts, parent->opts) {
-    foreach(Option opt, opts) {
-      if (index >= optionsCheckBoxes.size()) {
-        qDebug() << "This firmware needs more options checkboxes!";
-      }
-      else {
-        QCheckBox *cb = optionsCheckBoxes.at(index++);
-        if (cb) {
-          cb->show();
-          cb->setText(opt.name);
-          cb->setToolTip(opt.tooltip);
-          cb->setCheckState(current_firmware_variant.id.contains(opt.name) ? Qt::Checked : Qt::Unchecked);
-            
-          if (opt.name==QString("voice")) {
-            voice=cb;
-            showVoice(current_firmware_variant.id.contains(opt.name) ||firmware->voice);
-          }
-        }
-      }
-    }
-  }
-  for (; index<optionsCheckBoxes.size(); index++) {
-    QCheckBox *cb = optionsCheckBoxes.at(index);
-    cb->hide();
-    cb->setCheckState(Qt::Unchecked);
-  }
-
-  updateLock = false;
-  QTimer::singleShot(0, this, SLOT(shrink()));
-}
-
-void fwPreferencesDialog::initSettings()
-{
-  ui->CPU_ID_LE->setText(g.cpuId());
-  FirmwareInfo * current_firmware = GetCurrentFirmware();
-
-  foreach(FirmwareInfo * firmware, firmwares) {
-    ui->downloadVerCB->addItem(firmware->name, firmware->id);
-    if (current_firmware == firmware) {
-      ui->downloadVerCB->setCurrentIndex(ui->downloadVerCB->count() - 1);
-    }
-  }
-  
-  baseFirmwareChanged();
-  firmwareChanged();
-}
-
-void fwPreferencesDialog::on_checkFWUpdates_clicked()
-{
-    FirmwareVariant variant = getFirmwareVariant();
-    if (g.profile[g.id()].burnFirmware()) {
-      current_firmware_variant = variant;
-      g.profile[g.id()].fwType( variant.id );
-    }
-    MainWindow * mw = (MainWindow *)this->parent();
-    mw->checkForUpdates(true, variant.id);
-    firmwareChanged();
-}
-
-void fwPreferencesDialog::on_fw_dnld_clicked()
+void FirmwarePreferencesDialog::on_checkFWUpdates_clicked()
 {
   MainWindow * mw = (MainWindow *)this->parent();
-  FirmwareVariant variant = getFirmwareVariant();
-  writeValues();
-  if (!variant.firmware->getUrl(variant.id).isNull()) {
-    if (g.profile[g.id()].burnFirmware()) {
-      current_firmware_variant = getFirmwareVariant();
-      g.profile[g.id()].fwType( current_firmware_variant.id );
-    }
-    mw->downloadLatestFW(current_firmware_variant.firmware, current_firmware_variant.id);
-  }
-  firmwareChanged();
+  QString fwType = g.profile[g.id()].fwType();
+  mw->checkForUpdates(true, fwType);
+  initSettings();
 }
 
-void fwPreferencesDialog::on_voice_dnld_clicked()
+void FirmwarePreferencesDialog::on_fw_dnld_clicked()
+{
+  MainWindow * mw = (MainWindow *)this->parent();
+  mw->downloadLatestFW(current_firmware_variant);
+  initSettings();
+}
+
+void FirmwarePreferencesDialog::on_voice_dnld_clicked()
 {
   QString url="http://fw.opentx.it/voices/";
-  FirmwareVariant variant = getFirmwareVariant();
-  url.append(QString("%1/%2/").arg(variant.firmware->id).arg(ui->voiceCombo->currentText()));
+  QString fwType = g.profile[g.id()].fwType();
+  QStringList list = fwType.split("-");
+  QString firmware = QString("%1-%2").arg(list[0]).arg(list[1]);
+  url.append(QString("%1/%2/").arg(firmware).arg(ui->voiceCombo->currentText()));
   QDesktopServices::openUrl(url);
 }
 
diff --git a/companion/src/fwpreferencesdialog.h b/companion/src/fwpreferencesdialog.h
index 5bbb6c2b2..842114ba6 100644
--- a/companion/src/fwpreferencesdialog.h
+++ b/companion/src/fwpreferencesdialog.h
@@ -6,40 +6,24 @@
 #include "eeprominterface.h"
 
 namespace Ui {
-    class fwPreferencesDialog;
+  class FirmwarePreferencesDialog;
 }
 
 class Joystick;
 
-class fwPreferencesDialog : public QDialog
+class FirmwarePreferencesDialog : public QDialog
 {
     Q_OBJECT
 
-public:
-    explicit fwPreferencesDialog(QWidget *parent = 0);
-    ~fwPreferencesDialog();
+  public:
+    explicit FirmwarePreferencesDialog(QWidget *parent = 0);
+    ~FirmwarePreferencesDialog();
 
-private:
-    Ui::fwPreferencesDialog *ui;
-    QList<QCheckBox *> optionsCheckBoxes;
-    bool updateLock;
-
-    void showVoice(bool);
-    void showVoice();
-    void hideVoice();
-    void populateLocale();
-    void populateFirmwareOptions(const FirmwareInfo *);
-    FirmwareVariant getFirmwareVariant();
+  private:
+    Ui::FirmwarePreferencesDialog *ui;
     void initSettings();
-    QCheckBox * voice;
 
-private slots:
-    void shrink();
-    void writeValues();
-    void firmwareLangChanged();
-    void baseFirmwareChanged();
-    void firmwareOptionChanged(bool state);
-    void firmwareChanged();
+  private slots:
     void on_fw_dnld_clicked();
     void on_voice_dnld_clicked();
     void on_checkFWUpdates_clicked();
diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui
index 78b4f64cb..30bdea187 100644
--- a/companion/src/fwpreferencesdialog.ui
+++ b/companion/src/fwpreferencesdialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>fwPreferencesDialog</class>
- <widget class="QDialog" name="fwPreferencesDialog">
+ <class>FirmwarePreferencesDialog</class>
+ <widget class="QDialog" name="FirmwarePreferencesDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>620</width>
-    <height>437</height>
+    <width>416</width>
+    <height>153</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -32,488 +32,13 @@
    <property name="margin">
     <number>6</number>
    </property>
-   <item row="38" column="5">
+   <item row="24" column="5">
     <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>
-   <item row="11" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_14">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_32">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_16">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="2">
-    <widget class="QLabel" name="langLabel">
-     <property name="text">
-      <string>Menu Language</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_37">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_29">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_12">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2" colspan="3">
-    <widget class="QComboBox" name="downloadVerCB">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="2">
-    <widget class="QComboBox" name="langCombo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>50</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="2" colspan="3">
-    <widget class="QLineEdit" name="CPU_ID_LE"/>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QLabel" name="label_6">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <family>Sans Serif</family>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Firmware Type</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_4">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_28">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_42">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_5">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_17">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_35">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_36">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_13">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_26">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_41">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_18">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_11">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_21">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_20">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_33">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_24">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_23">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_22">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_6">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_38">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_34">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_31">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_30">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_27">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
+      <set>QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -530,7 +55,7 @@
      </property>
     </widget>
    </item>
-   <item row="21" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="voiceLabel">
      <property name="font">
       <font>
@@ -540,11 +65,11 @@
       </font>
      </property>
      <property name="text">
-      <string>Voice Language</string>
+      <string>Voice</string>
      </property>
     </widget>
    </item>
-   <item row="21" column="2">
+   <item row="7" column="2">
     <widget class="QComboBox" name="voiceCombo">
      <property name="maximumSize">
       <size>
@@ -556,155 +81,119 @@
       <string>Set language of voice.
 May be different from firmware language</string>
      </property>
+     <item>
+      <property name="text">
+       <string>en</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>cz</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>de</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>es</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>fr</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>it</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>pl</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>pt</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>se</string>
+      </property>
+     </item>
     </widget>
    </item>
-   <item row="21" column="5">
+   <item row="7" column="5">
     <widget class="QPushButton" name="voice_dnld">
      <property name="text">
       <string>Download Voice</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_9">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_10">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="5">
+   <item row="5" column="5">
     <widget class="QPushButton" name="fw_dnld">
      <property name="text">
       <string>Download FW</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0" colspan="2">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Options</string>
+   <item row="7" column="3">
+    <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>
+   <item row="6" column="0" colspan="6">
+    <widget class="Line" name="voiceLine">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="12" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_19">
+   <item row="23" column="0" colspan="6">
+    <widget class="Line" name="line_6">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_6">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="font">
+      <font>
+       <family>Sans Serif</family>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
      <property name="text">
-      <string notr="true">CheckBox</string>
+      <string>Firmware</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
-   <item row="9" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_8">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_25">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_7">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_15">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QLabel" name="CPU_ID_LABEL">
-     <property name="text">
-      <string>Processor ID</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_39">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2" colspan="4">
-    <widget class="QLabel" name="FwInfo">
+   <item row="0" column="2" colspan="4">
+    <widget class="QLabel" name="fwTypeLbl">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -712,34 +201,21 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string notr="true">FwInfo</string>
+      <string notr="true">FwType</string>
      </property>
     </widget>
    </item>
-   <item row="17" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_40">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="3" column="2" colspan="2">
+    <widget class="QLabel" name="lastRevisionLbl">
      <property name="text">
-      <string notr="true">CheckBox</string>
+      <string>-</string>
      </property>
     </widget>
    </item>
-   <item row="20" column="1" colspan="5">
-    <widget class="Line" name="voiceLine">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="37" column="1" colspan="5">
-    <widget class="Line" name="line_6">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Latest Download</string>
      </property>
     </widget>
    </item>
@@ -747,51 +223,6 @@ May be different from firmware language</string>
  </widget>
  <tabstops>
   <tabstop>buttonBox</tabstop>
-  <tabstop>downloadVerCB</tabstop>
-  <tabstop>CPU_ID_LE</tabstop>
-  <tabstop>langCombo</tabstop>
-  <tabstop>optionCheckBox_2</tabstop>
-  <tabstop>optionCheckBox_1</tabstop>
-  <tabstop>optionCheckBox_3</tabstop>
-  <tabstop>optionCheckBox_4</tabstop>
-  <tabstop>optionCheckBox_5</tabstop>
-  <tabstop>optionCheckBox_6</tabstop>
-  <tabstop>optionCheckBox_7</tabstop>
-  <tabstop>optionCheckBox_8</tabstop>
-  <tabstop>optionCheckBox_9</tabstop>
-  <tabstop>optionCheckBox_10</tabstop>
-  <tabstop>optionCheckBox_11</tabstop>
-  <tabstop>optionCheckBox_12</tabstop>
-  <tabstop>optionCheckBox_13</tabstop>
-  <tabstop>optionCheckBox_14</tabstop>
-  <tabstop>optionCheckBox_15</tabstop>
-  <tabstop>optionCheckBox_16</tabstop>
-  <tabstop>optionCheckBox_17</tabstop>
-  <tabstop>optionCheckBox_18</tabstop>
-  <tabstop>optionCheckBox_19</tabstop>
-  <tabstop>optionCheckBox_20</tabstop>
-  <tabstop>optionCheckBox_21</tabstop>
-  <tabstop>optionCheckBox_22</tabstop>
-  <tabstop>optionCheckBox_23</tabstop>
-  <tabstop>optionCheckBox_24</tabstop>
-  <tabstop>optionCheckBox_25</tabstop>
-  <tabstop>optionCheckBox_26</tabstop>
-  <tabstop>optionCheckBox_27</tabstop>
-  <tabstop>optionCheckBox_28</tabstop>
-  <tabstop>optionCheckBox_29</tabstop>
-  <tabstop>optionCheckBox_30</tabstop>
-  <tabstop>optionCheckBox_31</tabstop>
-  <tabstop>optionCheckBox_32</tabstop>
-  <tabstop>optionCheckBox_33</tabstop>
-  <tabstop>optionCheckBox_34</tabstop>
-  <tabstop>optionCheckBox_35</tabstop>
-  <tabstop>optionCheckBox_36</tabstop>
-  <tabstop>optionCheckBox_37</tabstop>
-  <tabstop>optionCheckBox_38</tabstop>
-  <tabstop>optionCheckBox_39</tabstop>
-  <tabstop>optionCheckBox_40</tabstop>
-  <tabstop>optionCheckBox_41</tabstop>
-  <tabstop>optionCheckBox_42</tabstop>
  </tabstops>
  <resources>
   <include location="companion.qrc"/>
@@ -800,32 +231,16 @@ May be different from firmware language</string>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>fwPreferencesDialog</receiver>
-   <slot>accept()</slot>
+   <receiver>FirmwarePreferencesDialog</receiver>
+   <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>370</x>
-     <y>49</y>
+     <x>345</x>
+     <y>133</y>
     </hint>
     <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>fwPreferencesDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>390</x>
-     <y>55</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
+     <x>207</x>
+     <y>76</y>
     </hint>
    </hints>
   </connection>
diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp
index 403a4b8e8..5e4cb6c54 100644
--- a/companion/src/generaledit.cpp
+++ b/companion/src/generaledit.cpp
@@ -83,7 +83,7 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
     switchDefPosEditLock=true;
     populateBacklightCB(ui->backlightswCB, g_eeGeneral.backlightMode);
     bool voice = current_firmware_variant.id.contains("voice");
-    if (!GetEepromInterface()->getCapability(MultiLangVoice)) {
+    if (!GetCurrentFirmware()->getCapability(MultiLangVoice)) {
       ui->VoiceLang_label->hide();
       ui->voiceLang_CB->hide();
     } else {
@@ -102,11 +102,11 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
       mavbaudEditLock=false;
     }
     
-    if (!GetEepromInterface()->getCapability(HasContrast)) {
+    if (!GetCurrentFirmware()->getCapability(HasContrast)) {
       ui->contrastSB->hide();
       ui->label_contrast->hide();
     }
-    if (!GetEepromInterface()->getCapability(HasSoundMixer)) {
+    if (!GetCurrentFirmware()->getCapability(HasSoundMixer)) {
       ui->beepVolume_SL->hide();
       ui->beepVolume_label->hide();
       ui->varioVolume_SL->hide();
@@ -131,28 +131,28 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
       ui->varioPMax_SB->setValue(700+(g_eeGeneral.varioPitch*10)+1000+(g_eeGeneral.varioRange*10));
       ui->varioR0_SB->setValue(500+(g_eeGeneral.varioRepeat*10));
     }
-    if (!GetEepromInterface()->getCapability(HasFAIMode)) {
+    if (!GetCurrentFirmware()->getCapability(HasFAIMode)) {
       ui->faimode_CB->hide();
       ui->label_faimode->hide();
     }
     else {
       ui->faimode_CB->setChecked(g_eeGeneral.fai);
     }
-    if (!GetEepromInterface()->getCapability( HasPxxCountry)) {
+    if (!GetCurrentFirmware()->getCapability( HasPxxCountry)) {
       ui->countrycode_label->hide();
       ui->countrycode_CB->hide();
       layout()->removeItem(ui->pxxCountry);
     } else {
       ui->countrycode_CB->setCurrentIndex(g_eeGeneral.countryCode);
     }
-    if (!GetEepromInterface()->getCapability( HasGeneralUnits)) {
+    if (!GetCurrentFirmware()->getCapability( HasGeneralUnits)) {
       ui->units_label->hide();
       ui->units_CB->hide();
     } else {
       ui->units_CB->setCurrentIndex(g_eeGeneral.imperial);
     }
     
-    if (!GetEepromInterface()->getCapability(TelemetryTimeshift)) {
+    if (!GetCurrentFirmware()->getCapability(TelemetryTimeshift)) {
       ui->label_timezone->hide();
       ui->timezoneSB->hide();
       ui->timezoneSB->setDisabled(true);
@@ -162,24 +162,24 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
     ui->gpsFormatCB->setCurrentIndex(g_eeGeneral.gpsFormat);
     ui->timezoneSB->setValue(g_eeGeneral.timezone);
     
-    if (!GetEepromInterface()->getCapability(OptrexDisplay)) {
+    if (!GetCurrentFirmware()->getCapability(OptrexDisplay)) {
       ui->label_displayType->hide();
       ui->displayTypeCB->setDisabled(true);
       ui->displayTypeCB->hide();
     }
-    if (!GetEepromInterface()->getCapability(HasVolume) && !voice) {
+    if (!GetCurrentFirmware()->getCapability(HasVolume) && !voice) {
       ui->volume_SB->hide();
       ui->volume_SB->setDisabled(true);
       ui->label_volume->hide();
     } else {
-      ui->volume_SB->setMaximum(GetEepromInterface()->getCapability(MaxVolume));
+      ui->volume_SB->setMaximum(GetCurrentFirmware()->getCapability(MaxVolume));
     }    
-    if (!GetEepromInterface()->getCapability(HasBrightness)) {
+    if (!GetCurrentFirmware()->getCapability(HasBrightness)) {
       ui->BLBright_SB->hide();
       ui->BLBright_SB->setDisabled(true);
       ui->label_BLBright->hide();
     }
-    if (!GetEepromInterface()->getCapability(HasCurrentCalibration)) {
+    if (!GetCurrentFirmware()->getCapability(HasCurrentCalibration)) {
       ui->CurrentCalib_SB->hide();
       ui->CurrentCalib_SB->setDisabled(true);
       ui->label_CurrentCalib->hide();
@@ -187,31 +187,31 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
     
     ui->tabWidget->setCurrentIndex(0);
 
-    if (!GetEepromInterface()->getCapability(SoundMod)) {
+    if (!GetCurrentFirmware()->getCapability(SoundMod)) {
       ui->soundModeCB->setDisabled(true);
       ui->label_soundMode->hide();
       ui->soundModeCB->hide();
     }
 
-    if (!GetEepromInterface()->getCapability(SoundPitch)) {
+    if (!GetCurrentFirmware()->getCapability(SoundPitch)) {
       ui->speakerPitchSB->setDisabled(true);
       ui->label_speakerPitch->hide();
       ui->speakerPitchSB->hide();
     }
     
-    if (!GetEepromInterface()->getCapability(Haptic)) {
+    if (!GetCurrentFirmware()->getCapability(Haptic)) {
       ui->hapticStrengthSB->setDisabled(true);
       ui->hapticStrengthSB->hide();
       ui->label_hapticStrengthSB->hide();
     } 
     
-    if (!GetEepromInterface()->getCapability(HapticMode)) {
+    if (!GetCurrentFirmware()->getCapability(HapticMode)) {
       ui->hapticmodeCB->setDisabled(true);
       ui->hapticmodeCB->hide();
       ui->label_hapticmode->hide();
     } 
 
-    int renumber=GetEepromInterface()->getCapability(RotaryEncoders);
+    int renumber=GetCurrentFirmware()->getCapability(RotaryEncoders);
     if (renumber==0) {
       ui->re_label->hide();
       ui->re_CB->hide();
@@ -247,7 +247,7 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
     ui->trnMode_4->setCurrentIndex(g_eeGeneral.trainer.mix[3].mode);
     ui->trnChn_4->setCurrentIndex(g_eeGeneral.trainer.mix[3].src);
     ui->trnWeight_4->setValue(g_eeGeneral.trainer.mix[3].weight);
-    int potsnum=GetEepromInterface()->getCapability(Pots);
+    int potsnum=GetCurrentFirmware()->getCapability(Pots);
     if (potsnum==3) {
       ui->label_pot4->hide();
       ui->ana8Neg->hide();
@@ -261,7 +261,7 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
       connect(tpmsld[i], SIGNAL(valueChanged(int)),this,SLOT(unlockSwitchEdited()));
     }
 
-    if (GetEepromInterface()->getCapability(MultiposPots)) {
+    if (GetCurrentFirmware()->getCapability(MultiposPots)) {
       ui->pot1Type->setCurrentIndex(g_eeGeneral.potsType[0]);
       ui->pot2Type->setCurrentIndex(g_eeGeneral.potsType[1]);
       ui->pot3Type->setCurrentIndex(g_eeGeneral.potsType[2]);
@@ -334,7 +334,7 @@ void GeneralEdit::setValues()
     ui->beeperCB->setCurrentIndex(g_eeGeneral.beeperMode+2);
     ui->channelorderCB->setCurrentIndex(g_eeGeneral.templateSetup);
     ui->stickmodeCB->setCurrentIndex(g_eeGeneral.stickMode);
-    if (!GetEepromInterface()->getCapability(HapticLength)) {
+    if (!GetCurrentFirmware()->getCapability(HapticLength)) {
       ui->label_HL->hide();
       ui->hapticLengthCB->hide();
     } else {
@@ -911,7 +911,7 @@ void GeneralEdit::on_calretrieve_PB_clicked()
 {
   int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
   QString calib=g.profile[profile_id].stickPotCalib();
-  int potsnum=GetEepromInterface()->getCapability(Pots);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots);
   if (calib.isEmpty()) {
     return;
   } else {
@@ -1021,7 +1021,7 @@ void GeneralEdit::on_calstore_PB_clicked()
   int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
 
   QString name=g.profile[profile_id].name();
-  int potsnum=GetEepromInterface()->getCapability(Pots);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots);
   if (name.isEmpty()) {
     ui->calstore_PB->setDisabled(true);
     return;
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 1d75b75e7..cc9dc5740 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -62,7 +62,7 @@ QString getInputStr(ModelData & model, int index)
 {
   QString result;
 
-  if (GetEepromInterface()->getCapability(VirtualInputs)) {
+  if (GetCurrentFirmware()->getCapability(VirtualInputs)) {
     result = model.inputNames[index];
     if (result.isEmpty()) {
       result = QObject::tr("Input%1").arg(index+1, 2, 10, QChar('0'));
@@ -126,7 +126,7 @@ QString getProtocolStr(const int proto)
 
 void populatePhasesCB(QComboBox *b, int value)
 {
-  for (int i=-GetEepromInterface()->getCapability(FlightPhases); i<=GetEepromInterface()->getCapability(FlightPhases); i++) {
+  for (int i=-GetCurrentFirmware()->getCapability(FlightPhases); i<=GetCurrentFirmware()->getCapability(FlightPhases); i++) {
     if (i < 0)
       b->addItem(QObject::tr("!Flight mode %1").arg(-i-1), i);
     else if (i > 0)
@@ -134,13 +134,13 @@ void populatePhasesCB(QComboBox *b, int value)
     else
       b->addItem(QObject::tr("----"), 0);
   }
-  b->setCurrentIndex(value + GetEepromInterface()->getCapability(FlightPhases));
+  b->setCurrentIndex(value + GetCurrentFirmware()->getCapability(FlightPhases));
 }
 
 bool gvarsEnabled()
 {
   int gvars=0;
-  if (GetEepromInterface()->getCapability(HasVariants)) {
+  if (GetCurrentFirmware()->getCapability(HasVariants)) {
     if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
       gvars=1;
     }
@@ -278,7 +278,7 @@ void CurveGroup::update()
         break;
       case CurveReference::CURVE_REF_CUSTOM:
       {
-        int numcurves = GetEepromInterface()->getCapability(NumCurves);
+        int numcurves = GetCurrentFirmware()->getCapability(NumCurves);
         if (lastType != curve.type) {
           lastType = curve.type;
           curveValueCB->clear();
@@ -330,7 +330,7 @@ void CurveGroup::valuesChanged()
         curve = CurveReference(CurveReference::CURVE_REF_FUNC, curveValueCB->currentIndex());
         break;
       case 3:
-        curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->currentIndex() - GetEepromInterface()->getCapability(NumCurves));
+        curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->currentIndex() - GetCurrentFirmware()->getCapability(NumCurves));
         break;
     }
 
@@ -341,7 +341,7 @@ void CurveGroup::valuesChanged()
 void populateGvarUseCB(QComboBox *b, unsigned int phase)
 {
   b->addItem(QObject::tr("Own value"));
-  for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+  for (int i=0; i<GetCurrentFirmware()->getCapability(FlightPhases); i++) {
     if (i != (int)phase) {
       b->addItem(QObject::tr("Flight mode %1 value").arg(i));
     }
@@ -376,7 +376,7 @@ void populateAndSwitchCB(QComboBox *b, const RawSwitch & value)
     b->addItem(item.toString(), item.toValue());
     if (item == value) b->setCurrentIndex(b->count()-1);
 
-    for (int i=1; i<=GetEepromInterface()->getCapability(SwitchesPositions); i++) {
+    for (int i=1; i<=GetCurrentFirmware()->getCapability(SwitchesPositions); i++) {
       item = RawSwitch(SWITCH_TYPE_SWITCH, i);
       b->addItem(item.toString(), item.toValue());
       if (item == value) b->setCurrentIndex(b->count()-1);
@@ -402,13 +402,13 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
-  for (int i=-GetEepromInterface()->getCapability(LogicalSwitches); i<0; i++) {
+  for (int i=-GetCurrentFirmware()->getCapability(LogicalSwitches); i<0; i++) {
     item = RawSwitch(SWITCH_TYPE_VIRTUAL, i);
     b->addItem(item.toString(), item.toValue());
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
-  for (int i=-GetEepromInterface()->getCapability(RotaryEncoders); i<0; i++) {
+  for (int i=-GetCurrentFirmware()->getCapability(RotaryEncoders); i<0; i++) {
     item = RawSwitch(SWITCH_TYPE_ROTARY_ENCODER, i);
     b->addItem(item.toString(), item.toValue());
     if (item == value) b->setCurrentIndex(b->count()-1);
@@ -420,17 +420,17 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
-  for (int i=GetEepromInterface()->getCapability(MultiposPots)-1; i>=0; i--) {
+  for (int i=GetCurrentFirmware()->getCapability(MultiposPots)-1; i>=0; i--) {
     if (generalSettings.potsType[i] == 2/* TODO constant*/) {
-      for (int j=-GetEepromInterface()->getCapability(MultiposPotsPositions); j<0; j++) {
-        item = RawSwitch(SWITCH_TYPE_MULTIPOS_POT, -i*GetEepromInterface()->getCapability(MultiposPotsPositions)+j);
+      for (int j=-GetCurrentFirmware()->getCapability(MultiposPotsPositions); j<0; j++) {
+        item = RawSwitch(SWITCH_TYPE_MULTIPOS_POT, -i*GetCurrentFirmware()->getCapability(MultiposPotsPositions)+j);
         b->addItem(item.toString(), item.toValue());
         if (item == value) b->setCurrentIndex(b->count()-1);
       }
     }
   }
 
-  for (int i=-GetEepromInterface()->getCapability(SwitchesPositions); i<0; i++) {
+  for (int i=-GetCurrentFirmware()->getCapability(SwitchesPositions); i<0; i++) {
     item = RawSwitch(SWITCH_TYPE_SWITCH, i);
     b->addItem(item.toString(), item.toValue());
     if (item == value) b->setCurrentIndex(b->count()-1);
@@ -449,16 +449,16 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
-  for (int i=1; i<=GetEepromInterface()->getCapability(SwitchesPositions); i++) {
+  for (int i=1; i<=GetCurrentFirmware()->getCapability(SwitchesPositions); i++) {
     item = RawSwitch(SWITCH_TYPE_SWITCH, i);
     b->addItem(item.toString(), item.toValue());
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
-  for (int i=0; i<GetEepromInterface()->getCapability(MultiposPots); i++) {
+  for (int i=0; i<GetCurrentFirmware()->getCapability(MultiposPots); i++) {
     if (generalSettings.potsType[i] == 2/* TODO constant*/) {
-      for (int j=1; j<=GetEepromInterface()->getCapability(MultiposPotsPositions); j++) {
-        item = RawSwitch(SWITCH_TYPE_MULTIPOS_POT, i*GetEepromInterface()->getCapability(MultiposPotsPositions)+j);
+      for (int j=1; j<=GetCurrentFirmware()->getCapability(MultiposPotsPositions); j++) {
+        item = RawSwitch(SWITCH_TYPE_MULTIPOS_POT, i*GetCurrentFirmware()->getCapability(MultiposPotsPositions)+j);
         b->addItem(item.toString(), item.toValue());
         if (item == value) b->setCurrentIndex(b->count()-1);
       }
@@ -471,13 +471,13 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
-  for (int i=1; i<=GetEepromInterface()->getCapability(RotaryEncoders); i++) {
+  for (int i=1; i<=GetCurrentFirmware()->getCapability(RotaryEncoders); i++) {
     item = RawSwitch(SWITCH_TYPE_ROTARY_ENCODER, i);
     b->addItem(item.toString(), item.toValue());
     if (item == value) b->setCurrentIndex(b->count()-1);
   }
 
-  for (int i=1; i<=GetEepromInterface()->getCapability(LogicalSwitches); i++) {
+  for (int i=1; i<=GetCurrentFirmware()->getCapability(LogicalSwitches); i++) {
     item = RawSwitch(SWITCH_TYPE_VIRTUAL, i);
     b->addItem(item.toString(), item.toValue());
     if (item == value) b->setCurrentIndex(b->count()-1);
@@ -499,7 +499,7 @@ void populateGVCB(QComboBox *b, int value)
 
   b->clear();
 
-  int pgvars = GetEepromInterface()->getCapability(Gvars);
+  int pgvars = GetCurrentFirmware()->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);
@@ -543,7 +543,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
   }
 
   if (flags & POPULATE_VIRTUAL_INPUTS) {
-    int virtualInputs = GetEepromInterface()->getCapability(VirtualInputs);
+    int virtualInputs = GetCurrentFirmware()->getCapability(VirtualInputs);
     for (int i=0; i<virtualInputs; i++) {
       item = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i, &model);
       b->addItem(item.toString(), item.toValue());
@@ -552,12 +552,12 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
   }
 
   if (flags & POPULATE_SOURCES) {
-    for (int i=0; i<4+GetEepromInterface()->getCapability(Pots); i++) {
+    for (int i=0; i<4+GetCurrentFirmware()->getCapability(Pots); i++) {
       item = RawSource(SOURCE_TYPE_STICK, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
     }
-    for (int i=0; i<GetEepromInterface()->getCapability(RotaryEncoders); i++) {
+    for (int i=0; i<GetCurrentFirmware()->getCapability(RotaryEncoders); i++) {
       item = RawSource(SOURCE_TYPE_ROTARY_ENCODER, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
@@ -579,13 +579,13 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
   }
   
   if (flags & POPULATE_SWITCHES) {
-    for (int i=0; i<GetEepromInterface()->getCapability(Switches); i++) {
+    for (int i=0; i<GetCurrentFirmware()->getCapability(Switches); i++) {
       item = RawSource(SOURCE_TYPE_SWITCH, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
     }
 
-    for (int i=0; i<GetEepromInterface()->getCapability(LogicalSwitches); i++) {
+    for (int i=0; i<GetCurrentFirmware()->getCapability(LogicalSwitches); i++) {
       item = RawSource(SOURCE_TYPE_CUSTOM_SWITCH, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
@@ -599,13 +599,13 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
       if (item == source) b->setCurrentIndex(b->count()-1);
     }
 
-    for (int i=0; i<GetEepromInterface()->getCapability(TrainerInputs); i++) {
+    for (int i=0; i<GetCurrentFirmware()->getCapability(TrainerInputs); i++) {
       item = RawSource(SOURCE_TYPE_PPM, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
     }
 
-    for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+    for (int i=0; i<GetCurrentFirmware()->getCapability(Outputs); i++) {
       item = RawSource(SOURCE_TYPE_CH, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
@@ -628,7 +628,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
   }
 
   if (flags & POPULATE_GVARS) {
-    for (int i=0; i<GetEepromInterface()->getCapability(Gvars); i++) {
+    for (int i=0; i<GetCurrentFirmware()->getCapability(Gvars); i++) {
       item = RawSource(SOURCE_TYPE_GVAR, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);
@@ -775,7 +775,7 @@ QString getFrSkyProtocol(int protocol)
 {
   switch(protocol) {
     case 2:
-      if ((GetEepromInterface()->getCapability(Telemetry) & TM_HASWSHH))
+      if ((GetCurrentFirmware()->getCapability(Telemetry) & TM_HASWSHH))
         return QObject::tr("Winged Shadow How High");
       else
         return QObject::tr("Winged Shadow How High (not supported)");
@@ -830,7 +830,7 @@ QString getProtocol(ModelData * g_model)
 
 QString getPhasesStr(unsigned int phases, ModelData & model)
 {
-  int numphases = GetEepromInterface()->getCapability(FlightPhases);
+  int numphases = GetCurrentFirmware()->getCapability(FlightPhases);
 
   if (numphases && phases) {
     QString str;
@@ -906,7 +906,7 @@ CompanionIcon::CompanionIcon(QString baseimage)
 
 void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
 {
-  SimulatorInterface * si = GetEepromInterface()->getSimulator();
+  SimulatorInterface * si = GetCurrentFirmware()->getSimulator();
   if (si) {
     delete si;
     RadioData * simuData = new RadioData(radioData);
@@ -918,14 +918,14 @@ void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
     if (radioData.generalSettings.stickMode & 1) {
       flags |= SIMULATOR_FLAGS_STICK_MODE_LEFT;
     }
-    BoardEnum board = GetEepromInterface()->getBoard();
+    BoardEnum board = GetCurrentFirmware()->getBoard();
     SimulatorDialog * sd;
     if (IS_TARANIS(board))
       sd = new SimulatorDialogTaranis(parent, flags);
     else
       sd = new SimulatorDialog9X(parent, flags);
     QByteArray eeprom(GetEepromInterface()->getEEpromSize(), 0);
-    GetEepromInterface()->save((uint8_t *)eeprom.data(), *simuData, GetEepromInterface()->getCapability(SimulatorVariant));
+    GetEepromInterface()->save((uint8_t *)eeprom.data(), *simuData, GetCurrentFirmware()->getCapability(SimulatorVariant));
     delete simuData;
     sd->start(eeprom);
     sd->exec();
@@ -958,27 +958,3 @@ QPixmap makePixMap( QImage image, QString firmwareType )
   }
   return(QPixmap::fromImage(image));
 }
-
-int getRadioType(QString firmwareType)
-{
-  if (firmwareType.contains( "taranis" )) return 6;
-  if (firmwareType.contains( "sky9x"   )) return 5;
-  if (firmwareType.contains( "gruvin9x")) return 4;
-  if (firmwareType.contains( "9xr128"  )) return 3;
-  if (firmwareType.contains( "9xr"     )) return 2;
-  if (firmwareType.contains( "9x128"   )) return 1;
-  return 0; // 9x
-}
-
-QString getDefaultFwType( int radioType )
-{
-  switch (radioType){
-    case 6:  return "opentx-taranis-en";
-    case 5:  return "opentx-sky9x-en";
-    case 4:  return "opentx-gruvin9x-en";
-    case 3:  return "opentx-9xr128-en";
-    case 2:  return "opentx-9xr-en";
-    case 1:  return "opentx-9x128-en";
-    default: return "opentx-9x-en"; 
-  }
-}
diff --git a/companion/src/helpers.h b/companion/src/helpers.h
index bc26267c6..ceb3a2e22 100644
--- a/companion/src/helpers.h
+++ b/companion/src/helpers.h
@@ -6,7 +6,7 @@
 
 extern const QColor colors[C9X_MAX_CURVES];
 
-#define TMR_NUM_OPTION  (TMR_VAROFS+2*9+2*GetEepromInterface()->getCapability(LogicalSwitches)-1)
+#define TMR_NUM_OPTION  (TMR_VAROFS+2*9+2*GetCurrentFirmware()->getCapability(LogicalSwitches)-1)
 
 //convert from mode 1 to mode generalSettings.stickMode
 //NOTICE!  =>  1..4 -> 1..4
@@ -128,10 +128,4 @@ void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx);
 // Format a pixmap to fit on the radio using a specific firmware
 QPixmap makePixMap( QImage image, QString firmwareType );
 
-// Return a radio type derived from a firmware type string 
-int getRadioType(QString firmwareType);
-
-// Return the default firmware string for a specified radio
-QString getDefaultFwType( int radioType );
-
 #endif // HELPERS_H
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index bdab7907c..76236c61c 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -198,7 +198,7 @@ void MainWindow::checkForUpdates(bool ignoreSettings, QString & fwId)
     check1done = true;
     check2done = true;
     fwToUpdate = fwId;
-    QString stamp = GetFirmware(fwToUpdate)->stamp;
+    QString stamp = GetFirmware(fwToUpdate)->getStampUrl();
 
     if (!stamp.isEmpty()) {
       if (g.autoCheckFw() || ignoreSettings) {
@@ -299,15 +299,15 @@ void MainWindow::updateDownloaded()
     }
 }
 
-void MainWindow::downloadLatestFW(FirmwareInfo * firmware, const QString & firmwareId)
+void MainWindow::downloadLatestFW(FirmwareVariant & firmware)
 {
     QString url, ext, cpuid;
-    url = firmware->getUrl(firmwareId);
+    url = firmware.getFirmwareUrl();
     cpuid=g.cpuId();
     ext = url.mid(url.lastIndexOf("."));
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.flashDir() + "/" + firmwareId + ext);
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.flashDir() + "/" + firmware.id + ext);
     if (!fileName.isEmpty()) {
-      downloadedFW = firmwareId;
+      downloadedFW = firmware.id;
       needRename=true;
       g.profile[g.id()].fwName( fileName );
       if (!cpuid.isEmpty()) {
@@ -468,7 +468,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
         layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());            
         if (OldFwRev == 0) {
           showcheckForUpdatesResult = false; // update is available - do not show dialog
-          QString rn = GetFirmware(fwToUpdate)->rnurl;
+          QString rn = GetFirmware(fwToUpdate)->getReleaseNotesUrl();
           QAbstractButton *rnButton = NULL;
           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));
@@ -495,9 +495,10 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
           } else {
             ignore = true;
           }
-        } else if (NewFwRev > OldFwRev) {
+        }
+        else if (NewFwRev > OldFwRev) {
           showcheckForUpdatesResult = false; // update is available - do not show dialog
-          QString rn = GetFirmware(fwToUpdate)->rnurl;
+          QString rn = GetFirmware(fwToUpdate)->getReleaseNotesUrl();
           QAbstractButton *rnButton;
           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));
@@ -536,7 +537,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
           }
         } else if (download == true) {
           if (warning>0) {
-            QString rn = GetFirmware(fwToUpdate)->rnurl;
+            QString rn = GetFirmware(fwToUpdate)->getReleaseNotesUrl();
             if (!rn.isEmpty()) {
               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) {
@@ -546,7 +547,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
             }
           }
           downloadedFW = fwToUpdate;
-          QString url = GetFirmware(fwToUpdate)->getUrl(fwToUpdate);
+          QString url = GetFirmwareVariant(fwToUpdate).getFirmwareUrl();
           QString ext = url.mid(url.lastIndexOf("."));
           needRename=false;
           bool addversion=g.profile[g.id()].renameFwFiles();
@@ -716,14 +717,14 @@ void MainWindow::loadProfile()  //TODO Load all variables - Also HW!
 
 void MainWindow::appPrefs()
 {
-    appPreferencesDialog *pd = new appPreferencesDialog(this);
+    AppPreferencesDialog *pd = new AppPreferencesDialog(this);
     pd->exec();
     updateMenus();
 }
 
 void MainWindow::fwPrefs()
 {
-    fwPreferencesDialog *pd = new fwPreferencesDialog(this);
+    FirmwarePreferencesDialog *pd = new FirmwarePreferencesDialog(this);
     pd->exec();
     foreach (QMdiSubWindow *window, mdiArea->subWindowList()) {
       MdiChild *mdiChild = qobject_cast<MdiChild *>(window->widget());
@@ -746,11 +747,12 @@ void MainWindow::changelog()
 
 void MainWindow::fwchangelog()
 {
-    FirmwareInfo *currfirm = GetCurrentFirmware();
-    QString rn=currfirm->rnurl;
+    FirmwareInterface *currfirm = GetCurrentFirmware();
+    QString rn=currfirm->getReleaseNotesUrl();
     if (rn.isEmpty()) {
       QMessageBox::information(this, tr("Firmware updates"), tr("Current firmware does not provide release notes informations."));
-    } else {
+    }
+    else {
       contributorsDialog *cd = new contributorsDialog(this,2, rn);
       cd->exec();
     }
@@ -1257,7 +1259,7 @@ bool MainWindow::isValidEEPROM(QString eepromfile)
 
 bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString flashFile)
 {
-    FirmwareInfo *firmware = GetCurrentFirmware();
+    FirmwareInterface *firmware = GetCurrentFirmware();
     FlashInterface flash(flashFile);
     if (!flash.isValid())
       return false;
@@ -1290,9 +1292,6 @@ bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString
           version = fwEEprom.toInt();
         }
       }
-      else {
-        version = ((Open9xFirmware *)firmware)->getEepromVersion(revision);
-      }
     }
 
     QFile file(backupFile);
@@ -1490,8 +1489,9 @@ void MainWindow::burnFuses()
 
 void MainWindow::compare()
 {
-    compareDialog *fd = new compareDialog(this);
-    fd->show();
+  CompareDialog *fd = new CompareDialog(this);
+  fd->show();
+  delete fd;
 }
 
 void MainWindow::logFile()
@@ -1546,17 +1546,17 @@ void MainWindow::updateMenus()
 
 MdiChild *MainWindow::createMdiChild()
 {
-    MdiChild *child = new MdiChild;
-    mdiArea->addSubWindow(child);
-    if(!child->parentWidget()->isMaximized() && !child->parentWidget()->isMinimized())
-      child->parentWidget()->resize(400, 400);
+  MdiChild *child = new MdiChild();
+  mdiArea->addSubWindow(child);
+  if(!child->parentWidget()->isMaximized() && !child->parentWidget()->isMinimized())
+    child->parentWidget()->resize(400, 400);
 
-    connect(child, SIGNAL(copyAvailable(bool)),cutAct, SLOT(setEnabled(bool)));
-    connect(child, SIGNAL(copyAvailable(bool)),copyAct, SLOT(setEnabled(bool)));
-    connect(child, SIGNAL(copyAvailable(bool)),simulateAct, SLOT(setEnabled(bool)));
-    connect(child, SIGNAL(copyAvailable(bool)),printAct, SLOT(setEnabled(bool)));
+  connect(child, SIGNAL(copyAvailable(bool)),cutAct, SLOT(setEnabled(bool)));
+  connect(child, SIGNAL(copyAvailable(bool)),copyAct, SLOT(setEnabled(bool)));
+  connect(child, SIGNAL(copyAvailable(bool)),simulateAct, SLOT(setEnabled(bool)));
+  connect(child, SIGNAL(copyAvailable(bool)),printAct, SLOT(setEnabled(bool)));
 
-    return child;
+  return child;
 }
 
 QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot, QObject *slotObj)
diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
index 824dc9096..c6c2d2003 100644
--- a/companion/src/mainwindow.h
+++ b/companion/src/mainwindow.h
@@ -63,24 +63,24 @@ QT_END_NAMESPACE
 
 class MainWindow : public QMainWindow
 {
-    friend class fwPreferencesDialog;
+    friend class FirmwarePreferencesDialog;
     friend class MdiChild; // TODO GetAvrdudeArgs could be external to this class
 
     Q_OBJECT
 
-public:
+  public:
     MainWindow();
 
-protected:
+  protected:
     void closeEvent(QCloseEvent *event);
     void dragEnterEvent(QDragEnterEvent *event);
     void dropEvent(QDropEvent *event);
 
 
-public slots:
-    void downloadLatestFW(FirmwareInfo *firmware, const QString & firmwareId);
+  public slots:
+    void downloadLatestFW(FirmwareVariant & firmware);
     
-private slots:
+  private slots:
     void openDocURL();
 
     void setLanguage(QString langString);
@@ -157,7 +157,7 @@ private slots:
     QMenu * createProfilesMenu();
     void autoClose();
   
-private:
+  private:
     void createActions();
     QAction * addAct(QString, QString, QString, QKeySequence::StandardKey, const char *, QObject *slotObj=NULL);
     QAction * addAct(QActionGroup *, QString, QString, const char *);
diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
index df47f3e10..cd21dd2f0 100644
--- a/companion/src/mdichild.cpp
+++ b/companion/src/mdichild.cpp
@@ -66,6 +66,7 @@
 MdiChild::MdiChild():
   QWidget(),
   ui(new Ui::mdiChild),
+  firmware(GetCurrentFirmware()),
   isUntitled(true),
   fileChanged(false)
 {
@@ -103,7 +104,7 @@ void MdiChild::qSleep(int ms)
 void MdiChild::eepromInterfaceChanged()
 {
   ui->modelsList->refreshList();
-  ui->SimulateTxButton->setEnabled(GetEepromInterface()->getCapability(Simulation));
+  ui->SimulateTxButton->setEnabled(GetCurrentFirmware()/*firmware*/->getCapability(Simulation));
   updateTitle();
 }
 
@@ -181,7 +182,7 @@ void MdiChild::modelEdit()
     QApplication::setOverrideCursor(Qt::WaitCursor);
     checkAndInitModel( row );
     ModelData &model = radioData.models[row - 1];
-    ModelEdit *t = new ModelEdit(radioData, (row - 1), false, this);
+    ModelEdit *t = new ModelEdit(this, radioData, (row - 1), GetCurrentFirmware()/*firmware*/);
     t->setWindowTitle(tr("Editing model %1: ").arg(row) + model.name);
     connect(t, SIGNAL(modified()), this, SLOT(setModified()));
     t->show();
@@ -663,15 +664,18 @@ void MdiChild::simulate()
 
 void MdiChild::print(int model, QString filename)
 {
+  PrintDialog * pd = NULL;
+
   if (model>=0 && !filename.isEmpty()) {
-    
-    printDialog *pd = new printDialog(this, &radioData.generalSettings, &radioData.models[model], filename);
-    pd->show();    
+    pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, &radioData.generalSettings, &radioData.models[model], filename);
   }
-  else {
-    if(ui->modelsList->currentRow()<1) return;
-    printDialog *pd = new printDialog(this, &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]);
+  else if (ui->modelsList->currentRow() > 0) {
+    pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]);
+  }
+
+  if (pd) {
     pd->show();
+    delete pd;
   }
 }
 
diff --git a/companion/src/mdichild.h b/companion/src/mdichild.h
index fab250127..4f6887108 100644
--- a/companion/src/mdichild.h
+++ b/companion/src/mdichild.h
@@ -59,7 +59,7 @@ class MdiChild : public QWidget
 
     Q_OBJECT
 
-public:
+  public:
     MdiChild();
     ~MdiChild();
 
@@ -78,18 +78,18 @@ public:
     void eepromInterfaceChanged();
     void setEEpromAvail(int eavail);
 
-signals:
+  signals:
     void copyAvailable(bool val);
 
-protected:
+  protected:
     void closeEvent(QCloseEvent *event);
 
-private slots:
+  private slots:
     void documentWasModified();
     void on_SimulateTxButton_clicked();
     void qSleep(int ms);
 
-public slots:
+  public slots:
     void checkAndInitModel(int row);
     void generalEdit();
     void modelEdit();
@@ -105,7 +105,7 @@ public slots:
     void setModified();
     void updateTitle();
 
-private:
+  private:
     bool maybeSave();
     void setCurrentFile(const QString &fileName);
     QString strippedName(const QString &fullFileName);
@@ -115,6 +115,8 @@ private:
     Ui::mdiChild *ui;
 
     QString curFile;
+
+    FirmwareInterface * firmware;
     RadioData radioData;
 
     bool isUntitled;
diff --git a/companion/src/modeledit/channels.cpp b/companion/src/modeledit/channels.cpp
index e82c736d6..80b47cc34 100644
--- a/companion/src/modeledit/channels.cpp
+++ b/companion/src/modeledit/channels.cpp
@@ -6,14 +6,14 @@
 #include <QCheckBox>
 #include <QDoubleSpinBox>
 
-Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings)
+Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware)
 {
   QGridLayout * gridLayout = new QGridLayout(this);
   bool minimize = false;
 
   int col = 1;
-  if (GetEepromInterface()->getCapability(ChannelsName))
+  if (firmware->getCapability(ChannelsName))
   {
     minimize=true;
     addLabel(gridLayout, tr("Name"), col++);
@@ -24,12 +24,12 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
   addLabel(gridLayout, tr("Direction"), col++, minimize);
   if (IS_TARANIS(GetEepromInterface()->getBoard()))
     addLabel(gridLayout, tr("Curve"), col++, minimize);
-  if (GetEepromInterface()->getCapability(PPMCenter))
+  if (firmware->getCapability(PPMCenter))
     addLabel(gridLayout, tr("PPM Center"), col++, minimize);
-  if (GetEepromInterface()->getCapability(SYMLimits))
+  if (firmware->getCapability(SYMLimits))
     addLabel(gridLayout, tr("Linear Subtrim"), col++, true);
 
-  for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+  for (int i=0; i<firmware->getCapability(Outputs); i++) {
     col = 0;
 
     // Channel label
@@ -39,7 +39,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
     gridLayout->addWidget(label, i+1, col++, 1, 1);
 
     // Channel name
-    int nameLen = GetEepromInterface()->getCapability(ChannelsName);
+    int nameLen = firmware->getCapability(ChannelsName);
     if (nameLen > 0) {
       QLineEdit * name = new QLineEdit(this);
       name->setProperty("index", i);
@@ -103,7 +103,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
     if (IS_TARANIS(GetEepromInterface()->getBoard())) {
       QComboBox * curveCB = new QComboBox(this);
       curveCB->setProperty("index", i);
-      int numcurves = GetEepromInterface()->getCapability(NumCurves);
+      int numcurves = firmware->getCapability(NumCurves);
       for (int j=-numcurves; j<=numcurves; j++) {
         curveCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, j).toString(), j);
       }
@@ -113,7 +113,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
     }
 
     // PPM center
-    if (GetEepromInterface()->getCapability(PPMCenter)) {
+    if (firmware->getCapability(PPMCenter)) {
       QSpinBox * center = new QSpinBox(this);
       center->setProperty("index", i);
       center->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
@@ -126,7 +126,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
     }
 
     // Symetrical limits
-    if (GetEepromInterface()->getCapability(SYMLimits)) {
+    if (firmware->getCapability(SYMLimits)) {
       QCheckBox * symlimits = new QCheckBox(this);
       symlimits->setProperty("index", i);
       symlimits->setChecked(model.limitData[i].symetrical);
@@ -135,7 +135,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
     }
   }
   // Push the rows up
-  addVSpring(gridLayout, 0,GetEepromInterface()->getCapability(Outputs)+1);
+  addVSpring(gridLayout, 0,firmware->getCapability(Outputs)+1);
 }
 
 Channels::~Channels()
@@ -188,7 +188,7 @@ void Channels::maxEdited()
 
 void Channels::refreshExtendedLimits()
 {
-  for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+  for (int i=0; i<firmware->getCapability(Outputs); i++) {
     QDoubleSpinBox * minDSB = minSpins[i];
     QDoubleSpinBox * maxDSB = maxSpins[i];
     
diff --git a/companion/src/modeledit/channels.h b/companion/src/modeledit/channels.h
index bbad6081a..202f4a03d 100644
--- a/companion/src/modeledit/channels.h
+++ b/companion/src/modeledit/channels.h
@@ -9,7 +9,7 @@ class Channels : public ModelPanel
     Q_OBJECT
 
   public:
-    Channels(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    Channels(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     ~Channels();
     
   private:
diff --git a/companion/src/modeledit/curves.cpp b/companion/src/modeledit/curves.cpp
index 5a9183530..0e5f903e7 100644
--- a/companion/src/modeledit/curves.cpp
+++ b/companion/src/modeledit/curves.cpp
@@ -92,8 +92,8 @@ float curveSymmetricalX(float x, float coeff, float yMin, float yMid, float yMax
   return y;
 }
 
-Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   ui(new Ui::Curves),
   currentCurve(0)
 {
@@ -101,7 +101,7 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
 
   lock = true;
 
-  if (!GetEepromInterface()->getCapability(HasCvNames)) {
+  if (!firmware->getCapability(HasCvNames)) {
     ui->curveName->hide();
     ui->curveNameLabel->hide();
   }
@@ -110,7 +110,7 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
   scene->setItemIndexMethod(QGraphicsScene::NoIndex);
   ui->curvePreview->setScene(scene);
 
-  for (int i=0; i<GetEepromInterface()->getCapability(NumCurves); i++) {
+  for (int i=0; i<firmware->getCapability(NumCurves); i++) {
     visibleCurves[i] = false;
 
     // The reset curve button
@@ -164,7 +164,7 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
     ui->pointsLayout->addWidget(spnx[i], i, 1, 1, 1);
 
     bool insert;
-    if (GetEepromInterface()->getCapability(EnhancedCurves)) {
+    if (firmware->getCapability(EnhancedCurves)) {
       insert = (i >= 1);
     }
     else {
@@ -220,7 +220,7 @@ void Curves::update()
 {
   lock = true;
 
-  if (GetEepromInterface()->getCapability(HasCvNames)) {
+  if (firmware->getCapability(HasCvNames)) {
     ui->curveName->setText(model.curves[currentCurve].name);
   }
 
@@ -242,7 +242,7 @@ void Curves::updateCurveType()
 
   int index = 0;
 
-  if (GetEepromInterface()->getCapability(EnhancedCurves)) {
+  if (firmware->getCapability(EnhancedCurves)) {
     index = model.curves[currentCurve].count - 2;
   }
   else {
@@ -288,7 +288,7 @@ void Curves::updateCurve()
   pen.setWidth(1);
   pen.setStyle(Qt::SolidLine);
 
-  int numcurves = GetEepromInterface()->getCapability(NumCurves);
+  int numcurves = firmware->getCapability(NumCurves);
   for (int k=0; k<numcurves; k++) {
     pen.setColor(colors[k]);
     if (currentCurve!=k && visibleCurves[k]) {
@@ -406,7 +406,7 @@ void Curves::onNodeUnfocus()
 
 bool Curves::allowCurveType(int points, CurveData::CurveType type)
 {
-  int numcurves = GetEepromInterface()->getCapability(NumCurves);
+  int numcurves = firmware->getCapability(NumCurves);
 
   int totalpoints = 0;
   for (int i=0; i<numcurves; i++) {
@@ -415,7 +415,7 @@ bool Curves::allowCurveType(int points, CurveData::CurveType type)
     totalpoints += cvPoints + (cvType==CurveData::CURVE_TYPE_CUSTOM ? cvPoints-2 : 0);
   }
 
-  int fwpoints = GetEepromInterface()->getCapability(NumCurvePoints);
+  int fwpoints = firmware->getCapability(NumCurvePoints);
   if (totalpoints > fwpoints) {
     QMessageBox::warning(this, "companion", tr("Not enough free points in EEPROM to store the curve."));
     return false;
diff --git a/companion/src/modeledit/curves.h b/companion/src/modeledit/curves.h
index 9cabed576..57a39504a 100644
--- a/companion/src/modeledit/curves.h
+++ b/companion/src/modeledit/curves.h
@@ -21,7 +21,7 @@ class Curves : public ModelPanel
     Q_OBJECT
 
   public:
-    Curves(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    Curves(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~Curves();
 
     virtual void update();
diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp
index b625f383d..51de7cc69 100644
--- a/companion/src/modeledit/customfunctions.cpp
+++ b/companion/src/modeledit/customfunctions.cpp
@@ -47,8 +47,8 @@ void RepeatComboBox::update()
   setCurrentIndex(value);
 }
 
-CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   initialized(false)
 #if defined(PHONON)
   ,
@@ -66,9 +66,9 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
   addEmptyLabel(gridLayout, 5 );
 
   lock = true;
-  int num_fsw = GetEepromInterface()->getCapability(CustomFunctions);
+  int num_fsw = firmware->getCapability(CustomFunctions);
 
-  if (!GetEepromInterface()->getCapability(VoicesAsNumbers)) {
+  if (!firmware->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;
@@ -87,7 +87,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
       lang="en";
     path.append(lang);
     QDir qd(path);
-    int vml= GetEepromInterface()->getCapability(VoicesMaxLength)+4;
+    int vml= firmware->getCapability(VoicesMaxLength)+4;
     if (qd.exists()) {
       QStringList filters;
       filters << "*.wav" << "*.WAV";
@@ -227,7 +227,7 @@ void CustomFunctionsPanel::playMusic()
   QDir qd(path);
   QString track;
   if (qd.exists()) {
-    if (GetEepromInterface()->getCapability(VoicesAsNumbers)) {
+    if (firmware->getCapability(VoicesAsNumbers)) {
       track = path + QString("/%1.wav").arg(int(fswtchParam[index]->value()), 4, 10, (const QChar)'0');
     }
     else {
@@ -360,7 +360,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
       widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_ENABLE;
     }
     else if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) {
-      if (index != FuncBackgroundMusic && GetEepromInterface()->getCapability(HasFuncRepeat)) {
+      if (index != FuncBackgroundMusic && firmware->getCapability(HasFuncRepeat)) {
         widgetsMask |= CUSTOM_FUNCTION_REPEAT;
         fswtchRepeat[i]->update();
       }
@@ -370,7 +370,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
         widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_REPEAT;
       }
       else if (index==FuncPlayPrompt || index==FuncPlayBoth) {
-        if (GetEepromInterface()->getCapability(VoicesAsNumbers)) {
+        if (firmware->getCapability(VoicesAsNumbers)) {
           fswtchParam[i]->setDecimals(0);
           fswtchParam[i]->setSingleStep(1);
           fswtchParam[i]->setMinimum(0);
@@ -407,7 +407,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
           widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
           if (modified) {
             memset(model.funcSw[i].paramarm, 0, sizeof(model.funcSw[i].paramarm));
-            int vml = GetEepromInterface()->getCapability(VoicesMaxLength);
+            int vml = firmware->getCapability(VoicesMaxLength);
             if (fswtchParamArmT[i]->currentText() != "----") {
               widgetsMask |= CUSTOM_FUNCTION_PLAY;
               for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(), vml); j++) {
@@ -427,7 +427,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
         widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
         if (modified) {
           memset(model.funcSw[i].paramarm, 0, sizeof(model.funcSw[i].paramarm));
-          int vml=GetEepromInterface()->getCapability(VoicesMaxLength);
+          int vml=firmware->getCapability(VoicesMaxLength);
           if (fswtchParamArmT[i]->currentText() != "----") {
             widgetsMask |= CUSTOM_FUNCTION_PLAY;
             for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(),vml); j++) {
@@ -476,7 +476,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
 void CustomFunctionsPanel::update()
 {
   lock = true;
-  for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
+  for (int i=0; i<firmware->getCapability(CustomFunctions); i++) {
     if (!initialized) {
       populateSwitchCB(fswtchSwtch[i], model.funcSw[i].swtch, generalSettings, POPULATE_ONOFF);
       populateFuncCB(fswtchFunc[i], model.funcSw[i].func);
@@ -562,24 +562,24 @@ void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
   b->clear();
   for (unsigned int i=0; i<FuncCount; i++) {
     b->addItem(FuncSwData(AssignFunc(i)).funcToString());
-    if (!GetEepromInterface()->getCapability(HasVolume)) {
+    if (!firmware->getCapability(HasVolume)) {
       if (i==FuncVolume || i==FuncBackgroundMusic || i==FuncBackgroundMusicPause) {
         QModelIndex index = b->model()->index(i, 0);
         QVariant v(0);
         b->model()->setData(index, v, Qt::UserRole - 1);
       }
     }
-    if ((i==FuncPlayHaptic) && !GetEepromInterface()->getCapability(Haptic)) {
+    if ((i==FuncPlayHaptic) && !firmware->getCapability(Haptic)) {
       QModelIndex index = b->model()->index(i, 0);
       QVariant v(0);
       b->model()->setData(index, v, Qt::UserRole - 1);
     }
-    if ((i==FuncPlayBoth) && !GetEepromInterface()->getCapability(HasBeeper)) {
+    if ((i==FuncPlayBoth) && !firmware->getCapability(HasBeeper)) {
       QModelIndex index = b->model()->index(i, 0);
       QVariant v(0);
       b->model()->setData(index, v, Qt::UserRole - 1);
     }
-    if ((i==FuncLogs) && !GetEepromInterface()->getCapability(HasSDLogs)) {
+    if ((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) {
       QModelIndex index = b->model()->index(i, 0);
       QVariant v(0);
       b->model()->setData(index, v, Qt::UserRole - 1);
@@ -640,7 +640,7 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, const ModelData & m
     qs.append( QObject::tr("Timer2"));
     qs.append( QObject::tr("All"));
     qs.append( QObject::tr("Telemetry"));
-    int reCount = GetEepromInterface()->getCapability(RotaryEncoders);
+    int reCount = firmware->getCapability(RotaryEncoders);
     if (reCount == 1) {
       qs.append( QObject::tr("Rotary Encoder"));
     }
diff --git a/companion/src/modeledit/customfunctions.h b/companion/src/modeledit/customfunctions.h
index b9b60f17d..fecab42a3 100644
--- a/companion/src/modeledit/customfunctions.h
+++ b/companion/src/modeledit/customfunctions.h
@@ -36,7 +36,7 @@ class CustomFunctionsPanel : public ModelPanel
     Q_OBJECT
 
   public:
-    CustomFunctionsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    CustomFunctionsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     ~CustomFunctionsPanel();
 
     virtual void update();
diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp
index ba54c7997..c1a5941dd 100644
--- a/companion/src/modeledit/expodialog.cpp
+++ b/companion/src/modeledit/expodialog.cpp
@@ -2,11 +2,12 @@
 #include "ui_expodialog.h"
 #include "helpers.h"
 
-ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, GeneralSettings & generalSettings, char * inputName) :
+ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, GeneralSettings & generalSettings, FirmwareInterface * firmware, char * inputName) :
   QDialog(parent),
   ui(new Ui::ExpoDialog),
   model(model),
   generalSettings(generalSettings),
+  firmware(firmware),
   ed(expoData),
   inputName(inputName)
 {
@@ -28,7 +29,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
 
   ui->sideCB->setCurrentIndex(ed->mode-1);
 
-  if (!GetEepromInterface()->getCapability(FlightPhases)) {
+  if (!firmware->getCapability(FlightPhases)) {
     ui->label_phases->hide();
     for (int i=0; i<9; i++) {
       lb_fp[i]->hide();
@@ -43,13 +44,13 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
       }
       mask <<= 1;
     }
-    for (int i=GetEepromInterface()->getCapability(FlightPhases); i<9;i++) {
+    for (int i=firmware->getCapability(FlightPhases); i<9;i++) {
       lb_fp[i]->hide();
       cb_fp[i]->hide();
     }
   }
 
-  if (GetEepromInterface()->getCapability(VirtualInputs)) {
+  if (firmware->getCapability(VirtualInputs)) {
     ui->inputName->setMaxLength(4);
     populateSourceCB(ui->sourceCB, ed->srcRaw, model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS | POPULATE_TELEMETRY);
     ui->sourceCB->removeItem(0);
@@ -69,7 +70,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
   ui->trimCB->addItem(tr("Ail"), 4);
   ui->trimCB->setCurrentIndex(1 - ed->carryTrim);
 
-  int expolength = GetEepromInterface()->getCapability(HasExpoNames);
+  int expolength = firmware->getCapability(HasExpoNames);
   if (!expolength) {
     ui->lineNameLabel->hide();
     ui->lineName->hide();
@@ -96,7 +97,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
   for (int i=0; i<9; i++) {
     connect(cb_fp[i], SIGNAL(toggled(bool)), this, SLOT(valuesChanged()));
   }
-  if (GetEepromInterface()->getCapability(VirtualInputs))
+  if (firmware->getCapability(VirtualInputs))
     connect(ui->inputName, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
 
   QTimer::singleShot(0, this, SLOT(shrink()));
@@ -111,7 +112,7 @@ ExpoDialog::~ExpoDialog()
 
 void ExpoDialog::updateScale()
 {
-  if (GetEepromInterface()->getCapability(VirtualInputs) && ed->srcRaw.type == SOURCE_TYPE_TELEMETRY) {
+  if (firmware->getCapability(VirtualInputs) && ed->srcRaw.type == SOURCE_TYPE_TELEMETRY) {
     RawSourceRange range = ed->srcRaw.getRange();
     ui->scaleLabel->show();
     ui->scale->show();
@@ -153,11 +154,11 @@ void ExpoDialog::valuesChanged()
       ed->phases<<=1;
     }
     ed->phases>>=1;
-    if (GetEepromInterface()->getCapability(FlightPhases)) {
+    if (firmware->getCapability(FlightPhases)) {
       int zeros=0;
       int ones=0;
       int phtemp=ed->phases;
-      for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+      for (int i=0; i<firmware->getCapability(FlightPhases); i++) {
         if (phtemp & 1) {
           ones++;
         }
@@ -168,7 +169,7 @@ void ExpoDialog::valuesChanged()
       }
       if (zeros==1) {
         phtemp=ed->phases;
-        for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+        for (int i=0; i<firmware->getCapability(FlightPhases); i++) {
           if ((phtemp & 1)==0) {
             break;
           }
@@ -177,7 +178,7 @@ void ExpoDialog::valuesChanged()
       }
       else if (ones==1) {
         phtemp=ed->phases;
-        for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+        for (int i=0; i<firmware->getCapability(FlightPhases); i++) {
           if (phtemp & 1) {
             break;
           }
diff --git a/companion/src/modeledit/expodialog.h b/companion/src/modeledit/expodialog.h
index c052afe00..eac2edc52 100644
--- a/companion/src/modeledit/expodialog.h
+++ b/companion/src/modeledit/expodialog.h
@@ -14,7 +14,7 @@ namespace Ui {
 class ExpoDialog : public QDialog {
     Q_OBJECT
   public:
-    ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expodata, GeneralSettings & generalSettings, char * inputName);
+    ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expodata, GeneralSettings & generalSettings, FirmwareInterface * firmware, char * inputName);
     ~ExpoDialog();
 
   protected:
@@ -28,6 +28,7 @@ class ExpoDialog : public QDialog {
     Ui::ExpoDialog * ui;
     ModelData & model;
     GeneralSettings & generalSettings;
+    FirmwareInterface * firmware;
     ExpoData * ed;
     char * inputName;
     GVarGroup * gvGroup;
diff --git a/companion/src/modeledit/flightmodes.cpp b/companion/src/modeledit/flightmodes.cpp
index 911dec37a..fa437a6bd 100644
--- a/companion/src/modeledit/flightmodes.cpp
+++ b/companion/src/modeledit/flightmodes.cpp
@@ -5,24 +5,24 @@
 #include <QComboBox>
 #include <QGridLayout>
 
-FlightMode::FlightMode(QWidget * parent, ModelData & model, int phaseIdx, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+FlightMode::FlightMode(QWidget * parent, ModelData & model, int phaseIdx, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   ui(new Ui::FlightMode),
   phaseIdx(phaseIdx),
   phase(model.phaseData[phaseIdx]),
-  reCount(GetEepromInterface()->getCapability(RotaryEncoders)),
-  gvCount(((!GetEepromInterface()->getCapability(HasVariants)) || (GetCurrentFirmwareVariant() & GVARS_VARIANT)) ?
-      GetEepromInterface()->getCapability(Gvars) : 0)
+  reCount(firmware->getCapability(RotaryEncoders)),
+  gvCount(((!firmware->getCapability(HasVariants)) || (GetCurrentFirmwareVariant() & GVARS_VARIANT)) ?
+      firmware->getCapability(Gvars) : 0)
 {
   ui->setupUi(this);
 
-  int modesCount = GetEepromInterface()->getCapability(FlightPhases);
+  int modesCount = firmware->getCapability(FlightPhases);
 
   // Phase name
   QRegExp rx(CHAR_FOR_NAMES_REGEX);
   if (modesCount) {
     ui->name->setValidator(new QRegExpValidator(rx, this));
-    ui->name->setMaxLength(GetEepromInterface()->getCapability(FlightModesName));
+    ui->name->setMaxLength(firmware->getCapability(FlightModesName));
     connect(ui->name, SIGNAL(editingFinished()), this, SLOT(phaseName_editingFinished()));
   }
   else {
@@ -39,9 +39,9 @@ FlightMode::FlightMode(QWidget * parent, ModelData & model, int phaseIdx, Genera
   }
 
   // FadeIn / FadeOut
-  if (GetEepromInterface()->getCapability(FlightPhasesHaveFades)) {
-    int scale = GetEepromInterface()->getCapability(SlowScale);
-    int range = GetEepromInterface()->getCapability(SlowRange);
+  if (firmware->getCapability(FlightPhasesHaveFades)) {
+    int scale = firmware->getCapability(SlowScale);
+    int range = firmware->getCapability(SlowRange);
     ui->fadeIn->setMaximum(float(range)/scale);
     ui->fadeIn->setSingleStep(1.0/scale);
     ui->fadeIn->setDecimals((scale==1 ? 0 :1) );
@@ -130,7 +130,7 @@ FlightMode::FlightMode(QWidget * parent, ModelData & model, int phaseIdx, Genera
       label->setText(tr("GVAR%1").arg(i+1));
       gvLayout->addWidget(label, i, col++, 1, 1);
       // GVar name
-      int nameLen = GetEepromInterface()->getCapability(GvarsName);
+      int nameLen = firmware->getCapability(GvarsName);
       if (nameLen > 0) {
         gvNames[i] = new QLineEdit(ui->gvGB);
         gvNames[i]->setProperty("index", i);
@@ -183,12 +183,12 @@ void FlightMode::update()
 {
   ui->name->setText(phase.name);
 
-  int scale = GetEepromInterface()->getCapability(SlowScale);
+  int scale = firmware->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);
+    int trimsMax = firmware->getCapability(ExtendedTrims);
     if (trimsMax == 0 || !model.extendedTrims) {
       trimsMax = 125;
     }
@@ -249,7 +249,7 @@ void FlightMode::phaseSwitch_currentIndexChanged(int index)
 void FlightMode::phaseFadeIn_editingFinished()
 {
     QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
-    int scale = GetEepromInterface()->getCapability(SlowScale);
+    int scale = firmware->getCapability(SlowScale);
     phase.fadeIn = round(spinBox->value()*scale);
     emit modified();
 }
@@ -257,7 +257,7 @@ void FlightMode::phaseFadeIn_editingFinished()
 void FlightMode::phaseFadeOut_editingFinished()
 {
     QDoubleSpinBox *spinBox = qobject_cast<QDoubleSpinBox*>(sender());
-    int scale = GetEepromInterface()->getCapability(SlowScale);
+    int scale = firmware->getCapability(SlowScale);
     phase.fadeOut = round(spinBox->value()*scale);
     emit modified();
 }
@@ -418,14 +418,14 @@ void FlightMode::phaseTrimSlider_valueChanged()
 
 /**********************************************************/
 
-FlightModes::FlightModes(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
-  modesCount(GetEepromInterface()->getCapability(FlightPhases))
+FlightModes::FlightModes(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
+  modesCount(firmware->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);
+    FlightMode *tab = new FlightMode(tabWidget, model, i, generalSettings, firmware);
     tab->setProperty("index", i);
     panels << tab;
     connect(tab, SIGNAL(modified()), this, SLOT(onPhaseModified()));
@@ -449,7 +449,7 @@ 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) {
+  if (firmware->getCapability(FlightModesName) && strlen(name) > 0) {
     result += tr(" (%1)").arg(name);
   }
   else if (index == 0) {
diff --git a/companion/src/modeledit/flightmodes.h b/companion/src/modeledit/flightmodes.h
index 983cf56af..618040f4b 100644
--- a/companion/src/modeledit/flightmodes.h
+++ b/companion/src/modeledit/flightmodes.h
@@ -18,7 +18,7 @@ class FlightMode : public ModelPanel
     Q_OBJECT
 
   public:
-    FlightMode(QWidget *parent, ModelData &model, int modeIdx, GeneralSettings & generalSettings);
+    FlightMode(QWidget *parent, ModelData &model, int modeIdx, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~FlightMode();
 
     virtual void update();
@@ -66,7 +66,7 @@ class FlightModes : public ModelPanel
     Q_OBJECT
 
   public:
-    FlightModes(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    FlightModes(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~FlightModes();
 
     virtual void update();
diff --git a/companion/src/modeledit/heli.cpp b/companion/src/modeledit/heli.cpp
index 05a39e28b..3b56e19fb 100644
--- a/companion/src/modeledit/heli.cpp
+++ b/companion/src/modeledit/heli.cpp
@@ -2,8 +2,8 @@
 #include "ui_heli.h"
 #include "helpers.h"
 
-HeliPanel::HeliPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+HeliPanel::HeliPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   ui(new Ui::Heli)
 {
   ui->setupUi(this);
diff --git a/companion/src/modeledit/heli.h b/companion/src/modeledit/heli.h
index 52a855797..c04551b0f 100644
--- a/companion/src/modeledit/heli.h
+++ b/companion/src/modeledit/heli.h
@@ -12,7 +12,7 @@ class HeliPanel : public ModelPanel
     Q_OBJECT
 
   public:
-    HeliPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    HeliPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     ~HeliPanel();
     void update();
 
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index e6f966b35..a3cece6c1 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -3,8 +3,8 @@
 #include "expodialog.h"
 #include "helpers.h"
 
-InputsPanel::InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+InputsPanel::InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   expoInserted(false)
 {
   QGridLayout * exposLayout = new QGridLayout(this);
@@ -47,7 +47,7 @@ void InputsPanel::update()
 {
   lock = true;
 
-  int inputsCount = GetEepromInterface()->getCapability(VirtualInputs);
+  int inputsCount = firmware->getCapability(VirtualInputs);
   if (inputsCount == 0)
     inputsCount = NUM_STICKS;
 
@@ -75,20 +75,20 @@ void InputsPanel::update()
     }
 
     if (curDest!=(int)md->chn) {
-      if (GetEepromInterface()->getCapability(VirtualInputs))
+      if (firmware->getCapability(VirtualInputs))
         str = QString("%1").arg(getInputStr(model, md->chn), -8, ' ');
       else
         str = getInputStr(model, md->chn);
       curDest = md->chn;
     }
     else {
-      if (GetEepromInterface()->getCapability(VirtualInputs))
+      if (firmware->getCapability(VirtualInputs))
         str = "        ";
       else
         str = "   ";
     }
 
-    if (GetEepromInterface()->getCapability(VirtualInputs)) {
+    if (firmware->getCapability(VirtualInputs)) {
       str += " " + tr("Source(%1)").arg(md->srcRaw.toString());
       if (md->carryTrim>0) {
         str += " " + tr("No Trim");
@@ -113,7 +113,7 @@ void InputsPanel::update()
 
     if (md->swtch.type != SWITCH_TYPE_NONE) str += " " + tr("Switch(%1)").arg(md->swtch.toString());
 
-    if (GetEepromInterface()->getCapability(HasExpoNames)) {
+    if (firmware->getCapability(HasExpoNames)) {
       QString expoName = md->name;
       if (!expoName.isEmpty()) str += QString(" [%1]").arg(expoName);
     }
@@ -171,13 +171,13 @@ void InputsPanel::gm_openExpo(int index)
     emit modified();
     update();
     
-    if (GetEepromInterface()->getCapability(VirtualInputs))
+    if (firmware->getCapability(VirtualInputs))
       strcpy(inputName, model.inputNames[mixd.chn]);
 
-    ExpoDialog *g = new ExpoDialog(this, model, &mixd, generalSettings, inputName);
+    ExpoDialog *g = new ExpoDialog(this, model, &mixd, generalSettings, firmware, inputName);
     if (g->exec())  {
       model.expoData[index] = mixd;
-      if (GetEepromInterface()->getCapability(VirtualInputs))
+      if (firmware->getCapability(VirtualInputs))
         strcpy(model.inputNames[mixd.chn], inputName);
       emit modified();
       update();
diff --git a/companion/src/modeledit/inputs.h b/companion/src/modeledit/inputs.h
index 44b99dd71..393901b2c 100644
--- a/companion/src/modeledit/inputs.h
+++ b/companion/src/modeledit/inputs.h
@@ -9,7 +9,7 @@ class InputsPanel : public ModelPanel
     Q_OBJECT
 
   public:
-    InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~InputsPanel();
 
     virtual void update();
diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp
index ad799cf0c..49d988946 100644
--- a/companion/src/modeledit/logicalswitches.cpp
+++ b/companion/src/modeledit/logicalswitches.cpp
@@ -7,8 +7,8 @@
 #include <QDoubleSpinBox>
 #include "helpers.h"
 
-LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   selectedSwitch(0)
 {
   QGridLayout * gridLayout = new QGridLayout(this);
@@ -18,13 +18,13 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
   addLabel(gridLayout, tr("V1"), col++);
   addLabel(gridLayout, tr("V2"), col++);
   addLabel(gridLayout, tr("AND Switch"), col++);
-  if (GetEepromInterface()->getCapability(LogicalSwitchesExt)) {
+  if (firmware->getCapability(LogicalSwitchesExt)) {
     addLabel(gridLayout, tr("Duration"), col++);
     addLabel(gridLayout, tr("Delay"), col++);
   }
 
   lock = true;
-  for (int i=0; i<GetEepromInterface()->getCapability(LogicalSwitches); i++) {
+  for (int i=0; i<firmware->getCapability(LogicalSwitches); i++) {
     // The label
     QLabel * label = new QLabel(this);
     label->setProperty("index", i);
@@ -90,7 +90,7 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
     connect(cswitchAnd[i], SIGNAL(currentIndexChanged(int)), this, SLOT(andEdited(int)));
     gridLayout->addWidget(cswitchAnd[i], i+1, 4);
 
-    if (GetEepromInterface()->getCapability(LogicalSwitchesExt)) {
+    if (firmware->getCapability(LogicalSwitchesExt)) {
       // Duration
       cswitchDuration[i] = new QDoubleSpinBox(this);
       cswitchDuration[i]->setProperty("index", i);
@@ -115,7 +115,7 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
     }
   }
   // Push rows upward
-  addVSpring(gridLayout,0,GetEepromInterface()->getCapability(LogicalSwitches)+1);
+  addVSpring(gridLayout,0,firmware->getCapability(LogicalSwitches)+1);
   lock = false;
 }
 
@@ -276,7 +276,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
   {
     case LS_FAMILY_VOFS:
       mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE;
-      populateSourceCB(cswitchSource1[i], source, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      populateSourceCB(cswitchSource1[i], source, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
       cswitchOffset[i]->setDecimals(range.decimals);
       cswitchOffset[i]->setSingleStep(range.step);
       if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
@@ -304,8 +304,8 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
       break;
     case LS_FAMILY_VCOMP:
       mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE;
-      populateSourceCB(cswitchSource1[i], RawSource(model.customSw[i].val1), model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
-      populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), model, POPULATE_SOURCES | POPULATE_TRIMS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (GetEepromInterface()->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      populateSourceCB(cswitchSource1[i], RawSource(model.customSw[i].val1), model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), model, POPULATE_SOURCES | POPULATE_TRIMS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
       break;
     case LS_FAMILY_TIMER:
       mask |= VALUE1_VISIBLE | VALUE2_VISIBLE;
@@ -331,7 +331,7 @@ void LogicalSwitchesPanel::updateLine(int i)
   setSwitchWidgetVisibility(i);
   lock = true;
   populateAndSwitchCB(cswitchAnd[i], RawSwitch(model.customSw[i].andsw));
-  if (GetEepromInterface()->getCapability(LogicalSwitchesExt)) {
+  if (firmware->getCapability(LogicalSwitchesExt)) {
     cswitchDuration[i]->setValue(model.customSw[i].duration/10.0);
     cswitchDelay[i]->setValue(model.customSw[i].delay/10.0);
   }
@@ -340,7 +340,7 @@ void LogicalSwitchesPanel::updateLine(int i)
 
 void LogicalSwitchesPanel::update()
 {
-  for (int i=0; i<GetEepromInterface()->getCapability(LogicalSwitches); i++) {
+  for (int i=0; i<firmware->getCapability(LogicalSwitches); i++) {
     updateLine(i);
   }
 }
diff --git a/companion/src/modeledit/logicalswitches.h b/companion/src/modeledit/logicalswitches.h
index 0055af8e3..0741e087a 100644
--- a/companion/src/modeledit/logicalswitches.h
+++ b/companion/src/modeledit/logicalswitches.h
@@ -10,7 +10,7 @@ class LogicalSwitchesPanel : public ModelPanel
     Q_OBJECT
 
   public:
-    LogicalSwitchesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    LogicalSwitchesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~LogicalSwitchesPanel();
 
     virtual void update();
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index 19dbee5f3..4423df656 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -3,11 +3,12 @@
 #include "eeprominterface.h"
 #include "helpers.h"
 
-MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, GeneralSettings & generalSettings) :
+MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, GeneralSettings & generalSettings, FirmwareInterface * firmware) :
   QDialog(parent),
   ui(new Ui::MixerDialog),
   model(model),
   generalSettings(generalSettings),
+  firmware(firmware),
   md(mixdata),
   lock(false)
 {
@@ -21,7 +22,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
     populateSourceCB(ui->sourceCB, md->srcRaw, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
     ui->sourceCB->removeItem(0);
 
-    int limit = GetEepromInterface()->getCapability(OffsetWeight);
+    int limit = firmware->getCapability(OffsetWeight);
 
     gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, md->weight, 100, -limit, limit);
     gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, md->sOffset, 0, -limit, limit);
@@ -29,12 +30,12 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
 
     ui->MixDR_CB->setChecked(md->noExpo==0);
 
-    if (GetEepromInterface()->getCapability(VirtualInputs) || !GetEepromInterface()->getCapability(MixesWithoutExpo)) {
+    if (firmware->getCapability(VirtualInputs) || !firmware->getCapability(MixesWithoutExpo)) {
       ui->MixDR_CB->hide();
       ui->label_MixDR->hide();
     }
 
-    if (!GetEepromInterface()->getCapability(VirtualInputs)) {
+    if (!firmware->getCapability(VirtualInputs)) {
       ui->trimCB->addItem(tr("Rud"));
       ui->trimCB->addItem(tr("Ele"));
       ui->trimCB->addItem(tr("Thr"));
@@ -43,7 +44,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
 
     ui->trimCB->setCurrentIndex(1 - md->carryTrim);
 
-    int namelength = GetEepromInterface()->getCapability(HasMixerNames);
+    int namelength = firmware->getCapability(HasMixerNames);
     if (!namelength) {
       ui->label_name->hide();
       ui->mixerName->hide();
@@ -54,7 +55,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
     ui->mixerName->setValidator(new QRegExpValidator(rx, this));
     ui->mixerName->setText(md->name);
 
-    if (!GetEepromInterface()->getCapability(FlightPhases)) {
+    if (!firmware->getCapability(FlightPhases)) {
       ui->label_phases->hide();
       for (int i=0; i<9; i++) {
         lb_fp[i]->hide();
@@ -69,7 +70,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
         }
         mask <<= 1;
       }
-      for (int i=GetEepromInterface()->getCapability(FlightPhases); i<9;i++) {
+      for (int i=firmware->getCapability(FlightPhases); i<9;i++) {
         lb_fp[i]->hide();
         cb_fp[i]->hide();
       }
@@ -78,8 +79,8 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
     populateSwitchCB(ui->switchesCB, md->swtch, generalSettings);
     ui->warningCB->setCurrentIndex(md->mixWarn);
     ui->mltpxCB->setCurrentIndex(md->mltpx);
-    int scale=GetEepromInterface()->getCapability(SlowScale);  
-    float range=GetEepromInterface()->getCapability(SlowRange);  
+    int scale=firmware->getCapability(SlowScale);  
+    float range=firmware->getCapability(SlowRange);  
     ui->slowDownSB->setMaximum(range/scale);
     ui->slowDownSB->setSingleStep(1.0/scale);
     ui->slowDownSB->setDecimals((scale==1 ? 0 :1));
@@ -142,7 +143,7 @@ void MixerDialog::valuesChanged()
     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(), &model);
-    if (!GetEepromInterface()->getCapability(VirtualInputs) && GetEepromInterface()->getCapability(MixesWithoutExpo)) {
+    if (!firmware->getCapability(VirtualInputs) && firmware->getCapability(MixesWithoutExpo)) {
       bool drVisible = (md->srcRaw.type == SOURCE_TYPE_STICK && md->srcRaw.index < NUM_STICKS);
       ui->MixDR_CB->setEnabled(drVisible);
       ui->label_MixDR->setEnabled(drVisible);
@@ -152,7 +153,7 @@ void MixerDialog::valuesChanged()
     md->swtch     = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
     md->mixWarn   = ui->warningCB->currentIndex();
     md->mltpx     = (MltpxValue)ui->mltpxCB->currentIndex();
-    int scale=GetEepromInterface()->getCapability(SlowScale);
+    int scale=firmware->getCapability(SlowScale);
     md->delayDown = round(ui->delayDownSB->value()*scale);
     md->delayUp   = round(ui->delayUpSB->value()*scale);
     md->speedDown = round(ui->slowDownSB->value()*scale);
diff --git a/companion/src/modeledit/mixerdialog.h b/companion/src/modeledit/mixerdialog.h
index a97081352..ccfebf58f 100644
--- a/companion/src/modeledit/mixerdialog.h
+++ b/companion/src/modeledit/mixerdialog.h
@@ -14,7 +14,7 @@ namespace Ui {
 class MixerDialog : public QDialog {
     Q_OBJECT
   public:
-    MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, GeneralSettings & generalSettings);
+    MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     ~MixerDialog();
 
   protected:
@@ -28,6 +28,7 @@ class MixerDialog : public QDialog {
     Ui::MixerDialog *ui;
     ModelData & model;
     GeneralSettings & generalSettings;
+    FirmwareInterface * firmware;
     MixData *md;
     bool lock;
     GVarGroup * gvWeightGroup;
diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp
index a25c3c446..a40f66ff4 100644
--- a/companion/src/modeledit/mixes.cpp
+++ b/companion/src/modeledit/mixes.cpp
@@ -3,8 +3,8 @@
 // #include <QMessageBox>
 // #include "expodialog.h"
 
-MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+MixesPanel::MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   mixInserted(false), 
   highlightedSource(0)
 {
@@ -46,10 +46,10 @@ MixesPanel::~MixesPanel()
 QString MixesPanel::getChannelLabel(int curDest)
 {
   QString str;
-  int outputs = GetEepromInterface()->getCapability(Outputs);
   str = QObject::tr("CH%1").arg(curDest);
+  // TODO not nice, Qt brings a function for that, I don't remember right now
   (str.length() < 4) ? str.append("  ") : str.append(" ");
-  if (GetEepromInterface()->getCapability(HasChNames)) {
+  if (firmware->getCapability(HasChNames)) {
     QString name = model.limitData[curDest-1].name;
     if (!name.isEmpty()) {
       name = QString("(") + name + QString(")");
@@ -68,9 +68,9 @@ void MixesPanel::update()
   MixerlistWidget->clear();
   unsigned int curDest = 0;
   int i;
-  unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
+  unsigned int outputs = firmware->getCapability(Outputs);
 
-  for (i=0; i<GetEepromInterface()->getCapability(Mixes); i++) {
+  for (i=0; i<firmware->getCapability(Mixes); i++) {
     MixData *md = &model.mixData[i];
     // qDebug() << "md->destCh: " << md->destCh;
     if (md->destCh==0 || md->destCh>outputs) continue;
@@ -185,7 +185,7 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
     if (md->sOffset)     str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset)));
     if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
 
-    int scale = GetEepromInterface()->getCapability(SlowScale);
+    int scale = firmware->getCapability(SlowScale);
     if (scale == 0)
       scale = 1;
     if (md->delayDown || md->delayUp)
@@ -193,7 +193,7 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
     if (md->speedDown || md->speedUp)
       str += Qt::escape(tr(" Slow(u%1:d%2)").arg((double)md->speedUp/scale).arg((double)md->speedDown/scale));
     if (md->mixWarn)  str += Qt::escape(tr(" Warn(%1)").arg(md->mixWarn));
-    if (GetEepromInterface()->getCapability(HasMixerNames)) {
+    if (firmware->getCapability(HasMixerNames)) {
       QString MixerName;
       MixerName.append(md->name);
       if (!MixerName.isEmpty()) {
@@ -206,14 +206,14 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
 
 bool MixesPanel::gm_insertMix(int idx)
 {
-    if (idx<0 || idx>=GetEepromInterface()->getCapability(Mixes) || model.mixData[GetEepromInterface()->getCapability(Mixes)-1].destCh > 0) {
+    if (idx<0 || idx>=firmware->getCapability(Mixes) || model.mixData[firmware->getCapability(Mixes)-1].destCh > 0) {
       QMessageBox::information(this, "companion", 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) );
+        (firmware->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;
@@ -224,19 +224,19 @@ bool MixesPanel::gm_insertMix(int idx)
 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));
+            (firmware->getCapability(Mixes)-(index+1))*sizeof(MixData));
+    memset(&model.mixData[firmware->getCapability(Mixes)-1],0,sizeof(MixData));
 }
 
 void MixesPanel::gm_openMix(int index)
 {
-    if(index<0 || index>=GetEepromInterface()->getCapability(Mixes)) return;
+    if(index<0 || index>=firmware->getCapability(Mixes)) return;
 
     MixData mixd(model.mixData[index]);
     emit modified();
     update();
 
-    MixerDialog *g = new MixerDialog(this, model, &mixd, generalSettings);
+    MixerDialog *g = new MixerDialog(this, model, &mixd, generalSettings, firmware);
     if(g->exec()) {
       model.mixData[index] = mixd;
       emit modified();
@@ -254,8 +254,8 @@ void MixesPanel::gm_openMix(int index)
 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;
+    while ((model.mixData[i].destCh<=dch) && (model.mixData[i].destCh) && (i<firmware->getCapability(Mixes))) i++;
+    if(i==firmware->getCapability(Mixes)) return -1;
     return i;
 }
 
@@ -291,7 +291,7 @@ 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;
+      if(idx>=0 && idx<firmware->getCapability(Mixes)) list << idx;
     }
     return list;
 }
@@ -364,7 +364,7 @@ void MixesPanel::pasteMixerMimeData(const QMimeData * mimeData, int destIdx)
     int i = 0;
     while(i<mxData.size()) {
       idx++;
-      if(idx==GetEepromInterface()->getCapability(Mixes)) break;
+      if(idx==firmware->getCapability(Mixes)) break;
 
       if (!gm_insertMix(idx))
         break;
@@ -510,7 +510,7 @@ void MixesPanel::mixerlistWidget_KeyPress(QKeyEvent *event)
 
 int MixesPanel::gm_moveMix(int idx, bool dir) //true=inc=down false=dec=up
 {
-    if(idx>GetEepromInterface()->getCapability(Mixes) || (idx==GetEepromInterface()->getCapability(Mixes) && dir)) return idx;
+    if(idx>firmware->getCapability(Mixes) || (idx==firmware->getCapability(Mixes) && dir)) return idx;
 
     int tdx = dir ? idx+1 : idx-1;
     MixData &src=model.mixData[idx];
@@ -519,7 +519,7 @@ int MixesPanel::gm_moveMix(int idx, bool dir) //true=inc=down false=dec=up
     if (src.destCh == 1 && !dir)
       return idx;
 
-    unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
+    unsigned int outputs = firmware->getCapability(Outputs);
     if((src.destCh==0) || (src.destCh>outputs) || (tgt.destCh>outputs)) return idx;
 
     if (tgt.destCh!=src.destCh) {
diff --git a/companion/src/modeledit/mixes.h b/companion/src/modeledit/mixes.h
index 36b0b1fff..fda60d8fc 100644
--- a/companion/src/modeledit/mixes.h
+++ b/companion/src/modeledit/mixes.h
@@ -10,7 +10,7 @@ class MixesPanel : public ModelPanel
     Q_OBJECT
 
   public:
-    MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    MixesPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~MixesPanel();
 
     virtual void update();
diff --git a/companion/src/modeledit/modeledit.cpp b/companion/src/modeledit/modeledit.cpp
index c7a1feb35..0bccd5512 100644
--- a/companion/src/modeledit/modeledit.cpp
+++ b/companion/src/modeledit/modeledit.cpp
@@ -14,31 +14,32 @@
 #include "appdata.h"
 #include <QScrollArea>
 
-ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool isNew, QWidget *parent) :
+ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, FirmwareInterface * firmware) :
   QDialog(parent),
   ui(new Ui::ModelEdit),
   modelId(modelId),
   model(radioData.models[modelId]),
-  generalSettings(radioData.generalSettings)
+  generalSettings(radioData.generalSettings),
+  firmware(firmware)
 {
   ui->setupUi(this);
   setWindowIcon(CompanionIcon("edit.png"));
   restoreGeometry(g.modelEditGeo());  
   ui->pushButton->setIcon(CompanionIcon("simulate.png"));
-  Setup * setupPanel = new Setup(this, model, generalSettings);
+  SetupPanel * setupPanel = new SetupPanel(this, model, generalSettings, firmware);
   addTab(setupPanel, tr("Setup"));
-  addTab(new HeliPanel(this, model, generalSettings), tr("Heli"));
-  addTab(new FlightModes(this, model, generalSettings), tr("Flight Modes"));
-  addTab(new InputsPanel(this, model, generalSettings), tr("Inputs"));
-  addTab(new MixesPanel(this, model, generalSettings), tr("Mixes"));
-  Channels * chnPanel = new Channels(this, model, generalSettings);
+  addTab(new HeliPanel(this, model, generalSettings, firmware), tr("Heli"));
+  addTab(new FlightModes(this, model, generalSettings, firmware), tr("Flight Modes"));
+  addTab(new InputsPanel(this, model, generalSettings, firmware), tr("Inputs"));
+  addTab(new MixesPanel(this, model, generalSettings, firmware), tr("Mixes"));
+  Channels * chnPanel = new Channels(this, model, generalSettings, firmware);
   addTab(chnPanel, tr("Servos"));
-  addTab(new Curves(this, model, generalSettings), tr("Curves"));
-  addTab(new LogicalSwitchesPanel(this, model, generalSettings), tr("Logical Switches"));
-  if (GetEepromInterface()->getCapability(CustomFunctions))
-    addTab(new CustomFunctionsPanel(this, model, generalSettings), tr("Special Functions"));
-  if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY)
-    addTab(new TelemetryPanel(this, model, generalSettings), tr("Telemetry"));
+  addTab(new Curves(this, model, generalSettings, firmware), tr("Curves"));
+  addTab(new LogicalSwitchesPanel(this, model, generalSettings, firmware), tr("Logical Switches"));
+  if (firmware->getCapability(CustomFunctions))
+    addTab(new CustomFunctionsPanel(this, model, generalSettings, firmware), tr("Special Functions"));
+  if (firmware->getCapability(Telemetry) & TM_HASTELEMETRY)
+    addTab(new TelemetryPanel(this, model, generalSettings, firmware), tr("Telemetry"));
     
   connect(setupPanel, SIGNAL(extendedLimitsToggled()), chnPanel, SLOT(refreshExtendedLimits()));
 }
diff --git a/companion/src/modeledit/modeledit.h b/companion/src/modeledit/modeledit.h
index 9450d90d4..3f92f10cb 100644
--- a/companion/src/modeledit/modeledit.h
+++ b/companion/src/modeledit/modeledit.h
@@ -13,7 +13,7 @@ class ModelEdit : public QDialog
     Q_OBJECT
 
   public:
-    explicit ModelEdit(RadioData & radioData, int modelId , bool openWizard =false, bool inNew =false, QWidget *parent = 0);
+    ModelEdit(QWidget * parent, RadioData & radioData, int modelId, FirmwareInterface * firmware);
     ~ModelEdit();
   
   protected:
@@ -32,6 +32,7 @@ class ModelEdit : public QDialog
     int modelId;
     ModelData & model;
     GeneralSettings & generalSettings;
+    FirmwareInterface * firmware;
     QVector<ModelPanel *> panels;
 
     void addTab(ModelPanel *panel, QString text);
diff --git a/companion/src/modeledit/modelpanel.cpp b/companion/src/modeledit/modelpanel.cpp
index ea3aafde4..7ce39f2e8 100644
--- a/companion/src/modeledit/modelpanel.cpp
+++ b/companion/src/modeledit/modelpanel.cpp
@@ -1,10 +1,11 @@
 #include "modelpanel.h"
 #include <QLabel>
 
-ModelPanel::ModelPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings):
+ModelPanel::ModelPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
   QWidget(parent),
   model(model),
   generalSettings(generalSettings),
+  firmware(firmware),
   lock(false)
 {
 }
diff --git a/companion/src/modeledit/modelpanel.h b/companion/src/modeledit/modelpanel.h
index 81d2113cd..d016a326a 100644
--- a/companion/src/modeledit/modelpanel.h
+++ b/companion/src/modeledit/modelpanel.h
@@ -10,7 +10,7 @@ class ModelPanel : public QWidget
     Q_OBJECT
 
   public:
-    ModelPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    ModelPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~ModelPanel();
 
   signals:
@@ -22,6 +22,7 @@ class ModelPanel : public QWidget
   protected:
     ModelData & model;
     GeneralSettings & generalSettings;
+    FirmwareInterface * firmware;
     bool lock;
     void addLabel(QGridLayout * gridLayout, QString text, int col, bool mimimize=false);
     void addEmptyLabel(QGridLayout * gridLayout, int col);
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 869b129cf..366dfaf8c 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -5,8 +5,8 @@
 #include "helpers.h"
 #include "appdata.h"
 
-TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   timer(timer),
   ui(new Ui::Timer)
 {
@@ -17,7 +17,7 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
   // Mode
   populateSwitchCB(ui->mode, timer.mode, generalSettings, POPULATE_TIMER_MODES);
 
-  if (!GetEepromInterface()->getCapability(PermTimers)) {
+  if (!firmware->getCapability(PermTimers)) {
     ui->persistent->hide();
     ui->persistentValue->hide();
   }
@@ -41,7 +41,7 @@ void TimerPanel::update()
   int sec = timer.val % 60;
   ui->value->setTime(QTime(0, min, sec));
 
-  if (GetEepromInterface()->getCapability(PermTimers)) {
+  if (firmware->getCapability(PermTimers)) {
     int sign = 1;
     int pvalue = timer.pvalue;
     if (pvalue < 0) {
@@ -94,8 +94,8 @@ void TimerPanel::on_minuteBeep_toggled(bool checked)
 
 /******************************************************************************/
 
-ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module, GeneralSettings & generalSettings, int moduleIdx):
-  ModelPanel(parent, model, generalSettings),
+ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module, GeneralSettings & generalSettings, FirmwareInterface * firmware, int moduleIdx):
+  ModelPanel(parent, model, generalSettings, firmware),
   module(module),
   moduleIdx(moduleIdx),
   ui(new Ui::Module)
@@ -112,7 +112,7 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
   else {
     ui->label_trainerMode->hide();
     ui->trainerMode->hide();
-    if (GetEepromInterface()->getCapability(NumModules) > 1) {
+    if (firmware->getCapability(NumModules) > 1) {
       if (moduleIdx == 0)
         label = tr("Internal Radio System");
       else
@@ -132,7 +132,7 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
     }
   }
 
-  if (GetEepromInterface()->getCapability(HasFailsafe)) {
+  if (firmware->getCapability(HasFailsafe)) {
     for (int i=0; i<16; i++) {
       QLabel * label = new QLabel(this);
       label->setText(QString::number(i+1));
@@ -211,7 +211,7 @@ void ModulePanel::update()
   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);
+  ui->channelsCount->setSingleStep(firmware->getCapability(HasPPMStart) ? 1 : 2);
 
   // PPM settings fields
   ui->label_ppmPolarity->setVisible(mask & MASK_PPM_FIELDS);
@@ -223,10 +223,10 @@ void ModulePanel::update()
   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->setMaximum(firmware->getCapability(PPMFrameLength));
   ui->ppmFrameLength->setValue(22.5+((double)module.ppmFrameLength)*0.5);
 
-  if (GetEepromInterface()->getCapability(HasFailsafe)) {
+  if (firmware->getCapability(HasFailsafe)) {
     ui->label_failsafeMode->setVisible(mask & MASK_FAILSAFES);
     ui->failsafeMode->setVisible(mask & MASK_FAILSAFES);
     ui->failsafeMode->setCurrentIndex(module.failsafeMode);
@@ -323,8 +323,8 @@ void ModulePanel::onFailsafeSpinChanged(double value)
 
 /******************************************************************************/
 
-Setup::Setup(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   ui(new Ui::Setup)
 {
   lock = true;
@@ -336,23 +336,23 @@ Setup::Setup(QWidget *parent, ModelData & model, GeneralSettings & generalSettin
   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], generalSettings);
+    timers[i] = new TimerPanel(this, model, model.timers[i], generalSettings, firmware);
     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], generalSettings, i);
+  for (int i=0; i<firmware->getCapability(NumModules); i++) {
+    modules[i] = new ModulePanel(this, model, model.moduleData[i], generalSettings, firmware, 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], generalSettings, -1);
+  if (firmware->getCapability(ModelTrainerEnable)) {
+    modules[C9X_NUM_MODULES] = new ModulePanel(this, model, model.moduleData[C9X_NUM_MODULES], generalSettings, firmware, -1);
     ui->modulesLayout->addWidget(modules[C9X_NUM_MODULES]);
   }
 
-  if (GetEepromInterface()->getCapability(ModelImage)) {
+  if (firmware->getCapability(ModelImage)) {
     QStringList items;
     items.append("");
     QString path = g.profile[g.id()].sdPath();
@@ -399,13 +399,13 @@ Setup::Setup(QWidget *parent, ModelData & model, GeneralSettings & generalSettin
     ui->imagePreview->hide();
   }
   
-  if (!GetEepromInterface()->getCapability(HasDisplayText)) {
+  if (!firmware->getCapability(HasDisplayText)) {
     ui->displayText->hide();
   }
 
   // Beep Center checkboxes
-  int analogs = 4 + GetEepromInterface()->getCapability(Pots);
-  for (int i=0; i<analogs+GetEepromInterface()->getCapability(RotaryEncoders); i++) {
+  int analogs = 4 + firmware->getCapability(Pots);
+  for (int i=0; i<analogs+firmware->getCapability(RotaryEncoders); i++) {
     QCheckBox * checkbox = new QCheckBox(this);
     checkbox->setProperty("index", i);
     checkbox->setText(i<analogs ? AnalogString(i) : RotaryEncoderString(i-analogs));
@@ -415,7 +415,7 @@ Setup::Setup(QWidget *parent, ModelData & model, GeneralSettings & generalSettin
   }
 
   // Startup switches warnings
-  for (int i=0; i<GetEepromInterface()->getCapability(Switches)-1; i++) {
+  for (int i=0; i<firmware->getCapability(Switches)-1; i++) {
     QLabel * label = new QLabel(this);
     QSlider * slider = new QSlider(this);
     QCheckBox * cb = new QCheckBox(this);
@@ -449,11 +449,11 @@ Setup::Setup(QWidget *parent, ModelData & model, GeneralSettings & generalSettin
     startupSwitchesSliders << slider;
     startupSwitchesCheckboxes << cb;
   }
-  ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, GetEepromInterface()->getCapability(Switches));
+  ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, firmware->getCapability(Switches));
 
   // Pot warnings
   if(IS_TARANIS(GetEepromInterface()->getBoard())) {
-    for (int i=0; i<GetEepromInterface()->getCapability(Pots); i++) {
+    for (int i=0; i<firmware->getCapability(Pots); i++) {
       QCheckBox * cb = new QCheckBox(this);
       cb->setProperty("index", i+1);
       cb->setText(AnalogString(i+4));
@@ -469,43 +469,43 @@ Setup::Setup(QWidget *parent, ModelData & model, GeneralSettings & generalSettin
   lock = false;
 }
 
-Setup::~Setup()
+SetupPanel::~SetupPanel()
 {
   delete ui;
 }
 
-void Setup::on_extendedLimits_toggled(bool checked)
+void SetupPanel::on_extendedLimits_toggled(bool checked)
 {
   model.extendedLimits = checked;
   emit extendedLimitsToggled();
   emit modified();
 }
 
-void Setup::on_throttleWarning_toggled(bool checked)
+void SetupPanel::on_throttleWarning_toggled(bool checked)
 {
   model.disableThrottleWarning = !checked;
   emit modified();
 }
 
-void Setup::on_throttleReverse_toggled(bool checked)
+void SetupPanel::on_throttleReverse_toggled(bool checked)
 {
   model.throttleReversed = checked;
   emit modified();
 }
 
-void Setup::on_extendedTrims_toggled(bool checked)
+void SetupPanel::on_extendedTrims_toggled(bool checked)
 {
   model.extendedTrims = checked;
   emit modified();
 }
 
-void Setup::on_trimIncrement_currentIndexChanged(int index)
+void SetupPanel::on_trimIncrement_currentIndexChanged(int index)
 {
   model.trimInc = index-2;
   emit modified();
 }
 
-void Setup::on_throttleSource_currentIndexChanged(int index)
+void SetupPanel::on_throttleSource_currentIndexChanged(int index)
 {
   if (!lock) {
     model.thrTraceSrc = ui->throttleSource->itemData(index).toInt();
@@ -513,14 +513,14 @@ void Setup::on_throttleSource_currentIndexChanged(int index)
   }
 }
 
-void Setup::on_name_editingFinished()
+void SetupPanel::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)
+void SetupPanel::on_image_currentIndexChanged(int index)
 {
   if (!lock) {
     strncpy(model.bitmap, ui->image->currentText().toAscii(), 10);
@@ -552,7 +552,7 @@ void Setup::on_image_currentIndexChanged(int index)
   }
 }
 
-void Setup::populateThrottleSourceCB()
+void SetupPanel::populateThrottleSourceCB()
 {
   const QString sources9x[] = { QObject::tr("THR"), QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3")};
   const QString sourcesTaranis[] = { QObject::tr("THR"), QObject::tr("S1"), QObject::tr("S2"), QObject::tr("S3"), QObject::tr("LS"), QObject::tr("RS")};
@@ -585,7 +585,7 @@ void Setup::populateThrottleSourceCB()
   lock = false;
 }
 
-void Setup::update()
+void SetupPanel::update()
 {
   ui->name->setText(model.name);
 
@@ -615,20 +615,20 @@ void Setup::update()
       modules[i]->update();
 }
 
-void Setup::updateBeepCenter()
+void SetupPanel::updateBeepCenter()
 {
   for (int i=0; i<centerBeepCheckboxes.size(); i++) {
     centerBeepCheckboxes[i]->setChecked(model.beepANACenter & (0x01 << i));
   }
 }
 
-void Setup::updateStartupSwitches()
+void SetupPanel::updateStartupSwitches()
 {
   lock = true;
 
   unsigned int switchStates = model.switchWarningStates;
 
-  for (int i=0; i<GetEepromInterface()->getCapability(Switches)-1; i++) {
+  for (int i=0; i<firmware->getCapability(Switches)-1; i++) {
     QSlider * slider = startupSwitchesSliders[i];
     QCheckBox * cb = startupSwitchesCheckboxes[i];
     bool enabled = !(model.nSwToWarn & (1 << i));
@@ -647,7 +647,7 @@ void Setup::updateStartupSwitches()
   lock = false;
 }
 
-void Setup::startupSwitchEdited(int value)
+void SetupPanel::startupSwitchEdited(int value)
 {
   if (!lock) {
     int shift = 0;
@@ -686,7 +686,7 @@ void Setup::startupSwitchEdited(int value)
   }
 }
 
-void Setup::startupSwitchToggled(bool checked)
+void SetupPanel::startupSwitchToggled(bool checked)
 {
   if (!lock) {
     int index = sender()->property("index").toInt()-1;
@@ -701,7 +701,7 @@ void Setup::startupSwitchToggled(bool checked)
   }
 }
 
-void Setup::updatePotWarnings()
+void SetupPanel::updatePotWarnings()
 {
   lock = true;
   int mode = model.nPotsToWarn >> 6;
@@ -719,7 +719,7 @@ void Setup::updatePotWarnings()
   lock = false;
 }
 
-void Setup::potWarningToggled(bool checked)
+void SetupPanel::potWarningToggled(bool checked)
 {
   if (!lock) {
     int index = sender()->property("index").toInt()-1;
@@ -734,7 +734,7 @@ void Setup::potWarningToggled(bool checked)
   }
 }
 
-void Setup::on_potWarningMode_currentIndexChanged(int index)
+void SetupPanel::on_potWarningMode_currentIndexChanged(int index)
 {
   if (!lock) {
     int mask = 0xC0;
@@ -746,19 +746,19 @@ void Setup::on_potWarningMode_currentIndexChanged(int index)
   }
 }
 
-void Setup::on_displayText_toggled(bool checked)
+void SetupPanel::on_displayText_toggled(bool checked)
 {
   model.displayText = checked;
   emit modified();
 }
 
-void Setup::on_throttleTrim_toggled(bool checked)
+void SetupPanel::on_throttleTrim_toggled(bool checked)
 {
   model.thrTrim = checked;
   emit modified();
 }
 
-void Setup::onBeepCenterToggled(bool checked)
+void SetupPanel::onBeepCenterToggled(bool checked)
 {
   if (!lock) {
     int index = sender()->property("index").toInt();
@@ -771,7 +771,7 @@ void Setup::onBeepCenterToggled(bool checked)
   }
 }
 
-void Setup::onChildModified()
+void SetupPanel::onChildModified()
 {
   emit modified();
 }
diff --git a/companion/src/modeledit/setup.h b/companion/src/modeledit/setup.h
index 8929939ad..3063c2833 100644
--- a/companion/src/modeledit/setup.h
+++ b/companion/src/modeledit/setup.h
@@ -20,7 +20,7 @@ class TimerPanel : public ModelPanel
     Q_OBJECT
 
   public:
-    TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings);
+    TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~TimerPanel();
 
     virtual void update();
@@ -42,7 +42,7 @@ class ModulePanel : public ModelPanel
     Q_OBJECT
 
   public:
-    ModulePanel(QWidget *parent, ModelData & model, ModuleData & module, GeneralSettings & generalSettings, int moduleIdx);
+    ModulePanel(QWidget *parent, ModelData & model, ModuleData & module, GeneralSettings & generalSettings, FirmwareInterface * firmware, int moduleIdx);
     virtual ~ModulePanel();
 
     virtual void update();
@@ -66,13 +66,13 @@ class ModulePanel : public ModelPanel
     QVector<QDoubleSpinBox *> failsafeSpins;
 };
 
-class Setup : public ModelPanel
+class SetupPanel : public ModelPanel
 {
     Q_OBJECT
 
   public:
-    Setup(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
-    virtual ~Setup();
+    SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
+    virtual ~SetupPanel();
 
     virtual void update();
 
diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
index cde96a6b3..50e629086 100644
--- a/companion/src/modeledit/telemetry.cpp
+++ b/companion/src/modeledit/telemetry.cpp
@@ -5,8 +5,8 @@
 #include "helpers.h"
 #include "appdata.h"
 
-TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog):
-  QWidget(parent),
+TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   ui(new Ui::TelemetryAnalog),
   analog(analog),
   lock(false)
@@ -17,11 +17,11 @@ TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog):
 
   if (analog.type==0 || analog.type==1 || analog.type==2) {
     ui->RatioSB->setDecimals(1);
-    ui->RatioSB->setMaximum(25.5*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
+    ui->RatioSB->setMaximum(25.5*firmware->getCapability(TelemetryMaxMultiplier));
   }
   else {
     ui->RatioSB->setDecimals(0);
-    ui->RatioSB->setMaximum(255*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
+    ui->RatioSB->setMaximum(255*firmware->getCapability(TelemetryMaxMultiplier));
   }
   ui->RatioSB->setValue(ratio);
 
@@ -43,7 +43,7 @@ TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog):
     ui->alarm2Label->setText(tr("Critical Alarm"));
   }
 
-  if (!(GetEepromInterface()->getCapability(Telemetry) & TM_HASOFFSET)) {
+  if (!(firmware->getCapability(Telemetry) & TM_HASOFFSET)) {
     ui->CalibSB->hide();
     ui->CalibLabel->hide();
   }
@@ -87,11 +87,11 @@ void TelemetryAnalog::on_UnitCB_currentIndexChanged(int index)
       case 1:
       case 2:
         ui->RatioSB->setDecimals(1);
-        ui->RatioSB->setMaximum(25.5*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
+        ui->RatioSB->setMaximum(25.5*firmware->getCapability(TelemetryMaxMultiplier));
         break;
       default:
         ui->RatioSB->setDecimals(0);
-        ui->RatioSB->setMaximum(255*GetEepromInterface()->getCapability(TelemetryMaxMultiplier));
+        ui->RatioSB->setMaximum(255*firmware->getCapability(TelemetryMaxMultiplier));
         break;
     }
     ui->RatioSB->setValue(ratio);
@@ -280,15 +280,15 @@ TelemetryAnalog::~TelemetryAnalog()
 
 /******************************************************/
 
-TelemetryCustomScreen::TelemetryCustomScreen(QWidget *parent, ModelData & model, FrSkyScreenData & screen, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+TelemetryCustomScreen::TelemetryCustomScreen(QWidget *parent, ModelData & model, FrSkyScreenData & screen, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   ui(new Ui::TelemetryCustomScreen),
   screen(screen)
 {
   ui->setupUi(this);
 
   for (int l=0; l<4; l++) {
-    for (int c=0; c<GetEepromInterface()->getCapability(TelemetryCustomScreensFieldsPerLine); c++) {
+    for (int c=0; c<firmware->getCapability(TelemetryCustomScreensFieldsPerLine); c++) {
       fieldsCB[l][c] = new QComboBox(this);
       fieldsCB[l][c]->setProperty("index", c + (l<<8));
       populateTelemetrySourceCB(fieldsCB[l][c], screen.body.lines[l].source[c], l==3, model.frsky.usrProto);
@@ -366,7 +366,7 @@ void TelemetryCustomScreen::update()
 
   if (screen.type == 0) {
     for (int l=0; l<4; l++) {
-      for (int c=0; c<GetEepromInterface()->getCapability(TelemetryCustomScreensFieldsPerLine); c++) {
+      for (int c=0; c<firmware->getCapability(TelemetryCustomScreensFieldsPerLine); c++) {
         fieldsCB[l][c]->setCurrentIndex(screen.body.lines[l].source[c]);
       }
     }
@@ -465,26 +465,26 @@ void TelemetryCustomScreen::barMaxChanged(double value)
 
 /******************************************************/
 
-TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings):
-  ModelPanel(parent, model, generalSettings),
+TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+  ModelPanel(parent, model, generalSettings, firmware),
   ui(new Ui::Telemetry)
 {
   ui->setupUi(this);
 
-  if (GetEepromInterface()->getCapability(NoTelemetryProtocol)) {
+  if (firmware->getCapability(NoTelemetryProtocol)) {
     model.frsky.usrProto = 1;
   }
 
-  analogs[0] = new TelemetryAnalog(this, model.frsky.channels[0]);
+  analogs[0] = new TelemetryAnalog(this, model.frsky.channels[0], model, generalSettings, firmware);
   ui->A1Layout->addWidget(analogs[0]);
   connect(analogs[0], SIGNAL(modified()), this, SLOT(onAnalogModified()));
 
-  analogs[1] = new TelemetryAnalog(this, model.frsky.channels[1]);
+  analogs[1] = new TelemetryAnalog(this, model.frsky.channels[1], model, generalSettings, firmware);
   ui->A2Layout->addWidget(analogs[1]);
   connect(analogs[1], SIGNAL(modified()), this, SLOT(onAnalogModified()));
 
-  for (int i=0; i<GetEepromInterface()->getCapability(TelemetryCustomScreens); i++) {
-    TelemetryCustomScreen * tab = new TelemetryCustomScreen(this, model, model.frsky.screens[i], generalSettings);
+  for (int i=0; i<firmware->getCapability(TelemetryCustomScreens); i++) {
+    TelemetryCustomScreen * tab = new TelemetryCustomScreen(this, model, model.frsky.screens[i], generalSettings, firmware);
     ui->customScreens->addTab(tab, tr("Telemetry screen %1").arg(i+1));
   }
 
@@ -508,7 +508,7 @@ void TelemetryPanel::setup()
     lock=true;
 
     //frsky Settings
-    if (!GetEepromInterface()->getCapability(TelemetryRSSIModel) ) {
+    if (!firmware->getCapability(TelemetryRSSIModel) ) {
       ui->RSSIGB->hide();
     }
     ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
@@ -524,7 +524,7 @@ void TelemetryPanel::setup()
       ui->rssiAlarm2Label->setText(tr("Critical Alarm"));
     }
 
-    if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
+    if (!firmware->getCapability(HasAltitudeSel)) {
       ui->AltitudeGPS_ChkB->hide();
     }
     else {
@@ -538,7 +538,7 @@ void TelemetryPanel::setup()
       ui->AltitudeToolbar_ChkB->hide();
     }
 
-    int varioCap = GetEepromInterface()->getCapability(HasVario);
+    int varioCap = firmware->getCapability(HasVario);
     if (!varioCap) {
       ui->varioLimitMax_DSB->hide();
       ui->varioLimitMinOff_ChkB->hide();
@@ -554,7 +554,7 @@ void TelemetryPanel::setup()
       ui->varioSource_label->hide();
     }
     else {
-      if (!GetEepromInterface()->getCapability(HasVarioSink)) {
+      if (!firmware->getCapability(HasVarioSink)) {
         ui->varioLimitMinOff_ChkB->hide();
         ui->varioLimitMin_DSB->hide();
         ui->varioLimitCenterMin_DSB->hide();
@@ -584,18 +584,18 @@ void TelemetryPanel::setup()
       }
     }
 
-    if (!(GetEepromInterface()->getCapability(HasAltitudeSel)||GetEepromInterface()->getCapability(HasVario))) {
+    if (!(firmware->getCapability(HasAltitudeSel)||firmware->getCapability(HasVario))) {
       ui->altimetryGB->hide();
     }
 
-    if (GetEepromInterface()->getCapability(NoTelemetryProtocol)) {
+    if (firmware->getCapability(NoTelemetryProtocol)) {
       ui->frskyProtoCB->setDisabled(true);
     }
     else {
       ui->frskyProtoCB->setEnabled(true);
     }
 
-    if (!GetEepromInterface()->getCapability(TelemetryUnits)) {
+    if (!firmware->getCapability(TelemetryUnits)) {
       ui->frskyUnitsCB->setDisabled(true);
       int index=0;
       if (firmware_id.contains("imperial")) {
@@ -604,7 +604,7 @@ void TelemetryPanel::setup()
       ui->frskyUnitsCB->setCurrentIndex(index);
     }
 
-    if ((GetEepromInterface()->getCapability(Telemetry)&TM_HASWSHH)) {
+    if ((firmware->getCapability(Telemetry)&TM_HASWSHH)) {
       ui->frskyProtoCB->addItem(tr("Winged Shadow How High"));
     }
     else {
@@ -612,7 +612,7 @@ void TelemetryPanel::setup()
     }
     
     ui->variousGB->hide();
-    if (!(GetEepromInterface()->getCapability(HasFasOffset)) && !(firmware_id.contains("fasoffset"))) {
+    if (!(firmware->getCapability(HasFasOffset)) && !(firmware_id.contains("fasoffset"))) {
       ui->fasOffset_label->hide();
       ui->fasOffset_DSB->hide();
     }
@@ -621,7 +621,7 @@ void TelemetryPanel::setup()
       ui->variousGB->show();
     }
 
-    if (!(GetEepromInterface()->getCapability(HasMahPersistent))) {
+    if (!(firmware->getCapability(HasMahPersistent))) {
       ui->mahCount_label->hide();
       ui->mahCount_SB->hide();
       ui->mahCount_ChkB->hide();
diff --git a/companion/src/modeledit/telemetry.h b/companion/src/modeledit/telemetry.h
index c0d29997d..3c949b524 100644
--- a/companion/src/modeledit/telemetry.h
+++ b/companion/src/modeledit/telemetry.h
@@ -12,14 +12,14 @@ namespace Ui {
   class Telemetry;
 }
 
-class TelemetryAnalog : public QWidget
+class TelemetryAnalog: public ModelPanel
 {
     Q_OBJECT
 
     friend class TelemetryPanel;
 
   public:
-    TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog);
+    TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~TelemetryAnalog();
 
   signals:
@@ -45,12 +45,12 @@ class TelemetryAnalog : public QWidget
     void update();
 };
 
-class TelemetryCustomScreen : public ModelPanel
+class TelemetryCustomScreen: public ModelPanel
 {
     Q_OBJECT
 
   public:
-    TelemetryCustomScreen(QWidget *parent, ModelData & model, FrSkyScreenData & screen, GeneralSettings & generalSettings);
+    TelemetryCustomScreen(QWidget *parent, ModelData & model, FrSkyScreenData & screen, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     ~TelemetryCustomScreen();
     void update();
 
@@ -79,7 +79,7 @@ class TelemetryPanel : public ModelPanel
     Q_OBJECT
 
   public:
-    TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings);
+    TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware);
     virtual ~TelemetryPanel();
 
   signals:
diff --git a/companion/src/modeledit/templates.cpp b/companion/src/modeledit/templates.cpp
index a0e0aa0ac..7df410a7f 100644
--- a/companion/src/modeledit/templates.cpp
+++ b/companion/src/modeledit/templates.cpp
@@ -10,7 +10,7 @@ void ModelEdit::setCurve(uint8_t c, int8_t ar[])
 {
   int len=sizeof(ar)/sizeof(int8_t);
 
-  if (GetEepromInterface()->getCapability(NumCurves)>c) {
+  if (firmware->getCapability(NumCurves)>c) {
     if (len<9) {
       model.curves[c].count=5;
       model.curves[c].custom=false;
@@ -100,7 +100,7 @@ void Templates::applyNumericTemplate(uint64_t tpl)
     for (int i=0; i<10 ; i++) {
       rx[i]=false;
     }
-    int thrsw=GetEepromInterface()->getCapability(GetThrSwitch);
+    int thrsw=firmware->getCapability(GetThrSwitch);
     MixData *md = &model.mixData[0];
     uint8_t spo2ch=(tpl & 0x0F);
     tpl>>=4;
@@ -554,7 +554,7 @@ void Templates::applyTemplate(uint8_t idx)
     int8_t heli_ar4[] = {-30,  -15, 0, 50, 100};
     int8_t heli_ar5[] = {-100, -50, 0, 50, 100};
 
-    int thrsw=GetEepromInterface()->getCapability(GetThrSwitch);
+    int thrsw=firmware->getCapability(GetThrSwitch);
     MixData *md = &model.mixData[0];
 
     //CC(STK)   -> vSTK
@@ -715,7 +715,7 @@ void Templates::applyTemplate(uint8_t idx)
       bool found=true;
       while (found) {
         found=false;
-        for (int i=0; i< GetEepromInterface()->getCapability(Mixes); i++) {
+        for (int i=0; i< firmware->getCapability(Mixes); i++) {
           if (model.mixData[i].destCh==6) {
             gm_deleteMix(i);
             found=true;
@@ -827,7 +827,7 @@ void Templates::applyTemplate(uint8_t idx)
       bool found=true;
       while (found) {
         found=false;
-        for (int i=0; i< GetEepromInterface()->getCapability(Mixes); i++) {
+        for (int i=0; i< firmware->getCapability(Mixes); i++) {
           if (model.mixData[i].destCh==5) {
             gm_deleteMix(i);
             found=true;
@@ -867,11 +867,11 @@ void Templates::applyTemplate(uint8_t idx)
 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];
+    while ((g_model.mixData[i].destCh<=dch) && (g_model.mixData[i].destCh) && (i<firmware->getCapability(Mixes))) i++;
+    if(i==firmware->getCapability(Mixes)) return &g_model.mixData[0];
 
     memmove(&g_model.mixData[i+1],&g_model.mixData[i],
-            (GetEepromInterface()->getCapability(Mixes)-(i+1))*sizeof(MixData) );
+            (firmware->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/printdialog.cpp b/companion/src/printdialog.cpp
index 05a0cb276..39a16b360 100644
--- a/companion/src/printdialog.cpp
+++ b/companion/src/printdialog.cpp
@@ -14,16 +14,16 @@
 #define ISIZE 200 // curve image size
 #define ISIZEW 400 // curve image size
 
-printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QString filename) :
-    QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-    ui(new Ui::printDialog)
+PrintDialog::PrintDialog(QWidget *parent, FirmwareInterface * firmware, GeneralSettings *gg, ModelData *gm, QString filename) :
+  QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+  firmware(firmware),
+  g_eeGeneral(gg),
+  g_model(gm),
+  printfilename(filename),
+  ui(new Ui::PrintDialog)
 {
     ui->setupUi(this);
     this->setWindowIcon(CompanionIcon("print.png"));
-    g_model = gm;
-    g_eeGeneral = gg;
-    printfilename=filename;
-    eepromInterface = GetEepromInterface();
     te = ui->textEdit;
 
     setWindowTitle(tr("Setup for: ") + g_model->name);
@@ -32,13 +32,14 @@ printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QS
     if (modelname.isEmpty()) {
       curvefile5=QString("%1/curve5.png").arg(qd->tempPath());
       curvefile9=QString("%1/curve9.png").arg(qd->tempPath());      
-    } else {
+    }
+    else {
       curvefile5=QString("%1/%2-curve5.png").arg(qd->tempPath()).arg(modelname);
       curvefile9=QString("%1/%2-curve9.png").arg(qd->tempPath()).arg(modelname);
     }
     printSetup();
     int gvars=0;
-    if (GetEepromInterface()->getCapability(HasVariants)) {
+    if (firmware->getCapability(HasVariants)) {
       if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
         gvars=1;
       }
@@ -66,7 +67,7 @@ printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QS
     }
 }
 
-void printDialog::closeEvent(QCloseEvent *event) 
+void PrintDialog::closeEvent(QCloseEvent *event) 
 {
   if (printfilename.isEmpty()) {
     QByteArray ba = curvefile5.toLatin1();
@@ -78,7 +79,7 @@ void printDialog::closeEvent(QCloseEvent *event)
   }
 }
 
-printDialog::~printDialog()
+PrintDialog::~PrintDialog()
 {
     delete ui;
 }
@@ -107,15 +108,15 @@ QString doTL(const QString s, const QString color="", bool bold=false)
     return "<td align=left>" + str + "</td>";
 }
 
-QString printDialog::fv(const QString name, const QString value)
+QString PrintDialog::fv(const QString name, const QString value)
 {
     return "<b>" + name + ": </b><font color=green>" + value + "</font><br>";
 }
 
-void printDialog::printSetup()
+void PrintDialog::printSetup()
 {
     int gvars=0;
-    if (GetEepromInterface()->getCapability(HasVariants)) {
+    if (firmware->getCapability(HasVariants)) {
       if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
         gvars=1;
       }
@@ -123,15 +124,15 @@ void printDialog::printSetup()
       gvars=1;
     }
     QString str = "<a name=1></a><table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
-    str.append(QString("<tr><td colspan=%1 ><table border=0 width=\"100%\"><tr><td><h1>").arg((GetEepromInterface()->getCapability(FlightPhases) && gvars==0) ? 2 : 1));
+    str.append(QString("<tr><td colspan=%1 ><table border=0 width=\"100%\"><tr><td><h1>").arg((firmware->getCapability(FlightPhases) && gvars==0) ? 2 : 1));
     str.append(g_model->name);
     str.append("&nbsp;(");
-    str.append(eepromInterface->getName());
+    str.append(firmware->getEepromInterface()->getName());
     str.append(")</h1></td><td align=right valign=top NOWRAP><font size=-1>"+tr("printed on: %1").arg(QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate))+"</font></td></tr></table></td></tr><tr><td><table border=0 cellspacing=0 cellpadding=3>");
     str.append("<tr><td><h2>"+tr("General Model Settings")+"</h2></td></tr>");
     str.append("<tr><td>");
     str.append(fv(tr("Name"), g_model->name));
-    str.append("<b>"+tr("EEprom Size")+QString(": </b><font color=green>%1</font><br>").arg(eepromInterface->getSize(*g_model)));
+    str.append("<b>"+tr("EEprom Size")+QString(": </b><font color=green>%1</font><br>").arg(firmware->getEepromInterface()->getSize(*g_model)));
     str.append(fv(tr("Timer1"), getTimerStr(g_model->timers[0])));  //value, mode, count up/down
     str.append(fv(tr("Timer2"), getTimerStr(g_model->timers[1])));  //value, mode, count up/down
     str.append(fv(tr("Protocol"), getProtocol(g_model))); //proto, numch, delay,
@@ -151,19 +152,19 @@ void printDialog::printSetup()
     te->append(str);
 }
 
-QString printDialog::printPhases()
+QString PrintDialog::printPhases()
 {      
     int gvars=0;
     int gvarnum=0;
-    if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetEepromInterface()->getCapability(HasVariants) && GetEepromInterface()->getCapability(Gvars))) {
-      if (GetEepromInterface()->getCapability(GvarsFlightPhases)) {
+    if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!firmware->getCapability(HasVariants) && firmware->getCapability(Gvars))) {
+      if (firmware->getCapability(GvarsFlightPhases)) {
         gvars=1;
-        gvarnum=GetEepromInterface()->getCapability(Gvars);
+        gvarnum=firmware->getCapability(Gvars);
       }
     }
 
     QString str="";
-    str.append(QString("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=%1><h2>").arg(gvars==0 ? 8+GetEepromInterface()->getCapability(RotaryEncoders) : 8+gvarnum+GetEepromInterface()->getCapability(RotaryEncoders)));
+    str.append(QString("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=%1><h2>").arg(gvars==0 ? 8+firmware->getCapability(RotaryEncoders) : 8+gvarnum+firmware->getCapability(RotaryEncoders)));
     str.append(tr("Flight modes Settings"));
     str.append("</h2></td></tr><tr><td style=\"border-style:none;\">&nbsp;</td><td colspan=2 align=center><b>");
     str.append(tr("Fades")+"</b></td>");
@@ -171,8 +172,8 @@ QString printDialog::printPhases()
     if (gvars) {
       str.append(QString("<td colspan=%1 align=center><b>").arg(gvarnum)+tr("Gvars")+"</b></td>");
     }
-    if (GetEepromInterface()->getCapability(RotaryEncoders)) {
-      str.append(QString("<td colspan=%1 align=center><b>").arg(GetEepromInterface()->getCapability(RotaryEncoders))+tr("Rot.Enc.")+"</b></td>");
+    if (firmware->getCapability(RotaryEncoders)) {
+      str.append(QString("<td colspan=%1 align=center><b>").arg(firmware->getCapability(RotaryEncoders))+tr("Rot.Enc.")+"</b></td>");
     }
     str.append("<td rowspan=2 align=\"center\" valign=\"bottom\"><b>"+tr("Switch")+"</b></td></tr><tr><td align=center width=\"90\"><b>"+tr("Flight mode name"));
     str.append("</b></td><td align=center width=\"30\"><b>"+tr("IN")+"</b></td><td align=center width=\"30\"><b>"+tr("OUT")+"</b></td>");
@@ -184,11 +185,11 @@ QString printDialog::printPhases()
         str.append(QString("<td width=\"40\" align=\"center\"><b>GV%1</b><br>%2</td>").arg(i+1).arg(g_model->gvars_names[i]));
       }      
     }
-    for (int i=0; i<GetEepromInterface()->getCapability(RotaryEncoders); i++) {
+    for (int i=0; i<firmware->getCapability(RotaryEncoders); i++) {
       str.append(QString("<td align=\"center\"><b>RE%1</b></td>").arg((i==0 ? 'A': 'B')));
     }
     str.append("</tr>");
-    for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+    for (int i=0; i<firmware->getCapability(FlightPhases); i++) {
       PhaseData *pd=&g_model->phaseData[i];
       str.append("<tr><td><b>"+tr("FM")+QString("%1</b> <font size=+1 face='Courier New' color=green>%2</font></td><td width=\"30\" align=\"right\"><font size=+1 face='Courier New' color=green>%3</font></td><td width=\"30\" align=\"right\"><font size=+1 face='Courier New' color=green>%4</font></td>").arg(i).arg(pd->name).arg(pd->fadeIn).arg(pd->fadeOut));
       for (int k=0; k<4; k++) {
@@ -210,7 +211,7 @@ QString printDialog::printPhases()
           }
         }
       }
-      for (int k=0; k<GetEepromInterface()->getCapability(RotaryEncoders); k++) {
+      for (int k=0; k<firmware->getCapability(RotaryEncoders); k++) {
         if (pd->rotaryEncoders[k]<=1024) {
           str.append(QString("<td align=\"right\"><font size=+1 face='Courier New' color=green>%1").arg(pd->rotaryEncoders[k])+"</font></td>");
         }
@@ -227,7 +228,7 @@ QString printDialog::printPhases()
     return(str);
 }
 
-void printDialog::printExpo()
+void PrintDialog::printExpo()
 {
     QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td><h2>";
     str.append(tr("Expo/Dr Settings"));
@@ -264,12 +265,12 @@ void printDialog::printExpo()
       str += tr("Weight") + QString("%1").arg(getGVarString(ed->weight,true)).rightJustified(6, ' ');
       str += ed->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
 
-      if (GetEepromInterface()->getCapability(FlightPhases)) {
+      if (firmware->getCapability(FlightPhases)) {
         if(ed->phases) {
-          if (ed->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
+          if (ed->phases!=(unsigned int)(1<<firmware->getCapability(FlightPhases))-1) {
             int mask=1;
             int first=0;
-            for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases);i++) {
+            for (int i=0; i<firmware->getCapability(FlightPhases);i++) {
               if (!(ed->phases & mask)) {
                 first++;
               }
@@ -282,7 +283,7 @@ void printDialog::printExpo()
             }
             mask=1;
             first=1;
-            for (int j=0; j<GetEepromInterface()->getCapability(FlightPhases);j++) {
+            for (int j=0; j<firmware->getCapability(FlightPhases);j++) {
               if (!(ed->phases & mask)) {
                 PhaseData *pd = &g_model->phaseData[j];
                 if (!first) {
@@ -303,7 +304,7 @@ void printDialog::printExpo()
       if (ed->swtch.type) 
         str += " " + tr("Switch") + QString("(%1)").arg(ed->swtch.toString());
       str += ed->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
-      if (GetEepromInterface()->getCapability(HasExpoNames)) {
+      if (firmware->getCapability(HasExpoNames)) {
         QString ExpoName;
         ExpoName.append(ed->name);
         if (!ExpoName.isEmpty()) {
@@ -318,21 +319,21 @@ void printDialog::printExpo()
 }
 
 
-void printDialog::printMixes()
+void PrintDialog::printMixes()
 {
     QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>";
     str.append(tr("Mixers"));
     str.append("</h2></td></tr><tr><td><table border=0 cellspacing=0 cellpadding=3>");
 
     unsigned int lastCHN = 255;
-    for(int i=0; i<GetEepromInterface()->getCapability(Mixes); i++) {
+    for(int i=0; i<firmware->getCapability(Mixes); i++) {
       MixData *md = &g_model->mixData[i];
-      if(!md->destCh || md->destCh>(unsigned int)GetEepromInterface()->getCapability(Outputs) ) break;
+      if(!md->destCh || md->destCh>(unsigned int)firmware->getCapability(Outputs) ) break;
       str.append("<tr><td><font size=+1 face='Courier New'><b>");
       if(lastCHN!=md->destCh) {
         lastCHN=md->destCh;
         QString chname=tr("CH")+QString("%1  ").arg(lastCHN,2,10,QChar('0'));
-        if (GetEepromInterface()->getCapability(HasChNames)) {
+        if (firmware->getCapability(HasChNames)) {
           QString name=g_model->limitData[md->destCh-1].name;
           if (!name.isEmpty()) {
             name.append("      ");
@@ -356,16 +357,16 @@ void printDialog::printMixes()
       if (md->carryTrim) str += " " + tr("noTrim");
       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);
+      float scale=firmware->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);
       if (md->mixWarn)  str += " "+tr("Warn")+QString("(%1)").arg(md->mixWarn);
-      if (GetEepromInterface()->getCapability(FlightPhases)) {
+      if (firmware->getCapability(FlightPhases)) {
         if(md->phases) {
-          if (md->phases!=(unsigned int)(1<<GetEepromInterface()->getCapability(FlightPhases))-1) {
+          if (md->phases!=(unsigned int)(1<<firmware->getCapability(FlightPhases))-1) {
             int mask=1;
             int first=0;
-            for (int i=0; i<GetEepromInterface()->getCapability(FlightPhases); i++) {
+            for (int i=0; i<firmware->getCapability(FlightPhases); i++) {
               if (!(md->phases & mask)) {
                 first++;
               }
@@ -378,7 +379,7 @@ void printDialog::printMixes()
             }
             mask=1;
             first=1;
-            for (int j=0; j<GetEepromInterface()->getCapability(FlightPhases);j++) {
+            for (int j=0; j<firmware->getCapability(FlightPhases);j++) {
               if (!(md->phases & mask)) {
                 PhaseData *pd = &g_model->phaseData[j];
                 if (!first) {
@@ -396,7 +397,7 @@ void printDialog::printMixes()
           }
         }
       }
-      if (GetEepromInterface()->getCapability(HasMixerNames)) {
+      if (firmware->getCapability(HasMixerNames)) {
         QString MixerName;
         MixerName.append(md->name);
         if (!MixerName.isEmpty()) {
@@ -409,41 +410,41 @@ void printDialog::printMixes()
     te->append(str);
 }
 
-void printDialog::printLimits()
+void PrintDialog::printLimits()
 {
     QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
     int numcol;
-    numcol=(GetEepromInterface()->getCapability(Outputs)+1)>17 ? 17:GetEepromInterface()->getCapability(Outputs)+1;
+    numcol=(firmware->getCapability(Outputs)+1)>17 ? 17:firmware->getCapability(Outputs)+1;
     str.append(QString("<tr><td colspan=%1><h2>").arg(numcol)+tr("Limits")+"</h2></td></tr>");
     str.append("<tr><td>&nbsp;</td>");
-    if (GetEepromInterface()->getCapability(Outputs)<17) {
-      for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+    if (firmware->getCapability(Outputs)<17) {
+      for(int i=0; i<firmware->getCapability(Outputs); i++) {
         str.append(doTC(tr("CH")+QString(" %1").arg(i+1,2,10,QChar('0')),"",true));
       }
       str.append("</tr>");
-      if (GetEepromInterface()->getCapability(HasChNames)) {
+      if (firmware->getCapability(HasChNames)) {
         str.append("<tr><td><b>"+tr("Name")+"</b></td>");
-        for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+        for(int i=0; i<firmware->getCapability(Outputs); i++) {
           str.append(doTR(g_model->limitData[i].name,"green"));
         }
       }
       str.append("<tr><td><b>"+tr("Offset")+"</b></td>");
-      for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=0; i<firmware->getCapability(Outputs); i++) {
         str.append(doTR(QString::number((qreal)g_model->limitData[i].offset/10, 'f', 1),"green"));
       }
       str.append("</tr>");
       str.append("<tr><td><b>"+tr("Min")+"</b></td>");
-      for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=0; i<firmware->getCapability(Outputs); i++) {
         str.append(doTR(QString::number(g_model->limitData[i].min),"green"));
       }
       str.append("</tr>");
       str.append("<tr><td><b>"+tr("Max")+"</b></td>");
-      for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=0; i<firmware->getCapability(Outputs); i++) {
         str.append(doTR(QString::number(g_model->limitData[i].max),"green"));
       }
       str.append("</tr>");
       str.append("<tr><td><b>"+tr("Invert")+"</b></td>");
-      for(int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=0; i<firmware->getCapability(Outputs); i++) {
         str.append(doTR(QString(g_model->limitData[i].revert ? tr("INV") : tr("NOR")),"green"));
       }
     } else {
@@ -451,7 +452,7 @@ void printDialog::printLimits()
         str.append(doTC(tr("CH")+QString(" %1").arg(i+1,2,10,QChar('0')),"",true));
       }
       str.append("</tr>");
-      if (GetEepromInterface()->getCapability(HasChNames)) {
+      if (firmware->getCapability(HasChNames)) {
         str.append("<tr><td><b>"+tr("Name")+"</b></td>");
         for(int i=0; i<16; i++) {
           str.append(doTR(g_model->limitData[i].name,"green"));
@@ -479,33 +480,33 @@ void printDialog::printLimits()
       str.append("</tr>");
       str.append(QString("<tr><td colspan=%1>&nbsp;").arg(numcol)+"</td></tr>");
       str.append("<tr><td>&nbsp;</td>");
-      for(int i=16; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=16; i<firmware->getCapability(Outputs); i++) {
         str.append(doTC(tr("CH")+QString(" %1").arg(i+1,2,10,QChar('0')),"",true));
       }
       str.append("</tr>");
-      if (GetEepromInterface()->getCapability(HasChNames)) {
+      if (firmware->getCapability(HasChNames)) {
         str.append("<tr><td><b>"+tr("Name")+"</b></td>");
-        for(int i=16; i<GetEepromInterface()->getCapability(Outputs); i++) {
+        for(int i=16; i<firmware->getCapability(Outputs); i++) {
           str.append(doTR(g_model->limitData[i].name,"green"));
         }
       }
       str.append("<tr><td><b>"+tr("Offset")+"</b></td>");
-      for(int i=16; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=16; i<firmware->getCapability(Outputs); i++) {
         str.append(doTR(QString::number((qreal)g_model->limitData[i].offset/10, 'f', 1),"green"));
       }
       str.append("</tr>");
       str.append("<tr><td><b>"+tr("Min")+"</b></td>");
-      for(int i=16; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=16; i<firmware->getCapability(Outputs); i++) {
         str.append(doTR(QString::number(g_model->limitData[i].min),"green"));
       }
       str.append("</tr>");
       str.append("<tr><td><b>"+tr("Max")+"</b></td>");
-      for(int i=16; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=16; i<firmware->getCapability(Outputs); i++) {
         str.append(doTR(QString::number(g_model->limitData[i].max),"green"));
       }
       str.append("</tr>");
       str.append("<tr><td><b>"+tr("Invert")+"</b></td>");
-      for(int i=16; i<GetEepromInterface()->getCapability(Outputs); i++) {
+      for(int i=16; i<firmware->getCapability(Outputs); i++) {
         str.append(doTR(QString(g_model->limitData[i].revert ? tr("INV") : tr("NOR")),"green"));
       }
     }
@@ -515,7 +516,7 @@ void printDialog::printLimits()
     te->append(str);
 }
 
-void printDialog::printCurves()
+void PrintDialog::printCurves()
 {
     int i,r,g,b,c,count;
     char buffer[16];
@@ -524,7 +525,7 @@ void printDialog::printCurves()
     QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-before:auto;\" width=\"100%\"><tr><td><h2>";
     str.append(tr("Curves"));
     str.append("</h2></td></tr><tr><td>");
-    int numcurves=GetEepromInterface()->getCapability(NumCurves);
+    int numcurves=firmware->getCapability(NumCurves);
     if (numcurves==0) {
       numcurves=16;
     }
@@ -622,14 +623,14 @@ void printDialog::printCurves()
     te->append(str);
 }
 
-void printDialog::printSwitches()
+void PrintDialog::printSwitches()
 {
     int sc=0;
     QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
     str.append("<tr><td><h2>"+tr("Logical Switches")+"</h2></td></tr>");
     str.append("<tr><td><table border=0 cellspacing=0 cellpadding=3>");
 
-    for (int i=0; i<GetEepromInterface()->getCapability(LogicalSwitches); i++) {
+    for (int i=0; i<firmware->getCapability(LogicalSwitches); i++) {
       if (g_model->customSw[i].func) {
         str.append("<tr>");
         if (i<9) {
@@ -649,15 +650,15 @@ void printDialog::printSwitches()
       te->append(str);
 }
 
-void printDialog::printGvars()
+void PrintDialog::printGvars()
 {
   int gvars=0;
   int gvarnum=0;
-  if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetEepromInterface()->getCapability(HasVariants) && GetEepromInterface()->getCapability(Gvars))) {
+  if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!firmware->getCapability(HasVariants) && firmware->getCapability(Gvars))) {
     gvars=1;
-    gvarnum=GetEepromInterface()->getCapability(Gvars);
+    gvarnum=firmware->getCapability(Gvars);
   }
-  if (!GetEepromInterface()->getCapability(GvarsFlightPhases) && (gvars==1 && GetEepromInterface()->getCapability(Gvars))) {
+  if (!firmware->getCapability(GvarsFlightPhases) && (gvars==1 && firmware->getCapability(Gvars))) {
     QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
     str.append("<tr><td><h2>"+tr("Global Variables")+"</h2></td></tr>");
     str.append("<tr><td><table border=1 cellspacing=0 cellpadding=3 width=100>");
@@ -679,7 +680,7 @@ void printDialog::printGvars()
   }
 }
 
-void printDialog::printFSwitches()
+void PrintDialog::printFSwitches()
 {
     int sc=0;
     QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
@@ -691,7 +692,7 @@ void printDialog::printFSwitches()
     str.append(doTL(tr("Repeat"), "", true));
     str.append(doTL(tr("Enabled"), "", true));
     str.append("</tr>");
-    for(int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
+    for(int i=0; i<firmware->getCapability(CustomFunctions); i++) {
       if (g_model->funcSw[i].swtch.type!=SWITCH_TYPE_NONE) {
           str.append("<tr>");
           str.append(doTC(g_model->funcSw[i].swtch.toString(),"green"));
@@ -718,7 +719,7 @@ void printDialog::printFSwitches()
       te->append(str);
 }
 
-void printDialog::printFrSky()
+void PrintDialog::printFrSky()
 {
   int tc=0;
   QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
@@ -756,10 +757,10 @@ void printDialog::printFrSky()
   str.append("<tr><td colspan=2 align=\"Left\"><b>"+tr("Blades")+"</b></td><td colspan=8 align=\"left\">"+fd->blades+"</td></tr>");
   str.append("<tr><td colspan=10 align=\"Left\" height=\"4px\"></td></tr></table>");
 #if 0
-  if (GetEepromInterface()->getCapability(TelemetryBars) || (GetEepromInterface()->getCapability(TelemetryCSFields))) {
-    int cols=GetEepromInterface()->getCapability(TelemetryColsCSFields);
+  if (firmware->getCapability(TelemetryBars) || (firmware->getCapability(TelemetryCSFields))) {
+    int cols=firmware->getCapability(TelemetryColsCSFields);
     if (cols==0) cols=2;
-    for (int j=0; j<GetEepromInterface()->getCapability(TelemetryCSFields)/(4*cols); j++ ) {
+    for (int j=0; j<firmware->getCapability(TelemetryCSFields)/(4*cols); j++ ) {
       if (fd->screens[j].type==0) {
         if (cols==2) {
           str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=3 align=\"Left\"><b>"+tr("Custom Telemetry View")+"</b></td></tr>");
@@ -804,7 +805,7 @@ void printDialog::printFrSky()
       te->append(str);    
 }
 
-void printDialog::on_printButton_clicked()
+void PrintDialog::on_printButton_clicked()
 {
     QPrinter printer;
     printer.setPageMargins(10.0,10.0,10.0,10.0,printer.Millimeter);
@@ -815,7 +816,7 @@ void printDialog::on_printButton_clicked()
     te->print(&printer);
 }
 
-void printDialog::on_printFileButton_clicked()
+void PrintDialog::on_printFileButton_clicked()
 {
     QString fn = QFileDialog::getSaveFileName(this,tr("Select PDF output file"),QString(),tr("ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*)")); 
     if (fn.isEmpty())
@@ -835,7 +836,7 @@ void printDialog::on_printFileButton_clicked()
     }
 }
 
-void printDialog::printToFile()
+void PrintDialog::printToFile()
 {
     if (printfilename.isEmpty())
       return;
@@ -854,7 +855,7 @@ void printDialog::printToFile()
     }
 }
 
-void printDialog::autoClose()
+void PrintDialog::autoClose()
 {
   this->close();
 }
diff --git a/companion/src/printdialog.h b/companion/src/printdialog.h
index 81e59b24d..8209db326 100644
--- a/companion/src/printdialog.h
+++ b/companion/src/printdialog.h
@@ -7,26 +7,27 @@
 #include "eeprominterface.h"
 
 namespace Ui {
-    class printDialog;
+  class PrintDialog;
 }
 
-class printDialog : public QDialog
+class PrintDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit printDialog(QWidget *parent = 0, GeneralSettings *gg = 0, ModelData *gm = 0, QString filename="");
+    explicit PrintDialog(QWidget *parent, FirmwareInterface * firmware, GeneralSettings *gg, ModelData *gm, QString filename="");
     
-    ~printDialog();
+    ~PrintDialog();
     void  closeEvent(QCloseEvent *event);
     
-    ModelData *g_model;
-    GeneralSettings *g_eeGeneral;
-    EEPROMInterface *eepromInterface;
+    FirmwareInterface * firmware;
+    GeneralSettings * g_eeGeneral;
+    ModelData * g_model;
+
     QString printfilename;
 
 private:
-    Ui::printDialog *ui;
+    Ui::PrintDialog *ui;
 
     void printSetup();
     QString printPhases();
diff --git a/companion/src/printdialog.ui b/companion/src/printdialog.ui
index b87534676..0f4b05111 100644
--- a/companion/src/printdialog.ui
+++ b/companion/src/printdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>printDialog</class>
- <widget class="QDialog" name="printDialog">
+ <class>PrintDialog</class>
+ <widget class="QDialog" name="PrintDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp
index b6135cac3..be7346be5 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatordialog.cpp
@@ -335,7 +335,7 @@ void SimulatorDialog::initUi(T * ui)
   windowName = tr("Simulating Radio (%1)").arg(txInterface->getName());
   setWindowTitle(windowName);
 
-  simulator = txInterface->getSimulator();
+  simulator = GetCurrentFirmware()->getSimulator();
   lcd->setData(simulator->getLcd(), lcdWidth, 64, lcdDepth);
 
   if (flags & SIMULATOR_FLAGS_STICK_MODE_LEFT) {
@@ -349,7 +349,7 @@ void SimulatorDialog::initUi(T * ui)
 
   setTrims();
 
-  int outputs = std::min(16, txInterface->getCapability(Outputs));
+  int outputs = std::min(16, GetCurrentFirmware()->getCapability(Outputs));
   for (int i=0; i<outputs; i++) {
     int column = i / (outputs/2);
     int line = i % (outputs/2);
@@ -390,7 +390,7 @@ void SimulatorDialog::initUi(T * ui)
     channelsLayout->addWidget(value, line, column == 0 ? 2 : 3, 1, 1);
   }
 
-  int switches = txInterface->getCapability(LogicalSwitches);
+  int switches = GetCurrentFirmware()->getCapability(LogicalSwitches);
   for (int i=0; i<switches; i++) {
     QFrame * swtch = new QFrame(tabWidget);
     swtch->setAutoFillBackground(true);
@@ -689,7 +689,7 @@ void SimulatorDialog::setValues()
   Trims trims;
   simulator->getTrims(trims);
 
-  for (int i=0; i<std::min(16, GetEepromInterface()->getCapability(Outputs)); i++) {
+  for (int i=0; i<std::min(16, GetCurrentFirmware()->getCapability(Outputs)); i++) {
     channelSliders[i]->setValue(chVal(outputs.chans[i]));
     channelValues[i]->setText(QString("%1").arg((qreal)outputs.chans[i]*100/1024, 0, 'f', 1));
   }
@@ -703,7 +703,7 @@ void SimulatorDialog::setValues()
   QString CSWITCH_ON = "QLabel { background-color: #4CC417 }";
   QString CSWITCH_OFF = "QLabel { }";
 
-  for (int i=0; i<GetEepromInterface()->getCapability(LogicalSwitches); i++) {
+  for (int i=0; i<GetCurrentFirmware()->getCapability(LogicalSwitches); i++) {
     logicalSwitchLabels[i]->setStyleSheet(outputs.vsw[i] ? CSWITCH_ON : CSWITCH_OFF);
   }
 
diff --git a/companion/src/simulator.cpp b/companion/src/simulator.cpp
index 1d61c698a..0bd5e4649 100644
--- a/companion/src/simulator.cpp
+++ b/companion/src/simulator.cpp
@@ -99,7 +99,9 @@ int main(int argc, char *argv[])
 
   QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 
-  RegisterFirmwares();
+  RegisterEepromInterfaces();
+  registerOpenTxFirmwares();
+
   SimulatorDialog *dialog;
   const char * eepromFileName;
   QString fileName;
diff --git a/companion/src/translations/companion_de.ts b/companion/src/translations/companion_de.ts
index 55f4866df..86faf6c41 100644
--- a/companion/src/translations/companion_de.ts
+++ b/companion/src/translations/companion_de.ts
@@ -120,7 +120,7 @@
     <message>
         <location filename="../modeledit/channels.cpp" line="30"/>
         <source>Linear Subtrim</source>
-        <translation>Mitte Mode</translation>
+        <translation>Lineare Mitte</translation>
     </message>
     <message>
         <location filename="../modeledit/channels.cpp" line="37"/>
@@ -149,22 +149,22 @@
 <context>
     <name>CurveGroup</name>
     <message>
-        <location filename="../helpers.cpp" line="223"/>
+        <location filename="../helpers.cpp" line="222"/>
         <source>Diff</source>
         <translation>Diff</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="224"/>
+        <location filename="../helpers.cpp" line="223"/>
         <source>Expo</source>
         <translation>Expo</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="225"/>
+        <location filename="../helpers.cpp" line="224"/>
         <source>Func</source>
         <translation>Funktion</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="226"/>
+        <location filename="../helpers.cpp" line="225"/>
         <source>Curve</source>
         <translation>Kurve</translation>
     </message>
@@ -172,26 +172,19 @@
 <context>
     <name>Curves</name>
     <message>
+        <location filename="../modeledit/curves.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>Standard</source>
-        <translation type="obsolete">Nur Y Werte</translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="obsolete">X und Y</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="68"/>
-        <source>Fixed X</source>
-        <translation type="unfinished"></translation>
+        <source>Standard</source>
+        <translation>Nur Y Werte</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="73"/>
-        <source>Custom X</source>
-        <translation type="unfinished"></translation>
+        <source>Custom</source>
+        <translation>X und Y</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="82"/>
@@ -313,83 +306,83 @@
 <context>
     <name>CustomFunctionsPanel</name>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="62"/>
+        <location filename="../modeledit/customfunctions.cpp" line="59"/>
         <source>Switch</source>
         <translation>Schalter</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="63"/>
+        <location filename="../modeledit/customfunctions.cpp" line="60"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="64"/>
+        <location filename="../modeledit/customfunctions.cpp" line="61"/>
         <source>Parameters</source>
         <translation>Parameter</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="65"/>
+        <location filename="../modeledit/customfunctions.cpp" line="62"/>
         <source>Enable</source>
         <translation>Aktivieren</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="112"/>
+        <location filename="../modeledit/customfunctions.cpp" line="109"/>
         <source>SF%1</source>
         <translatorcomment>SF%1</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="181"/>
+        <location filename="../modeledit/customfunctions.cpp" line="178"/>
         <source>ON</source>
         <translation>EIN</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="245"/>
+        <location filename="../modeledit/customfunctions.cpp" line="242"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="245"/>
+        <location filename="../modeledit/customfunctions.cpp" line="242"/>
         <source>Unable to find sound file %1!</source>
         <translation>Kann das Soundfile %1 nicht finden</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="552"/>
+        <location filename="../modeledit/customfunctions.cpp" line="549"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="552"/>
+        <location filename="../modeledit/customfunctions.cpp" line="549"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="553"/>
+        <location filename="../modeledit/customfunctions.cpp" line="550"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="553"/>
+        <location filename="../modeledit/customfunctions.cpp" line="550"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="554"/>
+        <location filename="../modeledit/customfunctions.cpp" line="551"/>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="554"/>
+        <location filename="../modeledit/customfunctions.cpp" line="551"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="555"/>
+        <location filename="../modeledit/customfunctions.cpp" line="552"/>
         <source>&amp;Paste</source>
         <translation>Ein&amp;fügen</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="555"/>
+        <location filename="../modeledit/customfunctions.cpp" line="552"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
@@ -426,13 +419,14 @@
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="66"/>
-        <location filename="../modeledit/expodialog.ui" line="395"/>
+        <location filename="../modeledit/expodialog.ui" line="405"/>
         <source>GV</source>
         <translation>GV</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="36"/>
         <source>The source for the mixer</source>
-        <translation type="obsolete">Die Mischerquelle</translation>
+        <translation>Die Mischerquelle</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="43"/>
@@ -440,8 +434,9 @@
         <translation>Input Name</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="76"/>
         <source>Phase used by the input.</source>
-        <translation type="obsolete">Flugfphase benutzt als Input</translation>
+        <translation>Flugfphase benutzt als Input</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="98"/>
@@ -449,40 +444,49 @@
         <translation>Flugphasen</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="107"/>
         <source>0</source>
-        <translation type="obsolete">0</translation>
+        <translation>0</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="117"/>
         <source>1</source>
-        <translation type="obsolete">1</translation>
+        <translation>1</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="127"/>
         <source>2</source>
-        <translation type="obsolete">2</translation>
+        <translation>2</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="137"/>
         <source>3</source>
-        <translation type="obsolete">3</translation>
+        <translation>3</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="147"/>
         <source>4</source>
-        <translation type="obsolete">4</translation>
+        <translation>4</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="157"/>
         <source>5</source>
-        <translation type="obsolete">5</translation>
+        <translation>5</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="167"/>
         <source>6</source>
-        <translation type="obsolete">6</translation>
+        <translation>6</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="177"/>
         <source>7</source>
-        <translation type="obsolete">7</translation>
+        <translation>7</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="187"/>
         <source>8</source>
-        <translation type="obsolete">8</translation>
+        <translation>8</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="262"/>
@@ -490,12 +494,22 @@
         <translation>Schalter</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="414"/>
+        <location filename="../modeledit/expodialog.ui" line="269"/>
+        <source>Switch used by the input.If blank then the input is considered to be &quot;ON&quot; all the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../modeledit/expodialog.ui" line="398"/>
+        <source>The curve used by the input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../modeledit/expodialog.ui" line="424"/>
         <source>Source</source>
         <translation>Quelle</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="421"/>
+        <location filename="../modeledit/expodialog.ui" line="431"/>
         <source>Line name</source>
         <translation>Info Name</translation>
     </message>
@@ -505,6 +519,7 @@
         <translation>Knüppel Seite</translation>
     </message>
     <message>
+        <location filename="../modeledit/expodialog.ui" line="335"/>
         <source>&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; }
@@ -516,7 +531,7 @@ p, li { white-space: pre-wrap; }
 &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;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <translation type="unfinished">&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:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -530,51 +545,35 @@ p, li { white-space: pre-wrap; }
 Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100 benötigen soll.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="348"/>
+        <location filename="../modeledit/expodialog.ui" line="358"/>
         <source>Scale</source>
         <translation>Gewichtung</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="355"/>
+        <location filename="../modeledit/expodialog.ui" line="365"/>
         <source>Include Trim</source>
         <translation>Trimmung einschliessen</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="363"/>
+        <location filename="../modeledit/expodialog.ui" line="373"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="368"/>
+        <location filename="../modeledit/expodialog.ui" line="378"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../modeledit/expodialog.ui" line="376"/>
+        <location filename="../modeledit/expodialog.ui" line="386"/>
         <source>Curve</source>
         <translation>Kurve</translation>
     </message>
-    <message>
-        <location filename="../modeledit/expodialog.ui" line="388"/>
-        <source>Curve applied to the source.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="285"/>
         <source>NEG</source>
         <translation>NEG</translation>
     </message>
-    <message>
-        <location filename="../modeledit/expodialog.ui" line="36"/>
-        <source>Source for the mixer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/expodialog.ui" line="269"/>
-        <source>Switch used to enable the line.
-If blank then the input is considered to be &quot;ON&quot; all the time.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="290"/>
         <source>POS</source>
@@ -613,14 +612,10 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</source
 </context>
 <context>
     <name>FblPage</name>
-    <message>
-        <source>Trottle Channel:</source>
-        <translation type="obsolete">Gas Kanal</translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="739"/>
-        <source>Throttle Channel:</source>
-        <translation type="unfinished"></translation>
+        <source>Trottle Channel:</source>
+        <translation>Gas Kanal</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="741"/>
@@ -658,7 +653,7 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</source
     <message>
         <location filename="../wizarddialog.cpp" line="455"/>
         <source>&lt;br&gt;First Flap Channel:</source>
-        <translation>&lt;br&gt; Erster, rechter Flpa Kanal</translation>
+        <translation>&lt;br&gt; Erster, rechter Flap Kanal</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="457"/>
@@ -669,8 +664,9 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</source
 <context>
     <name>FlightMode</name>
     <message>
+        <location filename="../modeledit/flightmode.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmode.ui" line="22"/>
@@ -693,20 +689,24 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</source
         <translation>Schalter</translation>
     </message>
     <message>
+        <location filename="../modeledit/flightmode.ui" line="172"/>
         <source>trim1</source>
-        <translation type="obsolete">Trim1</translation>
+        <translation>Trim1</translation>
     </message>
     <message>
+        <location filename="../modeledit/flightmode.ui" line="280"/>
         <source>trim2</source>
-        <translation type="obsolete">Trim2</translation>
+        <translation>Trim2</translation>
     </message>
     <message>
+        <location filename="../modeledit/flightmode.ui" line="306"/>
         <source>trim4</source>
-        <translation type="obsolete">Trim4</translation>
+        <translation>Trim4</translation>
     </message>
     <message>
+        <location filename="../modeledit/flightmode.ui" line="316"/>
         <source>trim3</source>
-        <translation type="obsolete">Trim3</translation>
+        <translation>Trim3</translation>
     </message>
     <message>
         <location filename="../modeledit/flightmodes.cpp" line="60"/>
@@ -738,28 +738,23 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</source
         <source>GVAR%1</source>
         <translation>GVAR%1</translation>
     </message>
-    <message>
-        <location filename="../modeledit/flightmodes.cpp" line="164"/>
-        <source>Popup enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlightModes</name>
     <message>
-        <location filename="../modeledit/flightmodes.cpp" line="450"/>
+        <location filename="../modeledit/flightmodes.cpp" line="431"/>
         <source>Flight Mode %1</source>
         <translation>Flugphase %1</translation>
     </message>
     <message>
-        <location filename="../modeledit/flightmodes.cpp" line="453"/>
+        <location filename="../modeledit/flightmodes.cpp" line="434"/>
         <source> (%1)</source>
         <translation>(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/flightmodes.cpp" line="456"/>
+        <location filename="../modeledit/flightmodes.cpp" line="437"/>
         <source> (default)</source>
-        <translation></translation>
+        <translation>(default)</translation>
     </message>
 </context>
 <context>
@@ -800,12 +795,13 @@ Dieses sind für alle Modelle im gleichen EEPROM gültig.</translation>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1547"/>
+        <location filename="../generaledit.ui" line="1549"/>
         <source>Contrast</source>
         <translation>Kontrast</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="890"/>
+        <location filename="../generaledit.ui" line="892"/>
+        <location filename="../generaledit.ui" line="1631"/>
         <source>&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; }
@@ -831,23 +827,17 @@ Die Werte können sein</translation>
         <translation>Lautstärke (nur PiSpkr)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1537"/>
+        <location filename="../generaledit.ui" line="1539"/>
         <source>Battery Warning</source>
-        <translation>Batteriewarnung</translation>
+        <translation>Sender Akkuwarnung</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1657"/>
-        <source>Battery warning voltage.
-This is the threashhold where the battery warning sounds.
-
-Acceptable values are 5v..10v</source>
-        <translation>Warnung Batteriespannung.
-Dies ist die Warnschwelle bei der die  Batteriewarnung piepst
-
-Mögliche Werte von 5V..10V</translation>
+        <location filename="../generaledit.ui" line="1664"/>
+        <source>Battery warning voltage. This is the threashhold where the battery warning sounds. Acceptable values are 5v..10v</source>
+        <translation>Warnung Akkuspannung. Dies ist die Warnschwelle bei der die  Akkuwarnung piepst Mögliche Werte von 5V..10V</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1701"/>
+        <location filename="../generaledit.ui" line="1708"/>
         <source>This is the switch selectrion for turning on the backlight (if installed).
 
 </source>
@@ -856,18 +846,18 @@ Mögliche Werte von 5V..10V</translation>
 </translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1811"/>
+        <location filename="../generaledit.ui" line="1818"/>
         <source>If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.</source>
         <translation>Wenn dieser Wert ungleich 0 ist, wird die Hintergrundbeleuchtung nach irgendeinem Tastendruck eingeschaltet
 und nach einer eingestellten Zeit in Sekunden ausgeschaltet.</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1814"/>
+        <location filename="../generaledit.ui" line="1821"/>
         <source> sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1589"/>
+        <location filename="../generaledit.ui" line="1591"/>
         <source>Inactivity Timer</source>
         <translation>Inaktivitätstimer</translation>
     </message>
@@ -882,19 +872,19 @@ und nach einer eingestellten Zeit in Sekunden ausgeschaltet.</translation>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1527"/>
+        <location filename="../generaledit.ui" line="1529"/>
         <source>Show Splash Screen on Startup</source>
         <translation>Zeige Startbildschirm während Start</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1727"/>
-        <location filename="../generaledit.ui" line="1730"/>
+        <location filename="../generaledit.ui" line="1734"/>
+        <location filename="../generaledit.ui" line="1737"/>
         <source>Show splash screen on startup</source>
         <translation>Zeige Startbildschirm während Start</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1498"/>
-        <location filename="../generaledit.ui" line="1566"/>
+        <location filename="../generaledit.ui" line="1500"/>
+        <location filename="../generaledit.ui" line="1568"/>
         <source>&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; }
@@ -915,14 +905,16 @@ Warnung stummer Betrieb - Wird angezeigt, wenn der Piepser ausgeschaltet ist
 </translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="543"/>
         <source>Channel Order (For Templates)</source>
-        <translation type="obsolete">Kanalanordnung</translation>
+        <translation>Kanalanordnung (für Templates)</translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="686"/>
         <source>Channel order
 
 This is used by the templated to determine which channel goes to what number output.</source>
-        <translation type="obsolete">Kanalanordung
+        <translation>Kanalanordung
 
 Damit werden die Kanäle den Ausgängen zugeordnet.</translation>
     </message>
@@ -993,23 +985,23 @@ Mode 4:
         <translation>Mode 4 (Que Gas Höh Sei)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="911"/>
+        <location filename="../generaledit.ui" line="913"/>
         <source>Beeper Mode</source>
         <translation>Modus Piepser</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="453"/>
-        <location filename="../generaledit.ui" line="1969"/>
-        <location filename="../generaledit.ui" line="2003"/>
-        <location filename="../generaledit.ui" line="2074"/>
-        <location filename="../generaledit.ui" line="2108"/>
-        <location filename="../generaledit.ui" line="2147"/>
-        <location filename="../generaledit.ui" line="2218"/>
-        <location filename="../generaledit.ui" line="2265"/>
-        <location filename="../generaledit.ui" line="2299"/>
-        <location filename="../generaledit.ui" line="3052"/>
-        <location filename="../generaledit.ui" line="3093"/>
-        <location filename="../generaledit.ui" line="3141"/>
+        <location filename="../generaledit.ui" line="1976"/>
+        <location filename="../generaledit.ui" line="2010"/>
+        <location filename="../generaledit.ui" line="2081"/>
+        <location filename="../generaledit.ui" line="2115"/>
+        <location filename="../generaledit.ui" line="2154"/>
+        <location filename="../generaledit.ui" line="2225"/>
+        <location filename="../generaledit.ui" line="2272"/>
+        <location filename="../generaledit.ui" line="2306"/>
+        <location filename="../generaledit.ui" line="3059"/>
+        <location filename="../generaledit.ui" line="3100"/>
+        <location filename="../generaledit.ui" line="3148"/>
         <source>Beeper volume
 
 0 - Quiet.  No beeps at all.
@@ -1035,7 +1027,7 @@ Mode 4:
         <location filename="../generaledit.ui" line="473"/>
         <location filename="../generaledit.ui" line="497"/>
         <source>No Keys</source>
-        <translation>Kein Tastaturpieps</translation>
+        <translation>Kein Tastenpieps</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="588"/>
@@ -1050,62 +1042,62 @@ Mode 4:
         <translation>Lange</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1979"/>
-        <location filename="../generaledit.ui" line="2084"/>
-        <location filename="../generaledit.ui" line="2228"/>
-        <location filename="../generaledit.ui" line="2275"/>
+        <location filename="../generaledit.ui" line="1986"/>
+        <location filename="../generaledit.ui" line="2091"/>
+        <location filename="../generaledit.ui" line="2235"/>
+        <location filename="../generaledit.ui" line="2282"/>
         <source>Off</source>
         <translation>Aus</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1904"/>
+        <location filename="../generaledit.ui" line="1911"/>
         <source>Trainer</source>
         <translation>Trainer</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2445"/>
+        <location filename="../generaledit.ui" line="2452"/>
         <source>PPM 1</source>
         <translation>PPM 1</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2013"/>
-        <location filename="../generaledit.ui" line="2118"/>
-        <location filename="../generaledit.ui" line="2157"/>
-        <location filename="../generaledit.ui" line="2309"/>
+        <location filename="../generaledit.ui" line="2020"/>
+        <location filename="../generaledit.ui" line="2125"/>
+        <location filename="../generaledit.ui" line="2164"/>
+        <location filename="../generaledit.ui" line="2316"/>
         <source>chn1</source>
         <translation>Kanal 1</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1956"/>
+        <location filename="../generaledit.ui" line="1963"/>
         <source>Rud</source>
         <translation>Sei</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2018"/>
-        <location filename="../generaledit.ui" line="2123"/>
-        <location filename="../generaledit.ui" line="2162"/>
-        <location filename="../generaledit.ui" line="2314"/>
+        <location filename="../generaledit.ui" line="2025"/>
+        <location filename="../generaledit.ui" line="2130"/>
+        <location filename="../generaledit.ui" line="2169"/>
+        <location filename="../generaledit.ui" line="2321"/>
         <source>chn2</source>
         <translation>Kanal 2</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2023"/>
-        <location filename="../generaledit.ui" line="2128"/>
-        <location filename="../generaledit.ui" line="2167"/>
-        <location filename="../generaledit.ui" line="2319"/>
+        <location filename="../generaledit.ui" line="2030"/>
+        <location filename="../generaledit.ui" line="2135"/>
+        <location filename="../generaledit.ui" line="2174"/>
+        <location filename="../generaledit.ui" line="2326"/>
         <source>chn3</source>
         <translation>Kanal 3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2028"/>
-        <location filename="../generaledit.ui" line="2133"/>
-        <location filename="../generaledit.ui" line="2172"/>
-        <location filename="../generaledit.ui" line="2324"/>
+        <location filename="../generaledit.ui" line="2035"/>
+        <location filename="../generaledit.ui" line="2140"/>
+        <location filename="../generaledit.ui" line="2179"/>
+        <location filename="../generaledit.ui" line="2331"/>
         <source>chn4</source>
         <translation>Kanal 3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1929"/>
+        <location filename="../generaledit.ui" line="1936"/>
         <source>Mode</source>
         <translation>Modus</translation>
     </message>
@@ -1159,7 +1151,7 @@ Mode 4:
         <translation>Haptik Länge</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="828"/>
+        <location filename="../generaledit.ui" line="830"/>
         <source>GPS Coordinates</source>
         <translation>GPS Koordinaten</translation>
     </message>
@@ -1181,40 +1173,40 @@ Mode 4:
     <message>
         <location filename="../generaledit.ui" line="617"/>
         <source>BeeperVoice</source>
-        <translation type="unfinished"></translation>
+        <translation>Beeper Stimme</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="622"/>
         <source>SpeakerVoice</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprecher Stimme</translation>
     </message>
     <message utf8="true">
-        <location filename="../generaledit.ui" line="836"/>
+        <location filename="../generaledit.ui" line="838"/>
         <source>hh° (N/S) mm&apos; ss&apos;&apos;.dd</source>
         <translation>GMS hh° (N/S) mm&apos; ss&apos;&apos;.dd</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="841"/>
+        <location filename="../generaledit.ui" line="843"/>
         <source>NMEA</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="918"/>
+        <location filename="../generaledit.ui" line="920"/>
         <source>Timeshift from UTC</source>
         <translation>Zeitverschiebung von UTC</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1610"/>
+        <location filename="../generaledit.ui" line="1612"/>
         <source>LCD Display Type</source>
         <translation>LCD Display Typ</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1597"/>
+        <location filename="../generaledit.ui" line="1599"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1602"/>
+        <location filename="../generaledit.ui" line="1604"/>
         <source>Optrex</source>
         <translation>Optrex LCD</translation>
     </message>
@@ -1229,22 +1221,22 @@ Mode 4:
         <translation>Haptik Stärke</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1865"/>
+        <location filename="../generaledit.ui" line="1872"/>
         <source>BackLight Brightness</source>
         <translation>Helligkeit der Hintergrundbeleuchtung</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1896"/>
+        <location filename="../generaledit.ui" line="1903"/>
         <source>RotEnc Navigation</source>
         <translation>Drehgeber Navigation</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1879"/>
+        <location filename="../generaledit.ui" line="1886"/>
         <source>BackLight  Auto OFF after</source>
         <translation>Automatische Hintergrundbeleuchtung AUS nach</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1688"/>
+        <location filename="../generaledit.ui" line="1695"/>
         <source>BackLight Switch</source>
         <translation>Schalter Hintergrundbeleuchtung</translation>
     </message>
@@ -1276,7 +1268,7 @@ Mode 4:
     <message>
         <location filename="../generaledit.ui" line="256"/>
         <source>Beep volume</source>
-        <translation>Piepser lautstärke</translation>
+        <translation>Piepser Lautstärke</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="279"/>
@@ -1294,7 +1286,7 @@ Mode 4:
         <translation>Hintergrundlautstärke</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="864"/>
+        <location filename="../generaledit.ui" line="866"/>
         <source>Measurement Units</source>
         <translation>Maßeinheiten</translation>
     </message>
@@ -1359,12 +1351,12 @@ Mode 4:
         <translation></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="816"/>
+        <location filename="../generaledit.ui" line="818"/>
         <source>If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="693"/>
+        <location filename="../generaledit.ui" line="695"/>
         <source>R E T A</source>
         <translation>S H G Q</translation>
     </message>
@@ -1374,471 +1366,429 @@ Mode 4:
         <translation>Vario Frequenz bei Min</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="698"/>
+        <location filename="../generaledit.ui" line="700"/>
         <source>R E A T</source>
         <translation>S H Q G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="703"/>
+        <location filename="../generaledit.ui" line="705"/>
         <source>R T E A</source>
         <translation>S G H Q</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="708"/>
+        <location filename="../generaledit.ui" line="710"/>
         <source>R T A E</source>
         <translation>S G Q H</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="713"/>
+        <location filename="../generaledit.ui" line="715"/>
         <source>R A E T</source>
         <translation>S Q H G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="718"/>
+        <location filename="../generaledit.ui" line="720"/>
         <source>R A T E</source>
         <translation>S Q G H</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="723"/>
+        <location filename="../generaledit.ui" line="725"/>
         <source>E R T A</source>
         <translation>H S G Q</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="728"/>
+        <location filename="../generaledit.ui" line="730"/>
         <source>E R A T</source>
         <translation>H S Q G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="733"/>
+        <location filename="../generaledit.ui" line="735"/>
         <source>E T R A</source>
         <translation>H G S Q</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="738"/>
+        <location filename="../generaledit.ui" line="740"/>
         <source>E T A R</source>
         <translation>H G Q S</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="743"/>
+        <location filename="../generaledit.ui" line="745"/>
         <source>E A R T</source>
         <translation>H Q S G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="748"/>
+        <location filename="../generaledit.ui" line="750"/>
         <source>E A T R</source>
         <translation>H Q G S</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="753"/>
+        <location filename="../generaledit.ui" line="755"/>
         <source>T R E A</source>
         <translation>G S H Q</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="758"/>
+        <location filename="../generaledit.ui" line="760"/>
         <source>T R A E</source>
         <translation>G S Q H</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="763"/>
+        <location filename="../generaledit.ui" line="765"/>
         <source>T E R A</source>
         <translation>G H S Q</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="768"/>
+        <location filename="../generaledit.ui" line="770"/>
         <source>T E A R</source>
         <translation>G H Q S</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="773"/>
+        <location filename="../generaledit.ui" line="775"/>
         <source>T A R E</source>
         <translation>G Q S H</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="778"/>
+        <location filename="../generaledit.ui" line="780"/>
         <source>T A E R</source>
         <translation>G Q H S</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="783"/>
+        <location filename="../generaledit.ui" line="785"/>
         <source>A R E T</source>
         <translation>Q S H G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="788"/>
+        <location filename="../generaledit.ui" line="790"/>
         <source>A R T E</source>
         <translation>Q S G H</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="793"/>
+        <location filename="../generaledit.ui" line="795"/>
         <source>A E R T</source>
         <translation>Q H S G</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="798"/>
+        <location filename="../generaledit.ui" line="800"/>
         <source>A E T R</source>
         <translation>Q H G S</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="803"/>
+        <location filename="../generaledit.ui" line="805"/>
         <source>A T R E</source>
         <translation>Q G S H</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="808"/>
+        <location filename="../generaledit.ui" line="810"/>
         <source>A T E R</source>
         <translation>Q G H S</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3128"/>
+        <location filename="../generaledit.ui" line="3135"/>
         <source>S3 Type</source>
         <translation>S3-Type</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3170"/>
+        <location filename="../generaledit.ui" line="3177"/>
         <source>OFF</source>
         <translation>AUS</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3175"/>
+        <location filename="../generaledit.ui" line="3182"/>
         <source>S-Port Mirror</source>
         <translation>S_Port Ausgang</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3180"/>
+        <location filename="../generaledit.ui" line="3187"/>
         <source>Debug</source>
         <translation>Debugmode</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3188"/>
+        <location filename="../generaledit.ui" line="3195"/>
         <source>Serial Port</source>
         <translation>Serielle Schnittstelle</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="392"/>
         <source>Readonly Unlock</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibschutz freigeben</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="543"/>
-        <source>Default Channel Order</source>
-        <translation type="unfinished">Standardeinstellung Kanalzuordnung</translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="686"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="942"/>
+        <location filename="../generaledit.ui" line="944"/>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1004"/>
+        <location filename="../generaledit.ui" line="1006"/>
         <source>SE</source>
         <translation>SE</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1299"/>
+        <location filename="../generaledit.ui" line="1301"/>
         <source>SA</source>
         <translation>SA</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1315"/>
+        <location filename="../generaledit.ui" line="1317"/>
         <source>SF</source>
         <translation>SF</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1331"/>
+        <location filename="../generaledit.ui" line="1333"/>
         <source>SH</source>
         <translation>SH</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1347"/>
+        <location filename="../generaledit.ui" line="1349"/>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1363"/>
+        <location filename="../generaledit.ui" line="1365"/>
         <source>SB</source>
         <translation>SB</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1428"/>
+        <location filename="../generaledit.ui" line="1430"/>
         <source>SG</source>
         <translation>SG</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1453"/>
-        <location filename="../generaledit.ui" line="1827"/>
+        <location filename="../generaledit.ui" line="1455"/>
+        <location filename="../generaledit.ui" line="1834"/>
         <source> Hz</source>
         <translation>Hz</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1472"/>
+        <location filename="../generaledit.ui" line="1474"/>
         <source>&quot;No Sound&quot; Warning</source>
         <translation>Keine Sound Warnung</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1479"/>
+        <location filename="../generaledit.ui" line="1481"/>
         <source>Low Memory Warning</source>
         <translation>Low Memory Warnung</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1747"/>
+        <location filename="../generaledit.ui" line="1754"/>
         <source>---</source>
         <translation>---</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1752"/>
+        <location filename="../generaledit.ui" line="1759"/>
         <source>2s</source>
         <translation>2s</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1757"/>
+        <location filename="../generaledit.ui" line="1764"/>
         <source>3s</source>
         <translation>3s</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1762"/>
+        <location filename="../generaledit.ui" line="1769"/>
         <source>4s</source>
         <translation>4s</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1767"/>
+        <location filename="../generaledit.ui" line="1774"/>
         <source>6s</source>
         <translation>6s</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1772"/>
+        <location filename="../generaledit.ui" line="1779"/>
         <source>8s</source>
         <translation>8s</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1777"/>
+        <location filename="../generaledit.ui" line="1784"/>
         <source>10s</source>
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1782"/>
+        <location filename="../generaledit.ui" line="1789"/>
         <source>15s</source>
         <translation>15s</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1792"/>
+        <location filename="../generaledit.ui" line="1799"/>
         <source>Vario pitch at max</source>
         <translation>Vario Frequenz bei Max</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1846"/>
+        <location filename="../generaledit.ui" line="1853"/>
         <source> ms</source>
         <translation> ms</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1872"/>
+        <location filename="../generaledit.ui" line="1879"/>
         <source>Vario repeat at zero</source>
         <translation>Vario Wiederholrate</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1936"/>
+        <location filename="../generaledit.ui" line="1943"/>
         <source>Input</source>
         <translation>Eingang</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1943"/>
+        <location filename="../generaledit.ui" line="1950"/>
         <source>Weight</source>
         <translation>Gewichtung</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1984"/>
-        <location filename="../generaledit.ui" line="2089"/>
-        <location filename="../generaledit.ui" line="2233"/>
-        <location filename="../generaledit.ui" line="2280"/>
+        <location filename="../generaledit.ui" line="1991"/>
+        <location filename="../generaledit.ui" line="2096"/>
+        <location filename="../generaledit.ui" line="2240"/>
+        <location filename="../generaledit.ui" line="2287"/>
         <source>+= (Sum)</source>
-        <translation>+= (add)</translation>
+        <translation>+= (Add)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="1989"/>
-        <location filename="../generaledit.ui" line="2094"/>
-        <location filename="../generaledit.ui" line="2238"/>
-        <location filename="../generaledit.ui" line="2285"/>
+        <location filename="../generaledit.ui" line="1996"/>
+        <location filename="../generaledit.ui" line="2101"/>
+        <location filename="../generaledit.ui" line="2245"/>
+        <location filename="../generaledit.ui" line="2292"/>
         <source>:= (Replace)</source>
-        <translation>:= (ersetzen)</translation>
+        <translation>:= (Ersetzen)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2061"/>
+        <location filename="../generaledit.ui" line="2068"/>
         <source>Ele</source>
         <translation>Höh</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2205"/>
+        <location filename="../generaledit.ui" line="2212"/>
         <source>Thr</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2252"/>
+        <location filename="../generaledit.ui" line="2259"/>
         <source>Ail</source>
         <translation>Que</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2384"/>
-        <source>Pot. 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="2398"/>
-        <source>Pot. 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="2418"/>
-        <source>Pot. 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="2425"/>
-        <source>Pot. 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="2452"/>
-        <source>Stick 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="2489"/>
-        <source>Stick 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="2538"/>
-        <source>Stick 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="2623"/>
-        <source>Stick 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../generaledit.ui" line="2822"/>
+        <location filename="../generaledit.ui" line="2829"/>
         <source>PPM 2</source>
         <translation>PPM 2</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2829"/>
+        <location filename="../generaledit.ui" line="2836"/>
         <source>PPM 3</source>
         <translation>PPM 3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2836"/>
+        <location filename="../generaledit.ui" line="2843"/>
         <source>PPM 4</source>
         <translation>PPM 4</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2365"/>
+        <location filename="../generaledit.ui" line="2372"/>
         <source>Calibration</source>
         <translation>Kalibrierung</translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="2391"/>
         <source>POT 4</source>
-        <translation type="obsolete">POT 4</translation>
+        <translation>POT 4</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2866"/>
+        <location filename="../generaledit.ui" line="2873"/>
         <source>Current</source>
         <translation>Strom</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3062"/>
-        <location filename="../generaledit.ui" line="3103"/>
-        <location filename="../generaledit.ui" line="3151"/>
+        <location filename="../generaledit.ui" line="3069"/>
+        <location filename="../generaledit.ui" line="3110"/>
+        <location filename="../generaledit.ui" line="3158"/>
         <source>None</source>
         <translation>Kein</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3067"/>
-        <location filename="../generaledit.ui" line="3108"/>
-        <location filename="../generaledit.ui" line="3156"/>
+        <location filename="../generaledit.ui" line="3074"/>
+        <location filename="../generaledit.ui" line="3115"/>
+        <location filename="../generaledit.ui" line="3163"/>
         <source>Pot (normal)</source>
         <translation>Poti(normal)</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3072"/>
-        <location filename="../generaledit.ui" line="3113"/>
-        <location filename="../generaledit.ui" line="3161"/>
+        <location filename="../generaledit.ui" line="3079"/>
+        <location filename="../generaledit.ui" line="3120"/>
+        <location filename="../generaledit.ui" line="3168"/>
         <source>Multipos Switch</source>
         <translation>Stufen Schalter</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3080"/>
+        <location filename="../generaledit.ui" line="3087"/>
         <source>S1 Type</source>
         <translation>S1-Type</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="3121"/>
+        <location filename="../generaledit.ui" line="3128"/>
         <source>S2 Type</source>
         <translation>S2 Type</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2469"/>
-        <location filename="../generaledit.ui" line="3013"/>
+        <location filename="../generaledit.ui" line="2476"/>
+        <location filename="../generaledit.ui" line="3020"/>
         <source>Mid value</source>
         <oldsource>Mid Value</oldsource>
         <translation>Mitte</translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="2496"/>
         <source>STICK 1</source>
-        <translation type="obsolete">KNÜPPEL 1</translation>
+        <translation>KNÜPPEL 1</translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="2545"/>
         <source>STICK 2</source>
-        <translation type="obsolete">KNÜPPEL 2</translation>
-    </message>
-    <message>
-        <source>STICK 3</source>
-        <translation type="obsolete">KNÜPPEL 3</translation>
+        <translation>KNÜPPEL 2</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="2459"/>
-        <location filename="../generaledit.ui" line="3003"/>
+        <source>STICK 3</source>
+        <translation>KNÜPPEL 3</translation>
+    </message>
+    <message>
+        <location filename="../generaledit.ui" line="2466"/>
+        <location filename="../generaledit.ui" line="3010"/>
         <source>Negative span</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2479"/>
-        <location filename="../generaledit.ui" line="3023"/>
+        <location filename="../generaledit.ui" line="2486"/>
+        <location filename="../generaledit.ui" line="3030"/>
         <source>Positive span</source>
         <translation>Maximum</translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="2630"/>
         <source>STICK 4</source>
-        <translation type="obsolete">KNÜPPEL 4</translation>
+        <translation>KNÜPPEL 4</translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="2432"/>
         <source>POT 1</source>
-        <translation type="obsolete">POT 1</translation>
+        <translation>POT 1</translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="2425"/>
         <source>POT 2</source>
-        <translation type="obsolete">POT 2</translation>
+        <translation>POT 2</translation>
     </message>
     <message>
+        <location filename="../generaledit.ui" line="2405"/>
         <source>POT 3</source>
-        <translation type="obsolete">POT 3</translation>
+        <translation>POT 3</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2685"/>
+        <location filename="../generaledit.ui" line="2692"/>
         <source>Battery</source>
         <translation>Sender-Akku</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2695"/>
+        <location filename="../generaledit.ui" line="2702"/>
         <source>v</source>
         <translation>V</translation>
     </message>
     <message>
-        <location filename="../generaledit.ui" line="2714"/>
+        <location filename="../generaledit.ui" line="2721"/>
         <source>PPM Multiplier</source>
         <translation>PPM Multiplikator</translation>
     </message>
@@ -1873,7 +1823,7 @@ Are you sure ?</source>
     <message>
         <location filename="../generaledit.cpp" line="1063"/>
         <source>Calibration and HW parameters saved.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kalibrierung und HW Parameter gesichert</translation>
     </message>
 </context>
 <context>
@@ -1886,19 +1836,20 @@ Are you sure ?</source>
     <message>
         <location filename="../wizarddialog.cpp" line="712"/>
         <source>Yes, controled by a switch</source>
-        <translation>Ja mit Schlter gesteuert</translation>
+        <translation>Ja, mit Schalter gesteuert</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="713"/>
         <source>Yes, controlled by a pot</source>
-        <translation>Ya, mit Poti gesteuert</translation>
+        <translation>Ja, mit Poti gesteuert</translation>
     </message>
 </context>
 <context>
     <name>Heli</name>
     <message>
+        <location filename="../modeledit/heli.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="25"/>
@@ -1948,7 +1899,7 @@ Are you sure ?</source>
     <message>
         <location filename="../modeledit/heli.ui" line="84"/>
         <source>Collective</source>
-        <translation>Collective</translation>
+        <translation>Kollektive</translation>
     </message>
     <message>
         <location filename="../modeledit/heli.ui" line="94"/>
@@ -1963,14 +1914,10 @@ Are you sure ?</source>
 </context>
 <context>
     <name>HeliPage</name>
-    <message>
-        <source>Trottle Channel:</source>
-        <translation type="obsolete">Gas Kanal</translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="774"/>
-        <source>Throttle Channel:</source>
-        <translation type="unfinished"></translation>
+        <source>Trottle Channel:</source>
+        <translation>Gas Kanal</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="776"/>
@@ -2016,8 +1963,8 @@ Are you sure ?</source>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="23"/>
-        <source>Clear All Inputs</source>
-        <translation type="unfinished"></translation>
+        <source>Clear All Settings</source>
+        <translation type="unfinished">Alle Einstellungen reseten</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="92"/>
@@ -2047,7 +1994,7 @@ Are you sure ?</source>
     <message>
         <location filename="../modeledit/inputs.cpp" line="230"/>
         <source>Delete Selected Inputs?</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche ausgewählte Inputs?</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="362"/>
@@ -2122,12 +2069,12 @@ Are you sure ?</source>
     <message>
         <location filename="../modeledit/inputs.cpp" line="468"/>
         <source>Clear Inputs?</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingänge Löschen?</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="468"/>
         <source>Really clear all the inputs?</source>
-        <translation type="unfinished"></translation>
+        <translation>wirklich alle Eingänge löschen?</translation>
     </message>
 </context>
 <context>
@@ -2168,42 +2115,42 @@ Are you sure ?</source>
         <translation>L%1</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="396"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="405"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="396"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="405"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="397"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="406"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="397"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="406"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="398"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="407"/>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="398"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="407"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="399"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="408"/>
         <source>&amp;Paste</source>
         <translation>Ein&amp;fügen</translation>
     </message>
     <message>
-        <location filename="../modeledit/logicalswitches.cpp" line="399"/>
+        <location filename="../modeledit/logicalswitches.cpp" line="408"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
@@ -2214,7 +2161,7 @@ Are you sure ?</source>
         <location filename="../mainwindow.cpp" line="150"/>
         <location filename="../mainwindow.cpp" line="658"/>
         <location filename="../mainwindow.cpp" line="689"/>
-        <location filename="../mainwindow.cpp" line="2134"/>
+        <location filename="../mainwindow.cpp" line="2112"/>
         <source>File loaded</source>
         <translation>Datei geladen</translation>
     </message>
@@ -2247,17 +2194,32 @@ Are you sure ?</source>
         <source>Executable (*.exe)</source>
         <translation>Anwendung (*.exe)</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="280"/>
+        <source>A new release of Companion is available please check the OpenTX website!</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="294"/>
         <source>Would you like to launch the installer?</source>
         <translation>Möchtest Du das Installationsprogramm starten ?</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="344"/>
+        <source>Firmware does not longer fit in the radio, due to selected firmware options</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="353"/>
         <location filename="../mainwindow.cpp" line="392"/>
         <source>Compilation server requires registration, please check OpenTX web site</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="383"/>
+        <source>Firmware does not fit in the radio, due to selected firmware options</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../mainwindow.cpp" line="422"/>
         <source>Do you want to write the firmware to the radio now ?</source>
@@ -2277,40 +2239,40 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <translation>Datei gespeichert</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1056"/>
-        <location filename="../mainwindow.cpp" line="1063"/>
-        <location filename="../mainwindow.cpp" line="1448"/>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1034"/>
+        <location filename="../mainwindow.cpp" line="1041"/>
+        <location filename="../mainwindow.cpp" line="1426"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Read Models and Settings From Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Lese Modell und Einstellungen vom Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1083"/>
+        <location filename="../mainwindow.cpp" line="1061"/>
         <source>Write Radio Backup from %1 to the radio?</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe SenderBackup von %1 in den Sender </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1392"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Cannot backup existing Models and Settings from Radio. Firmware write process aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1426"/>
+        <location filename="../mainwindow.cpp" line="1404"/>
         <source>Save Radio Backup to File</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere Sender Backup in Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1439"/>
+        <location filename="../mainwindow.cpp" line="1417"/>
         <source>Read Radio Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Lese Sender Backup</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1458"/>
+        <location filename="../mainwindow.cpp" line="1436"/>
         <source>Read Radio Firmware to File</source>
-        <translation type="unfinished"></translation>
+        <translation>Lese Sender Firmware in Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1514"/>
+        <location filename="../mainwindow.cpp" line="1492"/>
         <source>Copyright</source>
         <translation>Copyright</translation>
     </message>
@@ -2322,7 +2284,7 @@ Möchten Sie sie jetzt herunterladen?</translation>
     <message>
         <location filename="../mainwindow.cpp" line="280"/>
         <source>New release available</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer Softwarestand verfügbar</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="331"/>
@@ -2330,23 +2292,23 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <location filename="../mainwindow.cpp" line="370"/>
         <location filename="../mainwindow.cpp" line="399"/>
         <location filename="../mainwindow.cpp" line="883"/>
-        <location filename="../mainwindow.cpp" line="2041"/>
-        <location filename="../mainwindow.cpp" line="2047"/>
-        <location filename="../mainwindow.cpp" line="2055"/>
-        <location filename="../mainwindow.cpp" line="2078"/>
-        <location filename="../mainwindow.cpp" line="2084"/>
-        <location filename="../mainwindow.cpp" line="2091"/>
-        <location filename="../mainwindow.cpp" line="2098"/>
-        <location filename="../mainwindow.cpp" line="2102"/>
+        <location filename="../mainwindow.cpp" line="2019"/>
+        <location filename="../mainwindow.cpp" line="2025"/>
+        <location filename="../mainwindow.cpp" line="2033"/>
+        <location filename="../mainwindow.cpp" line="2056"/>
+        <location filename="../mainwindow.cpp" line="2062"/>
+        <location filename="../mainwindow.cpp" line="2069"/>
+        <location filename="../mainwindow.cpp" line="2076"/>
+        <location filename="../mainwindow.cpp" line="2080"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="332"/>
         <location filename="../mainwindow.cpp" line="371"/>
-        <location filename="../mainwindow.cpp" line="2047"/>
-        <location filename="../mainwindow.cpp" line="2055"/>
-        <location filename="../mainwindow.cpp" line="2091"/>
+        <location filename="../mainwindow.cpp" line="2025"/>
+        <location filename="../mainwindow.cpp" line="2033"/>
+        <location filename="../mainwindow.cpp" line="2069"/>
         <source>Error opening file %1:
 %2.</source>
         <translation>Fehler beim Öffnen der Datei %1:
@@ -2367,17 +2329,6 @@ Möchten Sie sie jetzt herunterladen?</translation>
         <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="280"/>
-        <source>A new release of Companion is available, please check the OpenTX website!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="344"/>
-        <location filename="../mainwindow.cpp" line="383"/>
-        <source>Not enough memory for all the selected firmware options</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../mainwindow.cpp" line="347"/>
         <source>Compilation server temporary failure, try later</source>
@@ -2457,14 +2408,14 @@ Möchten Sie sie jetzt herunterladen?</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="646"/>
-        <location filename="../mainwindow.cpp" line="1615"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
         <source>Open Models and Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne Modelle und Einstellngs Datei</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="752"/>
         <source>Firmware updates</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmware updates</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="752"/>
@@ -2479,690 +2430,713 @@ Möchten Sie sie jetzt herunterladen?</translation>
 %2 nicht schreiben.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1093"/>
-        <location filename="../mainwindow.cpp" line="1346"/>
-        <location filename="../mainwindow.cpp" line="1400"/>
+        <location filename="../mainwindow.cpp" line="1071"/>
+        <location filename="../mainwindow.cpp" line="1324"/>
+        <location filename="../mainwindow.cpp" line="1378"/>
         <source>Backup is impossible</source>
-        <translation type="unfinished"></translation>
+        <translation>Bachup ist möglich</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1093"/>
-        <location filename="../mainwindow.cpp" line="1346"/>
-        <location filename="../mainwindow.cpp" line="1400"/>
+        <location filename="../mainwindow.cpp" line="1071"/>
+        <location filename="../mainwindow.cpp" line="1324"/>
+        <location filename="../mainwindow.cpp" line="1378"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1113"/>
-        <location filename="../mainwindow.cpp" line="1120"/>
-        <location filename="../mainwindow.cpp" line="1165"/>
-        <location filename="../mainwindow.cpp" line="1174"/>
-        <location filename="../mainwindow.cpp" line="1359"/>
-        <location filename="../mainwindow.cpp" line="1408"/>
+        <location filename="../mainwindow.cpp" line="1091"/>
+        <location filename="../mainwindow.cpp" line="1098"/>
+        <location filename="../mainwindow.cpp" line="1143"/>
+        <location filename="../mainwindow.cpp" line="1152"/>
+        <location filename="../mainwindow.cpp" line="1337"/>
+        <location filename="../mainwindow.cpp" line="1386"/>
         <source>Backup Models and Settings From Radio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1143"/>
-        <location filename="../mainwindow.cpp" line="1146"/>
+        <location filename="../mainwindow.cpp" line="1121"/>
+        <location filename="../mainwindow.cpp" line="1124"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1143"/>
+        <location filename="../mainwindow.cpp" line="1121"/>
         <source>The radio firmware belongs to another product family, check file and preferences!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1146"/>
+        <location filename="../mainwindow.cpp" line="1124"/>
         <source>The radio firmware is outdated, please upgrade!</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Sender Firmware ist überholt , bitte updaten!</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1192"/>
+        <location filename="../mainwindow.cpp" line="1170"/>
         <source>Write Backup To Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Backup in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1366"/>
-        <location filename="../mainwindow.cpp" line="1416"/>
+        <location filename="../mainwindow.cpp" line="1344"/>
+        <location filename="../mainwindow.cpp" line="1394"/>
         <source>Write Firmware To Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Firmware in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1352"/>
         <source>Conversion failed</source>
         <translation>Umwandlung gescheitert</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1379"/>
+        <location filename="../mainwindow.cpp" line="1357"/>
         <source>Restore Models and Settings To Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederherstellen von Modellen und Einstellungen im Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1362"/>
         <source>Restore failed</source>
-        <translation>Zurückspeicherung gescheitert</translation>
+        <translation>Wiederherstellung gescheitert</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1384"/>
+        <location filename="../mainwindow.cpp" line="1362"/>
         <source>Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1388"/>
+        <location filename="../mainwindow.cpp" line="1366"/>
         <source>Could not write firmware to radio. The models and settings data file can be found at: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1392"/>
+        <location filename="../mainwindow.cpp" line="1370"/>
         <source>Backup failed</source>
         <translation>Sicherung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1086"/>
-        <source>The file %1
-has not been recognized as a valid Models and Settings file
-Write anyway ?</source>
+        <location filename="../mainwindow.cpp" line="1064"/>
+        <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="1136"/>
+        <location filename="../mainwindow.cpp" line="1114"/>
         <source>Cannot check Models and Settings compatibility! Continue anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1374"/>
+        <location filename="../mainwindow.cpp" line="1352"/>
         <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="1388"/>
+        <location filename="../mainwindow.cpp" line="1366"/>
         <source>Firmware write failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmware schreiben fehlerhaft</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1632"/>
         <source>Load backup from file</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade Backup von Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1506"/>
+        <location filename="../mainwindow.cpp" line="1484"/>
         <source>OpenTX Home Page: &lt;a href=&apos;%1&apos;&gt;%1&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1508"/>
+        <location filename="../mainwindow.cpp" line="1486"/>
         <source>The OpenTX Companion project was originally forked from &lt;a href=&apos;%2&apos;&gt;eePe&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1510"/>
+        <location filename="../mainwindow.cpp" line="1488"/>
         <source>If you&apos;ve found this program useful, please support by &lt;a href=&apos;%1&apos;&gt;donating&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1512"/>
+        <location filename="../mainwindow.cpp" line="1490"/>
         <source>Version %1, %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Version %1, %3</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1517"/>
+        <location filename="../mainwindow.cpp" line="1495"/>
         <source>About Companion</source>
-        <translation type="unfinished"></translation>
+        <translation>Über Companion</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1661"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Compare models</source>
-        <translation type="unfinished"></translation>
+        <translation>Vergleiche Modelle</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1596"/>
         <source>Exit the application</source>
         <translation>Beendet die Anwendung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1614"/>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1615"/>
-        <source>Open...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
-        <source>Save</source>
-        <translation type="unfinished">speichern</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1617"/>
-        <source>Save As...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1620"/>
-        <source>Copy Model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>A monochrome black icon theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1627"/>
+        <location filename="../mainwindow.cpp" line="1605"/>
         <source>A monochrome white icon theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1628"/>
+        <location filename="../mainwindow.cpp" line="1606"/>
         <source>A monochrome blue icon theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1631"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Klein</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1631"/>
+        <location filename="../mainwindow.cpp" line="1609"/>
         <source>Use small toolbar icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1632"/>
+        <location filename="../mainwindow.cpp" line="1610"/>
         <source>Use normal size toolbar icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1632"/>
+        <location filename="../mainwindow.cpp" line="1610"/>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1611"/>
         <source>Use big toolbar icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1633"/>
+        <location filename="../mainwindow.cpp" line="1611"/>
         <source>Big</source>
-        <translation type="unfinished"></translation>
+        <translation>Groß</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Use huge toolbar icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1634"/>
+        <location filename="../mainwindow.cpp" line="1612"/>
         <source>Huge</source>
-        <translation type="unfinished"></translation>
+        <translation>Riesig</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1544"/>
+        <location filename="../mainwindow.cpp" line="1522"/>
         <source>OpenTX Companion - FW: %1 - Profile: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenTX Companion - FW: %1 - Profile: %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1614"/>
+        <location filename="../mainwindow.cpp" line="1592"/>
+        <source>New Models+Settings</source>
+        <translation>Neue Modelle+Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1592"/>
         <source>Create a new Models and Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation>Erzeuge eine neue Modell-und Einstellungens-Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1616"/>
-        <location filename="../mainwindow.cpp" line="1617"/>
+        <location filename="../mainwindow.cpp" line="1593"/>
+        <source>Open Models+Settings...</source>
+        <translation>Öffne Modelle+Einstellungen...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1594"/>
+        <source>Save Models+Settings...</source>
+        <translation>Speichere Modelle+Einstellungen...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1594"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
         <source>Save Models and Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere Modell und Einstellungen in Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1618"/>
+        <location filename="../mainwindow.cpp" line="1595"/>
+        <source>Save Models+Settings as...</source>
+        <translation>Speichere Modell+Einstellungen als...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1596"/>
         <source>Exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1619"/>
+        <location filename="../mainwindow.cpp" line="1597"/>
         <source>Cut Model</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausschneiden Modell</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1619"/>
+        <location filename="../mainwindow.cpp" line="1597"/>
         <source>Cut current model to the clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausschneiden aktuelles Modell und in Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1620"/>
+        <location filename="../mainwindow.cpp" line="1598"/>
+        <source>Copy Model...</source>
+        <translation>Kopiere Modell...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1598"/>
         <source>Copy current model to the clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiere Modell in die Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
+        <location filename="../mainwindow.cpp" line="1599"/>
+        <source>Paste Model...</source>
+        <translation>Einfügen Modell...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1599"/>
         <source>Paste model from clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfügen Modell aus Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1621"/>
-        <source>Paste Model</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1624"/>
+        <location filename="../mainwindow.cpp" line="1602"/>
         <source>Classical</source>
-        <translation type="unfinished"></translation>
+        <translation>Klassisch</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1624"/>
+        <location filename="../mainwindow.cpp" line="1602"/>
         <source>The classic companion9x icon theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>Yerico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1625"/>
+        <location filename="../mainwindow.cpp" line="1603"/>
         <source>Yellow round honey sweet icon theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1626"/>
+        <location filename="../mainwindow.cpp" line="1604"/>
         <source>Monochrome</source>
-        <translation type="unfinished"></translation>
+        <translation>Monochrom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1627"/>
+        <location filename="../mainwindow.cpp" line="1605"/>
         <source>MonoWhite</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiß</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1628"/>
+        <location filename="../mainwindow.cpp" line="1606"/>
         <source>MonoBlue</source>
-        <translation type="unfinished"></translation>
+        <translation>Blau</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
+        <location filename="../mainwindow.cpp" line="1615"/>
         <source>System language</source>
-        <translation type="unfinished"></translation>
+        <translation>Systemsprache</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1637"/>
+        <location filename="../mainwindow.cpp" line="1615"/>
         <source>Use system language in menus</source>
-        <translation type="unfinished"></translation>
+        <translation>Systemsprache in den Menüs</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
+        <location filename="../mainwindow.cpp" line="1616"/>
         <source>Czech</source>
-        <translation type="unfinished">Czech</translation>
+        <translation>Czech</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1638"/>
+        <location filename="../mainwindow.cpp" line="1616"/>
         <source>Use Czech in menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1639"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>German</source>
         <translation>Deutch</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1639"/>
+        <location filename="../mainwindow.cpp" line="1617"/>
         <source>Use German in menus</source>
-        <translation type="unfinished"></translation>
+        <translation>Deutsch für die Menüs</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1640"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>English</source>
         <translation>English</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1640"/>
+        <location filename="../mainwindow.cpp" line="1618"/>
         <source>Use English in menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Finnish</source>
         <translation>Finish</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1641"/>
+        <location filename="../mainwindow.cpp" line="1619"/>
         <source>Use Finnish in menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1620"/>
         <source>French</source>
-        <translation type="unfinished">French</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1642"/>
+        <location filename="../mainwindow.cpp" line="1620"/>
         <source>Use French in menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1643"/>
+        <location filename="../mainwindow.cpp" line="1621"/>
         <source>Italian</source>
-        <translation type="unfinished">Italien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1643"/>
+        <location filename="../mainwindow.cpp" line="1621"/>
         <source>Use Italian in menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1645"/>
-        <source>Polish</source>
-        <translation type="unfinished">Polish</translation>
+        <location filename="../mainwindow.cpp" line="1622"/>
+        <source>Hebrew</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1645"/>
+        <location filename="../mainwindow.cpp" line="1622"/>
+        <source>Use Hebrew in menus</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1623"/>
+        <source>Polish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1623"/>
         <source>Use Polish in menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../mainwindow.cpp" line="1624"/>
         <source>Portuguese</source>
-        <translation type="obsolete">Portuguese</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1624"/>
+        <source>Use Portuguese in menus</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1625"/>
         <source>Swedish</source>
-        <translation type="unfinished">Swedish</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1647"/>
+        <location filename="../mainwindow.cpp" line="1625"/>
         <source>Use Swedish in menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1651"/>
+        <location filename="../mainwindow.cpp" line="1626"/>
+        <source>Russian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1626"/>
+        <source>Use Russian in menus</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Dutch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1627"/>
+        <source>Use Dutch in menus</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1629"/>
         <source>About...</source>
-        <translation type="unfinished"></translation>
+        <translation>Über</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Print...</source>
-        <translation type="unfinished"></translation>
+        <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1652"/>
+        <location filename="../mainwindow.cpp" line="1630"/>
         <source>Print current model</source>
-        <translation type="unfinished"></translation>
+        <translation>Drucke aktuelles Modell</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1653"/>
+        <location filename="../mainwindow.cpp" line="1631"/>
         <source>Simulate...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1653"/>
+        <location filename="../mainwindow.cpp" line="1631"/>
         <source>Simulate current model</source>
-        <translation type="unfinished"></translation>
+        <translation>Simulation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1654"/>
+        <location filename="../mainwindow.cpp" line="1632"/>
         <source>Load Backup...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade Backup</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1655"/>
+        <location filename="../mainwindow.cpp" line="1633"/>
         <source>View Log File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzeige Log Datei...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1655"/>
+        <location filename="../mainwindow.cpp" line="1633"/>
         <source>Open and view log file</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne und zeige Log Datei an</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1656"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1656"/>
+        <location filename="../mainwindow.cpp" line="1634"/>
         <source>Edit Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Editiere Einstellungen </translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1657"/>
+        <location filename="../mainwindow.cpp" line="1635"/>
         <source>Download...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1657"/>
+        <location filename="../mainwindow.cpp" line="1635"/>
         <source>Download firmware and voice files</source>
-        <translation type="unfinished"></translation>
+        <translation>Download Firmware and Sprechdateien</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1636"/>
         <source>Check for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation>Prüfe auf Update</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1658"/>
+        <location filename="../mainwindow.cpp" line="1636"/>
         <source>Check OpenTX and Companion updates</source>
-        <translation type="unfinished"></translation>
+        <translation>Prüfe Opentx und Companion auf Updates</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1659"/>
+        <location filename="../mainwindow.cpp" line="1637"/>
         <source>Companion Changes...</source>
-        <translation type="unfinished"></translation>
+        <translation>Companion Änderungen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1659"/>
+        <location filename="../mainwindow.cpp" line="1637"/>
         <source>Show Companion change log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Firmware Changes...</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmware Ändeurngen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1660"/>
+        <location filename="../mainwindow.cpp" line="1638"/>
         <source>Show firmware change log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1661"/>
+        <location filename="../mainwindow.cpp" line="1639"/>
         <source>Compare Models...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vergleiche Modelle</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1662"/>
+        <location filename="../mainwindow.cpp" line="1640"/>
         <source>Edit Radio Splash Image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1662"/>
+        <location filename="../mainwindow.cpp" line="1640"/>
         <source>Edit the splash image of your Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Editiere das Starthbild für den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1663"/>
+        <location filename="../mainwindow.cpp" line="1641"/>
         <source>List programmers...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Fuses...</source>
-        <translation type="unfinished"></translation>
+        <translation>Fuses</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1665"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Read Firmware from Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Lese Firmware aus dem Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1665"/>
+        <location filename="../mainwindow.cpp" line="1643"/>
         <source>Read firmware from Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Lese Firmware aus dem Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1644"/>
         <source>Write Firmware to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Firmware in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1666"/>
+        <location filename="../mainwindow.cpp" line="1644"/>
         <source>Write firmware to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Firmware in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1667"/>
+        <location filename="../mainwindow.cpp" line="1645"/>
         <source>Add Radio Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Füge Senderprofil hinzu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1667"/>
+        <location filename="../mainwindow.cpp" line="1645"/>
         <source>Create a new Radio Setting Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle neues Sender Profil</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1668"/>
+        <location filename="../mainwindow.cpp" line="1646"/>
         <source>Manuals and other Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Handbücher und andere Dokumente</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1668"/>
+        <location filename="../mainwindow.cpp" line="1646"/>
         <source>Open the OpenTX document page in a web browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1669"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Write Models and Settings To Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Modelle und Einstellungen in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1669"/>
+        <location filename="../mainwindow.cpp" line="1647"/>
         <source>Write Models and Settings to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Modelle und Einstellungen in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1670"/>
+        <location filename="../mainwindow.cpp" line="1648"/>
         <source>Read Models and Settings from Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Lese Modelle und Einstellungen aus dem Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1671"/>
+        <location filename="../mainwindow.cpp" line="1649"/>
         <source>Configure Communications...</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguriere Kommunikation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1671"/>
+        <location filename="../mainwindow.cpp" line="1649"/>
         <source>Configure software for communicating with the Radio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1650"/>
         <source>Write Backup to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Backup in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1672"/>
+        <location filename="../mainwindow.cpp" line="1650"/>
         <source>Write Backup from file to to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Backup aus Datei in den Sender</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1673"/>
+        <location filename="../mainwindow.cpp" line="1651"/>
         <source>Backup Radio to File</source>
-        <translation type="unfinished"></translation>
+        <translation>Mach Backup von Sender in Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1673"/>
+        <location filename="../mainwindow.cpp" line="1651"/>
         <source>Save a complete backup file of all settings and model data in the Radio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1674"/>
+        <location filename="../mainwindow.cpp" line="1652"/>
         <source>Contributors...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vergleichen...</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1674"/>
+        <location filename="../mainwindow.cpp" line="1652"/>
         <source>A tribute to those who have contributed to OpenTX and Companion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1684"/>
-        <source>Recent Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1829"/>
+        <location filename="../mainwindow.cpp" line="1662"/>
+        <location filename="../mainwindow.cpp" line="1807"/>
         <source>Recent Models+Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Kürzlich verwendete Modelle+Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1686"/>
+        <location filename="../mainwindow.cpp" line="1664"/>
         <source>Set Icon Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1687"/>
+        <location filename="../mainwindow.cpp" line="1665"/>
         <source>Set Icon Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2078"/>
-        <location filename="../mainwindow.cpp" line="2084"/>
+        <location filename="../mainwindow.cpp" line="2056"/>
+        <location filename="../mainwindow.cpp" line="2062"/>
         <source>Invalid Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2102"/>
+        <location filename="../mainwindow.cpp" line="2080"/>
         <source>Invalid binary Models and Settings File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1663"/>
+        <location filename="../mainwindow.cpp" line="1641"/>
         <source>List available programmers</source>
         <translation>Programmiergeräte</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1664"/>
+        <location filename="../mainwindow.cpp" line="1642"/>
         <source>Show fuses dialog</source>
         <translation>Zeige Fuses Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1651"/>
+        <location filename="../mainwindow.cpp" line="1629"/>
         <source>Show the application&apos;s About box</source>
         <translation>Zeige das Infofenster</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1685"/>
+        <location filename="../mainwindow.cpp" line="1663"/>
         <source>Set Menu Language</source>
         <translation>Menüsprache einstellen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1846"/>
-        <source>Show the list of radio profiles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="1862"/>
+        <location filename="../mainwindow.cpp" line="1840"/>
         <source>Write</source>
         <translation>Schreibe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1999"/>
+        <location filename="../mainwindow.cpp" line="1977"/>
         <source>%2</source>
-        <translation type="unfinished">%1s {2?}</translation>
+        <translation>%2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2041"/>
+        <location filename="../mainwindow.cpp" line="2019"/>
         <source>Unable to find file %1!</source>
         <translation>Kann die Datei %1 nicht finden !</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="2098"/>
-        <source>Error reading file %1:
-%2.</source>
-        <translation>Fehler beim Lesen der Datei %1:
-%2.</translation>
+        <location filename="../mainwindow.cpp" line="2076"/>
+        <source>Error reading file %1: %2.</source>
+        <translation>Fehler beim Lesen der Datei %1: %2.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="225"/>
@@ -3172,49 +3146,54 @@ Write anyway ?</source>
     <message>
         <location filename="../mainwindow.cpp" line="533"/>
         <source>Ignore this version (r%1)?</source>
-        <translation>Diese Version ignorieren (%1)?</translation>
+        <translation>Diese Version ignorieren (r%1)?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1689"/>
-        <location filename="../mainwindow.cpp" line="1818"/>
+        <location filename="../mainwindow.cpp" line="1667"/>
+        <location filename="../mainwindow.cpp" line="1796"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1708"/>
-        <location filename="../mainwindow.cpp" line="1855"/>
+        <location filename="../mainwindow.cpp" line="1686"/>
+        <location filename="../mainwindow.cpp" line="1833"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1713"/>
+        <location filename="../mainwindow.cpp" line="1691"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1746"/>
+        <location filename="../mainwindow.cpp" line="1724"/>
         <source>Read/Write</source>
         <translation>Lesen/Schreiben</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1763"/>
-        <location filename="../mainwindow.cpp" line="1877"/>
+        <location filename="../mainwindow.cpp" line="1741"/>
+        <location filename="../mainwindow.cpp" line="1855"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1786"/>
-        <location filename="../mainwindow.cpp" line="1845"/>
+        <location filename="../mainwindow.cpp" line="1764"/>
+        <location filename="../mainwindow.cpp" line="1823"/>
         <source>Radio Profile</source>
-        <translation type="unfinished">Sender Profil</translation>
+        <translation>Sender Profil</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1830"/>
-        <source>Show recent Models+Settings documents</source>
+        <location filename="../mainwindow.cpp" line="1808"/>
+        <source>Show recent Models+Settings document&amp;Editierens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1886"/>
+        <location filename="../mainwindow.cpp" line="1824"/>
+        <source>Show a selection list of radio profiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="1864"/>
         <source>Ready</source>
         <translation>Fertig</translation>
     </message>
@@ -3222,167 +3201,157 @@ Write anyway ?</source>
 <context>
     <name>MdiChild</name>
     <message>
-        <location filename="../mdichild.cpp" line="237"/>
-        <location filename="../mdichild.cpp" line="245"/>
-        <location filename="../mdichild.cpp" line="256"/>
-        <location filename="../mdichild.cpp" line="287"/>
-        <location filename="../mdichild.cpp" line="297"/>
-        <location filename="../mdichild.cpp" line="312"/>
-        <location filename="../mdichild.cpp" line="324"/>
-        <location filename="../mdichild.cpp" line="333"/>
-        <location filename="../mdichild.cpp" line="411"/>
-        <location filename="../mdichild.cpp" line="417"/>
-        <location filename="../mdichild.cpp" line="425"/>
-        <location filename="../mdichild.cpp" line="435"/>
+        <location filename="../mdichild.cpp" line="232"/>
+        <location filename="../mdichild.cpp" line="240"/>
+        <location filename="../mdichild.cpp" line="251"/>
+        <location filename="../mdichild.cpp" line="282"/>
+        <location filename="../mdichild.cpp" line="292"/>
+        <location filename="../mdichild.cpp" line="307"/>
+        <location filename="../mdichild.cpp" line="319"/>
+        <location filename="../mdichild.cpp" line="328"/>
+        <location filename="../mdichild.cpp" line="406"/>
+        <location filename="../mdichild.cpp" line="412"/>
+        <location filename="../mdichild.cpp" line="420"/>
+        <location filename="../mdichild.cpp" line="430"/>
+        <location filename="../mdichild.cpp" line="439"/>
         <location filename="../mdichild.cpp" line="444"/>
-        <location filename="../mdichild.cpp" line="449"/>
-        <location filename="../mdichild.cpp" line="540"/>
-        <location filename="../mdichild.cpp" line="587"/>
-        <location filename="../mdichild.cpp" line="696"/>
-        <location filename="../mdichild.cpp" line="704"/>
-        <location filename="../mdichild.cpp" line="715"/>
-        <location filename="../mdichild.cpp" line="724"/>
+        <location filename="../mdichild.cpp" line="535"/>
+        <location filename="../mdichild.cpp" line="582"/>
+        <location filename="../mdichild.cpp" line="691"/>
+        <location filename="../mdichild.cpp" line="699"/>
+        <location filename="../mdichild.cpp" line="710"/>
+        <location filename="../mdichild.cpp" line="719"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="185"/>
+        <location filename="../mdichild.cpp" line="180"/>
         <source>Editing model %1: </source>
         <translation>Modell %1 bearbeiten :</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="237"/>
-        <location filename="../mdichild.cpp" line="696"/>
+        <location filename="../mdichild.cpp" line="232"/>
+        <location filename="../mdichild.cpp" line="691"/>
         <source>Unable to find file %1!</source>
         <translation>Kann die Datei %1 nicht finden !</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="325"/>
-        <location filename="../mdichild.cpp" line="716"/>
-        <source>Error reading file %1:
-%2.</source>
-        <translation>Fehler beim Lesen der Datei %1:
-%2.</translation>
+        <location filename="../mdichild.cpp" line="320"/>
+        <location filename="../mdichild.cpp" line="711"/>
+        <source>Error reading file %1:%2.</source>
+        <translation>Fehler beim Lesen der Datei %1:%2.</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="246"/>
-        <location filename="../mdichild.cpp" line="257"/>
-        <location filename="../mdichild.cpp" line="313"/>
-        <location filename="../mdichild.cpp" line="705"/>
-        <source>Error opening file %1:
-%2.</source>
-        <translation>Fehler beim Öffnen der Datei %1:
-%2.</translation>
+        <location filename="../mdichild.cpp" line="241"/>
+        <location filename="../mdichild.cpp" line="252"/>
+        <location filename="../mdichild.cpp" line="308"/>
+        <location filename="../mdichild.cpp" line="700"/>
+        <source>Error opening file %1:%2.</source>
+        <translation>Fehler beim Öffnen der Datei %1:%2.</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="366"/>
-        <location filename="../mdichild.cpp" line="368"/>
-        <location filename="../mdichild.cpp" line="374"/>
-        <location filename="../mdichild.cpp" line="376"/>
+        <location filename="../mdichild.cpp" line="361"/>
+        <location filename="../mdichild.cpp" line="363"/>
+        <location filename="../mdichild.cpp" line="369"/>
+        <location filename="../mdichild.cpp" line="371"/>
         <source>Save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="411"/>
-        <location filename="../mdichild.cpp" line="417"/>
-        <location filename="../mdichild.cpp" line="425"/>
-        <location filename="../mdichild.cpp" line="435"/>
-        <source>Cannot write file %1:
-%2.</source>
-        <translation>Kann Datei %1:
-%2 nicht schreiben.</translation>
+        <location filename="../mdichild.cpp" line="406"/>
+        <location filename="../mdichild.cpp" line="412"/>
+        <location filename="../mdichild.cpp" line="420"/>
+        <location filename="../mdichild.cpp" line="430"/>
+        <source>Cannot write file %1:%2.</source>
+        <translation>Kann Datei %1:%2 nicht schreiben.</translation>
     </message>
     <message>
+        <location filename="../mdichild.cpp" line="439"/>
         <location filename="../mdichild.cpp" line="444"/>
-        <location filename="../mdichild.cpp" line="449"/>
-        <source>Error writing file %1:
-%2.</source>
-        <translation>Fehler beim Schreiben der Datei %1:
-%2.</translation>
+        <source>Error writing file %1:%2.</source>
+        <translation>Fehler beim Schreiben der Datei %1:%2.</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="561"/>
-        <location filename="../mdichild.cpp" line="570"/>
-        <location filename="../mdichild.cpp" line="621"/>
+        <location filename="../mdichild.cpp" line="556"/>
+        <location filename="../mdichild.cpp" line="565"/>
+        <location filename="../mdichild.cpp" line="616"/>
         <source>Backup EEPROM From Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Backup EEPROm aus dem Sender</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="640"/>
+        <location filename="../mdichild.cpp" line="635"/>
         <source>Write EEPROM To Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe EEPROM in den Sender</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="690"/>
+        <location filename="../mdichild.cpp" line="685"/>
         <source>Open backup Models and Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne Backup Modelle-und Einstellungs Datei</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="140"/>
+        <location filename="../mdichild.cpp" line="135"/>
         <source>free bytes</source>
         <translation>Freie Bytes</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="484"/>
+        <location filename="../mdichild.cpp" line="479"/>
         <source>Companion</source>
-        <translation type="unfinished">Companion</translation>
+        <translation>Companion</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="288"/>
-        <location filename="../mdichild.cpp" line="298"/>
+        <location filename="../mdichild.cpp" line="283"/>
+        <location filename="../mdichild.cpp" line="293"/>
         <source>Invalid EEPROM File %1</source>
         <translation>Ungültige EEPROM Datei %1</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="334"/>
+        <location filename="../mdichild.cpp" line="329"/>
         <source>Invalid binary EEPROM File %1</source>
         <translation>Ungültige EEPROM Programmdatei %1</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="526"/>
+        <location filename="../mdichild.cpp" line="521"/>
         <source>Backup is impossible</source>
-        <translation type="unfinished"></translation>
+        <translation>Backup ist nicht möglich</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="526"/>
+        <location filename="../mdichild.cpp" line="521"/>
         <source>The backup dir set in preferences does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="587"/>
+        <location filename="../mdichild.cpp" line="582"/>
         <source>Cannot check eeprom compatibility! Continue anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="594"/>
-        <location filename="../mdichild.cpp" line="597"/>
+        <location filename="../mdichild.cpp" line="589"/>
+        <location filename="../mdichild.cpp" line="592"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="594"/>
+        <location filename="../mdichild.cpp" line="589"/>
         <source>Firmware in radio is of a different family of eeprom written, check file and preferences!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="597"/>
+        <location filename="../mdichild.cpp" line="592"/>
         <source>Firmware in flash is outdated, please upgrade!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="725"/>
+        <location filename="../mdichild.cpp" line="720"/>
         <source>Invalid binary backup File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="485"/>
-        <source>%1 has been modified.
-Do you want to save your changes?</source>
-        <translation>%1 wurde verändert.
-Wollen Sie Ihre Änderungen sichern?</translation>
+        <location filename="../mdichild.cpp" line="480"/>
+        <source>%1 has been modified.Do you want to save your changes?</source>
+        <translation>%1 wurde verändert.Wollen Sie Ihre Änderungen sichern?</translation>
     </message>
     <message>
-        <location filename="../mdichild.cpp" line="540"/>
+        <location filename="../mdichild.cpp" line="535"/>
         <source>Cannot write temporary file!</source>
         <translation>Kann temporäre Datei nicht schreiben! </translation>
     </message>
@@ -3446,10 +3415,8 @@ Wollen Sie Ihre Änderungen sichern?</translation>
     </message>
     <message>
         <location filename="../modeledit/mixerdialog.ui" line="577"/>
-        <source>Switch used by the mix.
-If blank then the mix is considered to be &quot;ON&quot; all the time.</source>
-        <translation>Mischerschalter.
-Wenn leer ist der Mischer immer aktiv.</translation>
+        <source>Switch used by the mix.If blank then the mix is considered to be &quot;ON&quot; all the time.</source>
+        <translation>Mischerschalter.Wenn leer ist der Mischer immer aktiv.</translation>
     </message>
     <message>
         <location filename="../modeledit/mixerdialog.ui" line="459"/>
@@ -3473,11 +3440,9 @@ Wenn leer ist der Mischer immer aktiv.</translation>
     </message>
     <message>
         <location filename="../modeledit/mixerdialog.ui" line="425"/>
-        <source>Mixer warning.
-Setting this value will cause a beep to be emmitted when this value is active.</source>
+        <source>Mixer warning.Setting this value will cause a beep to be emmitted when this value is active.</source>
         <translatorcomment>Not clear what that means...</translatorcomment>
-        <translation>Warnung Mischer
-Wenn diese Einstellung angewählt wird, piepst es wenn dieser Wert aktiv ist.</translation>
+        <translation>Warnung Mischer. Wenn diese Einstellung angewählt wird, piepst es wenn dieser Wert aktiv ist.</translation>
     </message>
     <message>
         <location filename="../modeledit/mixerdialog.ui" line="430"/>
@@ -3547,40 +3512,49 @@ Diese Einstellung bestimmt wie die Mischerwerte behandelt werden.
         <translation>DR/Expo einschliessen</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="207"/>
         <source>0</source>
-        <translation type="obsolete">0</translation>
+        <translation>0</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="217"/>
         <source>1</source>
-        <translation type="obsolete">1</translation>
+        <translation>1</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="227"/>
         <source>2</source>
-        <translation type="obsolete">2</translation>
+        <translation>2</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="237"/>
         <source>3</source>
-        <translation type="obsolete">3</translation>
+        <translation>3</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="247"/>
         <source>4</source>
-        <translation type="obsolete">4</translation>
+        <translation>4</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="257"/>
         <source>5</source>
-        <translation type="obsolete">5</translation>
+        <translation>5</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="267"/>
         <source>6</source>
-        <translation type="obsolete">6</translation>
+        <translation>6</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="277"/>
         <source>7</source>
-        <translation type="obsolete">7</translation>
+        <translation>7</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.ui" line="287"/>
         <source>8</source>
-        <translation type="obsolete">8</translation>
+        <translation>8</translation>
     </message>
     <message>
         <location filename="../modeledit/mixerdialog.ui" line="32"/>
@@ -3632,33 +3606,34 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <translation>Nach unten</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixerdialog.cpp" line="20"/>
+        <source>DEST -&gt; X%1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../modeledit/mixerdialog.cpp" line="22"/>
         <source>DEST -&gt; CH%1%2</source>
-        <translation type="obsolete">DEST -&gt; CH%1%2</translation>
+        <translation>DEST -&gt; CH%1%2</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixerdialog.cpp" line="19"/>
-        <source>DEST -&gt; CH%1</source>
-        <translation type="unfinished">DEST -&gt; CH%1</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixerdialog.cpp" line="38"/>
+        <location filename="../modeledit/mixerdialog.cpp" line="41"/>
         <source>Rud</source>
         <translation>Sei</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixerdialog.cpp" line="39"/>
+        <location filename="../modeledit/mixerdialog.cpp" line="42"/>
         <source>Ele</source>
         <translatorcomment>Höh</translatorcomment>
         <translation>Höh</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixerdialog.cpp" line="40"/>
+        <location filename="../modeledit/mixerdialog.cpp" line="43"/>
         <source>Thr</source>
         <translatorcomment>Gas</translatorcomment>
-        <translation>Thr</translation>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixerdialog.cpp" line="41"/>
+        <location filename="../modeledit/mixerdialog.cpp" line="44"/>
         <source>Ail</source>
         <translation>Que</translation>
     </message>
@@ -3666,175 +3641,161 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
 <context>
     <name>MixesPanel</name>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="17"/>
-        <location filename="../modeledit/mixes.cpp" line="477"/>
+        <location filename="../modeledit/mixes.cpp" line="16"/>
+        <location filename="../modeledit/mixes.cpp" line="411"/>
         <source>Move Up</source>
         <translation>Nach oben</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="19"/>
-        <location filename="../modeledit/mixes.cpp" line="477"/>
+        <location filename="../modeledit/mixes.cpp" line="18"/>
+        <location filename="../modeledit/mixes.cpp" line="411"/>
         <source>Ctrl+Up</source>
         <translation>Ctrl+Up</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="20"/>
-        <location filename="../modeledit/mixes.cpp" line="478"/>
+        <location filename="../modeledit/mixes.cpp" line="19"/>
+        <location filename="../modeledit/mixes.cpp" line="412"/>
         <source>Move Down</source>
         <translation>Nach unten</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="22"/>
-        <location filename="../modeledit/mixes.cpp" line="478"/>
+        <location filename="../modeledit/mixes.cpp" line="21"/>
+        <location filename="../modeledit/mixes.cpp" line="412"/>
         <source>Ctrl+Down</source>
         <translation>Ctrl+Down</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="23"/>
+        <location filename="../modeledit/mixes.cpp" line="22"/>
         <source>Clear Mixes</source>
         <translation>Mischer löschen</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="168"/>
+        <location filename="../modeledit/mixes.cpp" line="107"/>
         <source>Weight(%1)</source>
-        <translation type="unfinished">Gewichtung(%1)</translation>
+        <translation>Gewichtung(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="174"/>
+        <location filename="../modeledit/mixes.cpp" line="113"/>
         <source>Switch(%1)</source>
-        <translation type="unfinished">Schalter(%1)</translation>
+        <translation>Schalter(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="178"/>
+        <location filename="../modeledit/mixes.cpp" line="117"/>
         <source>No Trim</source>
-        <translation type="unfinished">Kein Trim</translation>
+        <translation>Keine Trim</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="184"/>
+        <location filename="../modeledit/mixes.cpp" line="123"/>
         <source>No DR/Expo</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein DR/Expo</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="185"/>
+        <location filename="../modeledit/mixes.cpp" line="124"/>
         <source>Offset(%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Offset(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="192"/>
+        <location filename="../modeledit/mixes.cpp" line="131"/>
         <source> Delay(u%1:d%2)</source>
         <translation>Verzögerung(u%1:d%2)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="194"/>
+        <location filename="../modeledit/mixes.cpp" line="133"/>
         <source> Slow(u%1:d%2)</source>
         <translation>Langsam/u%1:d%2)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="195"/>
+        <location filename="../modeledit/mixes.cpp" line="134"/>
         <source> Warn(%1)</source>
         <translation>Warnung(%1)</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="210"/>
+        <location filename="../modeledit/mixes.cpp" line="165"/>
         <source>Not enough available mixers!</source>
         <translation>Nicht genügend Mischer verfügbar!</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="316"/>
+        <location filename="../modeledit/mixes.cpp" line="271"/>
         <source>Delete Selected Mixes?</source>
         <translation>Lösche ausgewählte Mischer?</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="467"/>
+        <location filename="../modeledit/mixes.cpp" line="402"/>
         <source>&amp;Add</source>
         <translation>&amp;Addieren</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="467"/>
+        <location filename="../modeledit/mixes.cpp" line="402"/>
         <source>Ctrl+A</source>
         <translation>Ctrl+a</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="468"/>
+        <location filename="../modeledit/mixes.cpp" line="403"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editieren</translation>
+        <translation>&amp;Editieren</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="468"/>
+        <location filename="../modeledit/mixes.cpp" line="403"/>
         <source>Enter</source>
         <translation>Eingabe</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="469"/>
-        <source>&amp;Toggle highlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="469"/>
-        <source>Ctrl+T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="471"/>
+        <location filename="../modeledit/mixes.cpp" line="405"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="471"/>
+        <location filename="../modeledit/mixes.cpp" line="405"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="472"/>
+        <location filename="../modeledit/mixes.cpp" line="406"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="472"/>
+        <location filename="../modeledit/mixes.cpp" line="406"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixes.cpp" line="407"/>
         <source>&amp;Cut</source>
-        <translation type="obsolete">&amp;Ausschneiden</translation>
+        <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="473"/>
+        <location filename="../modeledit/mixes.cpp" line="407"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="473"/>
-        <source>C&amp;ut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/mixes.cpp" line="474"/>
+        <location filename="../modeledit/mixes.cpp" line="408"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">Ein&amp;fügen</translation>
+        <translation>Ein&amp;fügen</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="474"/>
+        <location filename="../modeledit/mixes.cpp" line="408"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="475"/>
+        <location filename="../modeledit/mixes.cpp" line="409"/>
         <source>Du&amp;plicate</source>
-        <translation>D&amp;uplizieren</translation>
+        <translation>Du&amp;plizieren</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="475"/>
+        <location filename="../modeledit/mixes.cpp" line="409"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="565"/>
+        <location filename="../modeledit/mixes.cpp" line="495"/>
         <source>Clear Mixes?</source>
         <translation>Mischer löschen?</translation>
     </message>
     <message>
-        <location filename="../modeledit/mixes.cpp" line="565"/>
+        <location filename="../modeledit/mixes.cpp" line="495"/>
         <source>Really clear all the mixes?</source>
         <translation>Wirklich alle Mischer löschen ?</translation>
     </message>
@@ -3849,17 +3810,17 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
     <message>
         <location filename="../modeledit/modeledit.cpp" line="30"/>
         <source>Heli</source>
-        <translation type="unfinished"></translation>
+        <translation>Heli</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="32"/>
         <source>Inputs</source>
-        <translation type="unfinished"></translation>
+        <translation>Inputs</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="35"/>
         <source>Servos</source>
-        <translation type="unfinished"></translation>
+        <translation>Servos</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="37"/>
@@ -3869,7 +3830,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
     <message>
         <location filename="../modeledit/modeledit.cpp" line="39"/>
         <source>Special Functions</source>
-        <translation type="unfinished">Spezial Funktionen</translation>
+        <translation>Spezial Funktionen</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.cpp" line="41"/>
@@ -3879,7 +3840,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
     <message>
         <location filename="../modeledit/modeledit.cpp" line="31"/>
         <source>Flight Modes</source>
-        <translation type="unfinished"></translation>
+        <translation>Flugphasen</translation>
     </message>
     <message>
         <location filename="../modeledit/modeledit.ui" line="51"/>
@@ -3950,7 +3911,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
     <message>
         <location filename="../modelslist.cpp" line="89"/>
         <source>&amp;Restore from backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederherstellung aus dem Backup</translation>
     </message>
     <message>
         <location filename="../modelslist.cpp" line="90"/>
@@ -4073,123 +4034,118 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
 <context>
     <name>Module</name>
     <message>
+        <location filename="../modeledit/setup_module.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="137"/>
+        <location filename="../modeledit/setup_module.ui" line="134"/>
         <source>Failsafe Mode</source>
-        <translation type="unfinished">Failsafe Mode</translation>
+        <translation>Failsafe Mode</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="153"/>
+        <location filename="../modeledit/setup_module.ui" line="150"/>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="179"/>
+        <location filename="../modeledit/setup_module.ui" line="176"/>
         <source>PPM delay</source>
         <translation>PPM Puls</translation>
     </message>
     <message>
+        <location filename="../modeledit/setup_module.ui" line="195"/>
         <source> usec</source>
-        <translation type="obsolete">usec</translation>
+        <translation>us</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="230"/>
+        <location filename="../modeledit/setup_module.ui" line="227"/>
         <source>Negative</source>
         <translation>Negativ</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="235"/>
+        <location filename="../modeledit/setup_module.ui" line="232"/>
         <source>Positive</source>
         <translation>Positiv</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="256"/>
+        <location filename="../modeledit/setup_module.ui" line="253"/>
         <source>Master</source>
         <translation>Lehrer</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="261"/>
+        <location filename="../modeledit/setup_module.ui" line="258"/>
         <source>Slave</source>
         <translation>Schüler</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="275"/>
+        <location filename="../modeledit/setup_module.ui" line="272"/>
         <source>Polarity</source>
         <translation>Polarität</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="291"/>
+        <location filename="../modeledit/setup_module.ui" line="288"/>
         <source>Trainer Mode</source>
         <translation>Trainer Mode</translation>
     </message>
     <message>
+        <location filename="../modeledit/setup_module.ui" line="310"/>
         <source> mSec</source>
-        <translation type="obsolete"> mSec</translation>
+        <translation> mSec</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="369"/>
+        <location filename="../modeledit/setup_module.ui" line="366"/>
         <source>PPM Frame Length</source>
         <translation>PPM Frame Länge</translation>
     </message>
     <message>
+        <location filename="../modeledit/setup_module.ui" line="45"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../modeledit/setup_module.ui" line="88"/>
+        <location filename="../modeledit/setup_module.ui" line="341"/>
         <source>ch</source>
-        <translation type="obsolete">ch</translation>
+        <translation>ch</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="91"/>
-        <source>CH </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup_module.ui" line="198"/>
-        <source> us</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup_module.ui" line="313"/>
-        <source> ms</source>
-        <translation type="unfinished"> ms</translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup_module.ui" line="391"/>
+        <location filename="../modeledit/setup_module.ui" line="388"/>
         <source>Channels</source>
         <translation>Kanäle</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="414"/>
+        <location filename="../modeledit/setup_module.ui" line="411"/>
         <source>Hold</source>
         <translation>Halten</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="419"/>
+        <location filename="../modeledit/setup_module.ui" line="416"/>
         <source>Custom</source>
         <translation>X und Y</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="424"/>
+        <location filename="../modeledit/setup_module.ui" line="421"/>
         <source>No Pulses</source>
         <translation>Keine Pulse</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="429"/>
+        <location filename="../modeledit/setup_module.ui" line="426"/>
         <source>Receiver</source>
         <translation>Empfänger</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="443"/>
+        <location filename="../modeledit/setup_module.ui" line="440"/>
         <source>Failsafe Positions</source>
         <translation>Failsafe Positionen</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="459"/>
+        <location filename="../modeledit/setup_module.ui" line="456"/>
         <source>Protocol</source>
         <translation>Protokoll</translation>
     </message>
     <message>
-        <location filename="../modeledit/setup_module.ui" line="532"/>
+        <location filename="../modeledit/setup_module.ui" line="529"/>
         <source>Receiver No.</source>
         <translation>Empfänger Nr.</translation>
     </message>
@@ -4219,14 +4175,10 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
 </context>
 <context>
     <name>MultirotorPage</name>
-    <message>
-        <source>Trottle Channel:</source>
-        <translation type="obsolete">Gas Kanal</translation>
-    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="809"/>
-        <source>Throttle Channel:</source>
-        <translation type="unfinished"></translation>
+        <source>Trottle Channel:</source>
+        <translation>Gas Kanal</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="811"/>
@@ -4247,758 +4199,753 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../helpers.cpp" line="47"/>
-        <location filename="../helpers.cpp" line="53"/>
+        <location filename="../helpers.cpp" line="46"/>
+        <location filename="../helpers.cpp" line="52"/>
         <source>FM%1</source>
         <oldsource>FP%1</oldsource>
         <translation>FM%1</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>Polish</source>
         <translation>Polish</translation>
     </message>
     <message>
+        <location filename="../modeledit/mixes.cpp" line="50"/>
         <source>X%1  </source>
-        <translation type="obsolete">X%1</translation>
+        <translation>X%1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="311"/>
-        <location filename="../modeledit/mixes.cpp" line="50"/>
+        <location filename="../modeledit/mixes.cpp" line="53"/>
         <location filename="../modeledit/setup.cpp" line="580"/>
         <source>CH%1</source>
         <translation>CH%1</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="104"/>
+        <location filename="../helpers.cpp" line="103"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="104"/>
+        <location filename="../helpers.cpp" line="103"/>
         <source>RotEnc A</source>
         <translation>Dreh Geb A</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="104"/>
+        <location filename="../helpers.cpp" line="103"/>
         <source>Rot Enc B</source>
         <translation>Dreh Geb B</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="104"/>
+        <location filename="../helpers.cpp" line="103"/>
         <source>Rot Enc C</source>
         <translation>Dreh Geb C</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="104"/>
+        <location filename="../helpers.cpp" line="103"/>
         <source>Rot Enc D</source>
         <translation>Dreh Geb D</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="104"/>
+        <location filename="../helpers.cpp" line="103"/>
         <source>Rot Enc E</source>
         <translation>Dreh Geb E</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="695"/>
+        <location filename="../eeprominterface.cpp" line="678"/>
         <source>Safety %1</source>
         <translation>Safety %1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="697"/>
+        <location filename="../eeprominterface.cpp" line="680"/>
         <source>Trainer</source>
         <translation>Trainer</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="699"/>
+        <location filename="../eeprominterface.cpp" line="682"/>
         <source>Trainer RUD</source>
         <translation>Trainer Sei</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="701"/>
+        <location filename="../eeprominterface.cpp" line="684"/>
         <source>Trainer ELE</source>
         <translation>Trainer Höh</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="703"/>
+        <location filename="../eeprominterface.cpp" line="686"/>
         <source>Trainer THR</source>
         <translation>Trainer Gas</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="705"/>
+        <location filename="../eeprominterface.cpp" line="688"/>
         <source>Trainer AIL</source>
         <translation>Trainer Que</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="707"/>
+        <location filename="../eeprominterface.cpp" line="690"/>
         <source>Instant Trim</source>
         <translation>Instant Trim</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="709"/>
+        <location filename="../eeprominterface.cpp" line="692"/>
         <source>Play Sound</source>
         <translation>Audio abspielen</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="725"/>
+        <location filename="../eeprominterface.cpp" line="708"/>
         <source>Start Logs</source>
         <translation>Start Log</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="711"/>
+        <location filename="../eeprominterface.cpp" line="694"/>
         <source>Play Haptic</source>
-        <translation type="unfinished"></translation>
+        <translation>Play Haptik</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="68"/>
+        <location filename="../helpers.cpp" line="67"/>
         <source>Input%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Input%1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="452"/>
-        <location filename="../helpers.cpp" line="80"/>
-        <location filename="../helpers.cpp" line="768"/>
+        <location filename="../eeprominterface.cpp" line="435"/>
+        <location filename="../helpers.cpp" line="79"/>
+        <location filename="../helpers.cpp" line="767"/>
         <source>---</source>
         <translation>---</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Rud Trim</source>
         <translation>Sei Trim</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Ele Trim</source>
         <translation>Höh Trim</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Thr Trim</source>
         <translation>Gas Trim</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Ail Trim</source>
         <translation>Que Trim</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Rot Enc</source>
         <translation>Dreh Geb</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>English</source>
         <translation>English</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>French</source>
         <translation>French</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>Italian</source>
         <translation>Italien</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>German</source>
         <translation>Deutch</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>Czech</source>
         <translation>Czech</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>Slovak</source>
         <translation>Slovak</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>Spanish</source>
         <translation>Spanish</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>Portuguese</source>
         <translation>Portuguese</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>Swedish</source>
         <translation>Swedish</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="812"/>
+        <location filename="../eeprominterface.cpp" line="795"/>
         <location filename="../modeledit/customfunctions.cpp" line="23"/>
         <source>No repeat</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Wiederholung</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="816"/>
+        <location filename="../eeprominterface.cpp" line="799"/>
         <source>%1 sec</source>
         <translation>%1 sec</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="713"/>
+        <location filename="../eeprominterface.cpp" line="696"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="220"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>S3</source>
         <translation>S3</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="262"/>
+        <location filename="../eeprominterface.cpp" line="242"/>
         <source>RSSI Tx</source>
         <translation>RSSI Tx</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="262"/>
+        <location filename="../eeprominterface.cpp" line="242"/>
         <source>RSSI Rx</source>
         <translation>RSSI RX</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="262"/>
+        <location filename="../eeprominterface.cpp" line="242"/>
         <source>Rx Batt</source>
         <translation>RX Batt</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="263"/>
+        <location filename="../eeprominterface.cpp" line="243"/>
         <source>A3</source>
         <translation>A3</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="263"/>
+        <location filename="../eeprominterface.cpp" line="243"/>
         <source>A4</source>
         <translation>A4</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="266"/>
+        <location filename="../eeprominterface.cpp" line="246"/>
         <source>Cells</source>
         <translation>Zellen</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="268"/>
+        <location filename="../eeprominterface.cpp" line="248"/>
         <source>AirSpeed</source>
-        <translation type="unfinished"></translation>
+        <translation>AirSpeed</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="268"/>
+        <location filename="../eeprominterface.cpp" line="248"/>
         <source>dTE</source>
         <translation>dTE</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="268"/>
-        <source>Hdg </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../eeprominterface.cpp" line="269"/>
+        <location filename="../eeprominterface.cpp" line="249"/>
         <source>A3-</source>
         <translation>A3-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="269"/>
+        <location filename="../eeprominterface.cpp" line="249"/>
         <source>A4-</source>
         <translation>A4-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="270"/>
+        <location filename="../eeprominterface.cpp" line="250"/>
         <source>Speed+</source>
         <translation>Geschw+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="270"/>
+        <location filename="../eeprominterface.cpp" line="250"/>
         <source>Dist+</source>
-        <translation type="unfinished"></translation>
+        <translation>Dist+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="270"/>
+        <location filename="../eeprominterface.cpp" line="250"/>
         <source>AirSpeed+</source>
-        <translation type="unfinished"></translation>
+        <translation>Airspeed+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="271"/>
+        <location filename="../eeprominterface.cpp" line="251"/>
         <source>Cell-</source>
-        <translation type="unfinished"></translation>
+        <translation>Zelle-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="271"/>
+        <location filename="../eeprominterface.cpp" line="251"/>
         <source>Cells-</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="271"/>
+        <location filename="../eeprominterface.cpp" line="251"/>
         <source>Vfas-</source>
-        <translation type="unfinished"></translation>
+        <translation>Vfas-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="271"/>
+        <location filename="../eeprominterface.cpp" line="251"/>
         <source>Curr+</source>
-        <translation type="unfinished"></translation>
+        <translation>Strom+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="271"/>
+        <location filename="../eeprominterface.cpp" line="251"/>
         <source>Powr+</source>
-        <translation>Leist+</translation>
+        <translation>Leistung+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="272"/>
+        <location filename="../eeprominterface.cpp" line="252"/>
         <source>ACC</source>
-        <translation type="unfinished"></translation>
+        <translation>ACC</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L1</source>
-        <translation type="unfinished"></translation>
+        <translation>L1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L2</source>
-        <translation type="unfinished"></translation>
+        <translation>L2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L3</source>
-        <translation type="unfinished"></translation>
+        <translation>L3</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L4</source>
-        <translation type="unfinished"></translation>
+        <translation>L4</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L5</source>
-        <translation type="unfinished"></translation>
+        <translation>L5</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L6</source>
-        <translation type="unfinished"></translation>
+        <translation>L6</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L7</source>
-        <translation type="unfinished"></translation>
+        <translation>L7</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L8</source>
-        <translation type="unfinished"></translation>
+        <translation>L8</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L9</source>
-        <translation type="unfinished"></translation>
+        <translation>L9</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="276"/>
-        <location filename="../eeprominterface.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="256"/>
+        <location filename="../eeprominterface.cpp" line="336"/>
         <source>L10</source>
-        <translation type="unfinished"></translation>
+        <translation>L10</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L11</source>
-        <translation type="unfinished"></translation>
+        <translation>L11</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L12</source>
-        <translation type="unfinished"></translation>
+        <translation>L12</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L13</source>
-        <translation type="unfinished"></translation>
+        <translation>L13</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L14</source>
-        <translation type="unfinished"></translation>
+        <translation>L14</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L15</source>
-        <translation type="unfinished"></translation>
+        <translation>L15</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L16</source>
-        <translation type="unfinished"></translation>
+        <translation>L16</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L17</source>
-        <translation type="unfinished"></translation>
+        <translation>L17</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L18</source>
-        <translation type="unfinished"></translation>
+        <translation>L18</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L19</source>
-        <translation type="unfinished"></translation>
+        <translation>L19</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="277"/>
-        <location filename="../eeprominterface.cpp" line="354"/>
+        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="337"/>
         <source>L20</source>
-        <translation type="unfinished"></translation>
+        <translation>L20</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L21</source>
-        <translation type="unfinished"></translation>
+        <translation>L21</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L22</source>
-        <translation type="unfinished"></translation>
+        <translation>L22</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L23</source>
-        <translation type="unfinished"></translation>
+        <translation>L23</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L24</source>
-        <translation type="unfinished"></translation>
+        <translation>L24</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L25</source>
-        <translation type="unfinished"></translation>
+        <translation>L25</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L26</source>
-        <translation type="unfinished"></translation>
+        <translation>L26</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L27</source>
-        <translation type="unfinished"></translation>
+        <translation>L27</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L28</source>
-        <translation type="unfinished"></translation>
+        <translation>L28</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L29</source>
-        <translation type="unfinished"></translation>
+        <translation>L29</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="278"/>
-        <location filename="../eeprominterface.cpp" line="355"/>
+        <location filename="../eeprominterface.cpp" line="258"/>
+        <location filename="../eeprominterface.cpp" line="338"/>
         <source>L30</source>
-        <translation type="unfinished"></translation>
+        <translation>L30</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="279"/>
-        <location filename="../eeprominterface.cpp" line="356"/>
+        <location filename="../eeprominterface.cpp" line="259"/>
+        <location filename="../eeprominterface.cpp" line="339"/>
         <source>L31</source>
-        <translation type="unfinished"></translation>
+        <translation>L31</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="279"/>
-        <location filename="../eeprominterface.cpp" line="356"/>
+        <location filename="../eeprominterface.cpp" line="259"/>
+        <location filename="../eeprominterface.cpp" line="339"/>
         <source>L32</source>
-        <translation type="unfinished"></translation>
+        <translation>L32</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="288"/>
+        <location filename="../eeprominterface.cpp" line="268"/>
         <source>[I%1]</source>
-        <translation type="unfinished"></translation>
+        <translation>[I%1]</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="309"/>
+        <location filename="../eeprominterface.cpp" line="289"/>
         <source>TR%1</source>
         <translation>TR%1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="362"/>
+        <location filename="../eeprominterface.cpp" line="345"/>
         <source>S31</source>
         <translation>S31</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="362"/>
+        <location filename="../eeprominterface.cpp" line="345"/>
         <source>S32</source>
         <translation>S32</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="362"/>
+        <location filename="../eeprominterface.cpp" line="345"/>
         <source>S33</source>
         <translation>S33</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="362"/>
+        <location filename="../eeprominterface.cpp" line="345"/>
         <source>S34</source>
         <translation>S34</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="362"/>
+        <location filename="../eeprominterface.cpp" line="345"/>
         <source>S35</source>
         <translation>S35</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="362"/>
+        <location filename="../eeprominterface.cpp" line="345"/>
         <source>S36</source>
         <translation>S36</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="454"/>
+        <location filename="../eeprominterface.cpp" line="437"/>
         <source>a&gt;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="456"/>
+        <location filename="../eeprominterface.cpp" line="439"/>
         <source>a&lt;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="458"/>
+        <location filename="../eeprominterface.cpp" line="441"/>
         <source>|a|&gt;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="460"/>
+        <location filename="../eeprominterface.cpp" line="443"/>
         <source>|a|&lt;x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="462"/>
+        <location filename="../eeprominterface.cpp" line="445"/>
         <source>AND</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="464"/>
+        <location filename="../eeprominterface.cpp" line="447"/>
         <source>OR</source>
         <translation>OR</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="466"/>
+        <location filename="../eeprominterface.cpp" line="449"/>
         <source>XOR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="468"/>
+        <location filename="../eeprominterface.cpp" line="451"/>
         <source>a=b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="470"/>
+        <location filename="../eeprominterface.cpp" line="453"/>
         <source>a!=b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="472"/>
+        <location filename="../eeprominterface.cpp" line="455"/>
         <source>a&gt;b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="474"/>
+        <location filename="../eeprominterface.cpp" line="457"/>
         <source>a&lt;b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="476"/>
+        <location filename="../eeprominterface.cpp" line="459"/>
         <source>a&gt;=b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="478"/>
+        <location filename="../eeprominterface.cpp" line="461"/>
         <source>a&lt;=b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="480"/>
+        <location filename="../eeprominterface.cpp" line="463"/>
         <source>d&gt;=x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="482"/>
+        <location filename="../eeprominterface.cpp" line="465"/>
         <source>|d|&gt;=x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="484"/>
+        <location filename="../eeprominterface.cpp" line="467"/>
         <source>a=x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="486"/>
+        <location filename="../eeprominterface.cpp" line="469"/>
         <source>a~x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="488"/>
+        <location filename="../eeprominterface.cpp" line="471"/>
         <source>Timer</source>
         <translation>Takt</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="490"/>
+        <location filename="../eeprominterface.cpp" line="473"/>
         <source>Sticky</source>
         <translation>SRFF</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="494"/>
+        <location filename="../eeprominterface.cpp" line="477"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="510"/>
+        <location filename="../eeprominterface.cpp" line="493"/>
         <source>STAY(%1, [%2:%3])</source>
         <translation>Puls(%1, [%2:%3])</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="513"/>
+        <location filename="../eeprominterface.cpp" line="496"/>
         <source>STICKY(%1, %2)</source>
         <translation>SRFF(%1, %2)</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="516"/>
+        <location filename="../eeprominterface.cpp" line="499"/>
         <source>TIMER(%1, %2)</source>
-        <translation type="unfinished">Takt(%1, %2)</translation>
+        <translation>Takt(%1, %2)</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="715"/>
+        <location filename="../eeprominterface.cpp" line="698"/>
         <source>Set Timer %1</source>
         <translation>Set Timer %1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="717"/>
+        <location filename="../eeprominterface.cpp" line="700"/>
         <source>Vario</source>
         <translation>Vario</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="719"/>
+        <location filename="../eeprominterface.cpp" line="702"/>
         <source>Play Track</source>
         <translation>Spiel Sound</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="721"/>
+        <location filename="../eeprominterface.cpp" line="704"/>
         <source>Play Both</source>
-        <translation>Sag Beide</translation>
+        <translation>Sag Beides</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="723"/>
+        <location filename="../eeprominterface.cpp" line="706"/>
         <source>Play Value</source>
         <translation>Sag Wert</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="727"/>
+        <location filename="../eeprominterface.cpp" line="710"/>
         <source>Volume</source>
         <translation>Lautstärke</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="729"/>
+        <location filename="../eeprominterface.cpp" line="712"/>
         <source>Backlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="731"/>
+        <location filename="../eeprominterface.cpp" line="714"/>
         <source>Background Music</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="733"/>
+        <location filename="../eeprominterface.cpp" line="716"/>
         <source>Background Music Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="597"/>
+        <location filename="../eeprominterface.cpp" line="580"/>
         <source> Delay %1 sec</source>
         <translation>Verzögerung %1 sec</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="492"/>
+        <location filename="../eeprominterface.cpp" line="475"/>
         <source>Edge</source>
         <translation>Puls</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="599"/>
+        <location filename="../eeprominterface.cpp" line="582"/>
         <source> Duration %1 sec</source>
         <translation>Dauer %1 sec</translation>
     </message>
     <message>
+        <location filename="../eeprominterface.cpp" line="606"/>
+        <location filename="../eeprominterface.cpp" line="613"/>
         <location filename="../eeprominterface.cpp" line="623"/>
-        <location filename="../eeprominterface.cpp" line="630"/>
-        <location filename="../eeprominterface.cpp" line="640"/>
+        <location filename="../eeprominterface.cpp" line="736"/>
+        <location filename="../eeprominterface.cpp" line="743"/>
         <location filename="../eeprominterface.cpp" line="753"/>
-        <location filename="../eeprominterface.cpp" line="760"/>
-        <location filename="../eeprominterface.cpp" line="770"/>
         <source>&lt;font color=red&gt;&lt;b&gt;Inconsistent parameter&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="635"/>
-        <location filename="../eeprominterface.cpp" line="765"/>
-        <location filename="../modeledit/customfunctions.cpp" line="641"/>
+        <location filename="../eeprominterface.cpp" line="618"/>
+        <location filename="../eeprominterface.cpp" line="748"/>
+        <location filename="../modeledit/customfunctions.cpp" line="638"/>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="636"/>
-        <location filename="../eeprominterface.cpp" line="766"/>
-        <location filename="../modeledit/customfunctions.cpp" line="642"/>
+        <location filename="../eeprominterface.cpp" line="619"/>
+        <location filename="../eeprominterface.cpp" line="749"/>
+        <location filename="../modeledit/customfunctions.cpp" line="639"/>
         <source>Telemetry</source>
         <translation>Telemetrie</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="656"/>
-        <location filename="../eeprominterface.cpp" line="786"/>
+        <location filename="../eeprominterface.cpp" line="639"/>
+        <location filename="../eeprominterface.cpp" line="769"/>
         <source>Value </source>
         <translation>Wert</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="666"/>
-        <location filename="../eeprominterface.cpp" line="796"/>
+        <location filename="../eeprominterface.cpp" line="649"/>
+        <location filename="../eeprominterface.cpp" line="779"/>
         <source>Decr:</source>
         <translation>Decr:</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="669"/>
-        <location filename="../eeprominterface.cpp" line="799"/>
+        <location filename="../eeprominterface.cpp" line="652"/>
+        <location filename="../eeprominterface.cpp" line="782"/>
         <source>Incr:</source>
         <translation>Incr:</translation>
     </message>
@@ -5013,214 +4960,214 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <translation>%1s</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="735"/>
+        <location filename="../eeprominterface.cpp" line="718"/>
         <source>Adjust GV%1</source>
         <translation>Adjust GV %1</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="645"/>
+        <location filename="../modeledit/customfunctions.cpp" line="642"/>
         <source>Rotary Encoder</source>
         <translation>Dreh Geber</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="595"/>
+        <location filename="../modeledit/customfunctions.cpp" line="592"/>
         <source>Value</source>
         <translation>Wert</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="596"/>
+        <location filename="../modeledit/customfunctions.cpp" line="593"/>
         <source>Source</source>
         <translation>Quelle</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="597"/>
+        <location filename="../modeledit/customfunctions.cpp" line="594"/>
         <source>GVAR</source>
         <translation>GVAR</translation>
     </message>
     <message>
-        <location filename="../modeledit/customfunctions.cpp" line="598"/>
+        <location filename="../modeledit/customfunctions.cpp" line="595"/>
         <source>Increment</source>
         <translation>Increment</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="131"/>
+        <location filename="../helpers.cpp" line="130"/>
         <source>!Flight mode %1</source>
         <translation>!Flugphase %1</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="133"/>
+        <location filename="../helpers.cpp" line="132"/>
         <source>Flight mode %1</source>
         <translation>Flugphase %1</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="346"/>
+        <location filename="../helpers.cpp" line="345"/>
         <source>Flight mode %1 value</source>
         <translation>Flugphase %1 Wert</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="754"/>
+        <location filename="../helpers.cpp" line="753"/>
         <source>Yellow</source>
         <translation>Gelb</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="756"/>
+        <location filename="../helpers.cpp" line="755"/>
         <source>Orange</source>
         <translation>Orange</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="758"/>
+        <location filename="../helpers.cpp" line="757"/>
         <source>Red</source>
         <translation>Rot</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="779"/>
+        <location filename="../helpers.cpp" line="778"/>
         <source>Winged Shadow How High</source>
         <translation>Winged Shadow How High</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="781"/>
+        <location filename="../helpers.cpp" line="780"/>
         <source>Winged Shadow How High (not supported)</source>
         <translation>Winged Shadow How High (nicht unterstützt)</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="783"/>
+        <location filename="../helpers.cpp" line="782"/>
         <source>FrSky Sensor Hub</source>
         <translation>FrSky Sensor Hub</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="785"/>
-        <location filename="../helpers.cpp" line="839"/>
+        <location filename="../helpers.cpp" line="784"/>
+        <location filename="../helpers.cpp" line="838"/>
         <source>None</source>
         <translation>Kein</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="793"/>
+        <location filename="../helpers.cpp" line="792"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="795"/>
+        <location filename="../helpers.cpp" line="794"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="807"/>
+        <location filename="../helpers.cpp" line="806"/>
         <source>Extra Fine</source>
         <translation>Sehr fein</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="808"/>
+        <location filename="../helpers.cpp" line="807"/>
         <source>Fine</source>
         <translation>Fein</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="809"/>
+        <location filename="../helpers.cpp" line="808"/>
         <source>Medium</source>
         <translation>Mittel</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="810"/>
+        <location filename="../helpers.cpp" line="809"/>
         <source>Coarse</source>
         <translation>Grob</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="811"/>
+        <location filename="../helpers.cpp" line="810"/>
         <source>Exponential</source>
         <translation>Exponential</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="817"/>
+        <location filename="../helpers.cpp" line="816"/>
         <source>Count Up</source>
         <translation>Count Up</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="817"/>
+        <location filename="../helpers.cpp" line="816"/>
         <source>Count Down</source>
         <translation>Count Down</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="818"/>
+        <location filename="../helpers.cpp" line="817"/>
         <source>%1:%2, </source>
         <translation>%1:%2, </translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="826"/>
+        <location filename="../helpers.cpp" line="825"/>
         <source>: %1 Channels, %2usec Delay</source>
-        <translation>: %1 Kanäle, %2usec Verzögerung {1 ?} {2u?}</translation>
+        <translation>: %1 Kanäle, %2us Verzögerung</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="850"/>
+        <location filename="../helpers.cpp" line="849"/>
         <source>Flight modes(%1)</source>
         <translation>Flugphasen(%1)</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="852"/>
+        <location filename="../helpers.cpp" line="851"/>
         <source>Flight mode(%1)</source>
         <translation>Flugphase(%1)</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="863"/>
+        <location filename="../helpers.cpp" line="862"/>
         <source>Rudder</source>
         <translation>Seitenruder</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="864"/>
+        <location filename="../helpers.cpp" line="863"/>
         <source>Elevator</source>
         <translation>Höhenruder</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="865"/>
+        <location filename="../helpers.cpp" line="864"/>
         <source>Throttle</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="866"/>
+        <location filename="../helpers.cpp" line="865"/>
         <source>Aileron</source>
         <translation>Querruder</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="343"/>
+        <location filename="../helpers.cpp" line="342"/>
         <source>Own value</source>
         <translation>Eigener Wert</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="90"/>
+        <location filename="../helpers.cpp" line="89"/>
         <source>Finnish</source>
         <translation>Finnish</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="353"/>
+        <location filename="../helpers.cpp" line="352"/>
         <source>Keys</source>
         <translation>Tasten</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="353"/>
+        <location filename="../helpers.cpp" line="352"/>
         <source>Sticks</source>
         <translation>Knüppel</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="353"/>
+        <location filename="../helpers.cpp" line="352"/>
         <source>Keys + Sticks</source>
         <translation>Taste+Knüppel</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="88"/>
-        <location filename="../helpers.cpp" line="505"/>
+        <location filename="../eeprominterface.cpp" line="87"/>
+        <location filename="../helpers.cpp" line="504"/>
         <source>-GV%1</source>
         <translation>-GV%1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="90"/>
-        <location filename="../eeprominterface.cpp" line="315"/>
-        <location filename="../helpers.cpp" line="522"/>
+        <location filename="../eeprominterface.cpp" line="89"/>
+        <location filename="../eeprominterface.cpp" line="298"/>
+        <location filename="../helpers.cpp" line="521"/>
         <source>GV%1</source>
         <translation>GV%1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="283"/>
-        <location filename="../eeprominterface.cpp" line="317"/>
-        <location filename="../eeprominterface.cpp" line="404"/>
-        <location filename="../helpers.cpp" line="135"/>
+        <location filename="../eeprominterface.cpp" line="263"/>
+        <location filename="../eeprominterface.cpp" line="300"/>
+        <location filename="../eeprominterface.cpp" line="387"/>
+        <location filename="../helpers.cpp" line="134"/>
         <source>----</source>
         <translation>----</translation>
     </message>
@@ -5231,685 +5178,456 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="239"/>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../eeprominterface.cpp" line="219"/>
+        <location filename="../helpers.cpp" line="79"/>
         <location filename="../modeledit/setup.cpp" line="557"/>
         <source>P1</source>
         <translation>P1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="239"/>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../eeprominterface.cpp" line="219"/>
+        <location filename="../helpers.cpp" line="79"/>
         <location filename="../modeledit/setup.cpp" line="557"/>
         <source>P2</source>
         <translation>P2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="239"/>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../eeprominterface.cpp" line="219"/>
+        <location filename="../helpers.cpp" line="79"/>
         <location filename="../modeledit/setup.cpp" line="557"/>
         <source>P3</source>
         <translation>P3</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="261"/>
+        <location filename="../eeprominterface.cpp" line="241"/>
         <source>Batt</source>
-        <translation>Akku</translation>
+        <translation>TX-Akku</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="262"/>
+        <location filename="../eeprominterface.cpp" line="242"/>
         <source>SWR</source>
         <translation>SWR</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="301"/>
+        <location filename="../eeprominterface.cpp" line="281"/>
         <source>MAX</source>
         <translation>MAX</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="360"/>
+        <location filename="../eeprominterface.cpp" line="343"/>
         <source>S11</source>
         <translation>S11</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="360"/>
+        <location filename="../eeprominterface.cpp" line="343"/>
         <source>S12</source>
         <translation>S12</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="360"/>
+        <location filename="../eeprominterface.cpp" line="343"/>
         <source>S13</source>
         <translation>S13</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="360"/>
+        <location filename="../eeprominterface.cpp" line="343"/>
         <source>S14</source>
         <translation>S14</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="360"/>
+        <location filename="../eeprominterface.cpp" line="343"/>
         <source>S15</source>
         <translation>S15</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="360"/>
+        <location filename="../eeprominterface.cpp" line="343"/>
         <source>S16</source>
         <translation>S16</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="361"/>
+        <location filename="../eeprominterface.cpp" line="344"/>
         <source>S21</source>
         <translation>S21</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="361"/>
+        <location filename="../eeprominterface.cpp" line="344"/>
         <source>S22</source>
         <translation>S22</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="361"/>
+        <location filename="../eeprominterface.cpp" line="344"/>
         <source>S23</source>
         <translation>S23</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="361"/>
+        <location filename="../eeprominterface.cpp" line="344"/>
         <source>S24</source>
         <translation>S24</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="361"/>
+        <location filename="../eeprominterface.cpp" line="344"/>
         <source>S25</source>
         <translation>S25</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="361"/>
+        <location filename="../eeprominterface.cpp" line="344"/>
         <source>S26</source>
         <translation>S26</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="366"/>
+        <location filename="../eeprominterface.cpp" line="349"/>
         <source>RudTrim Left</source>
         <translation>SeiteTrim links</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="366"/>
+        <location filename="../eeprominterface.cpp" line="349"/>
         <source>RudTrim Right</source>
         <translation>SeiteTrim rechts</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="367"/>
+        <location filename="../eeprominterface.cpp" line="350"/>
         <source>EleTrim Down</source>
         <translation>HöheTrim ab</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="367"/>
+        <location filename="../eeprominterface.cpp" line="350"/>
         <source>EleTrim Up</source>
         <translation>HöheTrim auf</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="368"/>
+        <location filename="../eeprominterface.cpp" line="351"/>
         <source>ThrTrim Down</source>
         <translation>GasTrim ab</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="368"/>
+        <location filename="../eeprominterface.cpp" line="351"/>
         <source>ThrTrim Up</source>
         <translation>GasTrim auf</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="369"/>
+        <location filename="../eeprominterface.cpp" line="352"/>
         <source>AilTrim Left</source>
         <translation>QuerTrim links</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="369"/>
+        <location filename="../eeprominterface.cpp" line="352"/>
         <source>AilTrim Right</source>
         <translation>QuerTrim rechts</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="377"/>
+        <location filename="../eeprominterface.cpp" line="360"/>
         <source>ABS</source>
         <translation>ABS</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="378"/>
+        <location filename="../eeprominterface.cpp" line="361"/>
         <source>THs</source>
         <translation>GSs</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="378"/>
+        <location filename="../eeprominterface.cpp" line="361"/>
         <source>TH%</source>
         <translation>Gs%</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="378"/>
+        <location filename="../eeprominterface.cpp" line="361"/>
         <source>THt</source>
         <translation>Gst</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="408"/>
+        <location filename="../eeprominterface.cpp" line="391"/>
         <source>???</source>
         <translation>???</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="421"/>
+        <location filename="../eeprominterface.cpp" line="404"/>
         <source>Diff(%1)</source>
         <translation>Diff(%1)</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="423"/>
+        <location filename="../eeprominterface.cpp" line="406"/>
         <source>Expo(%1)</source>
         <translation>Expo(%1)</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="425"/>
+        <location filename="../eeprominterface.cpp" line="408"/>
         <source>Function(%1)</source>
         <translation>Funktion(%1)</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="427"/>
+        <location filename="../eeprominterface.cpp" line="410"/>
         <source>Curve(%1)</source>
-        <translation>Kurve(1%)</translation>
+        <translation>Kurve(%1)</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="427"/>
+        <location filename="../eeprominterface.cpp" line="410"/>
         <source>!Curve(%1)</source>
         <translation>!Kurve(%1)</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="238"/>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../eeprominterface.cpp" line="218"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Rud</source>
         <translation>Sei</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="238"/>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../eeprominterface.cpp" line="218"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Ele</source>
         <translation>Höh</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="238"/>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../eeprominterface.cpp" line="218"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Thr</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="238"/>
-        <location filename="../helpers.cpp" line="80"/>
+        <location filename="../eeprominterface.cpp" line="218"/>
+        <location filename="../helpers.cpp" line="79"/>
         <source>Ail</source>
         <translatorcomment>unsure</translatorcomment>
         <translation>Que</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="237"/>
         <source>TrmR</source>
         <translation>TrmS</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="237"/>
         <source>TrmE</source>
         <translation>TrmH</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="237"/>
         <source>TrmT</source>
         <translation>TrmG</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="257"/>
+        <location filename="../eeprominterface.cpp" line="237"/>
         <source>TrmA</source>
         <translation>TrmQ</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="220"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>S1</source>
         <translation>S1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="220"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>S2</source>
         <translation>S2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="220"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>LS</source>
         <translation>LS</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="240"/>
+        <location filename="../eeprominterface.cpp" line="220"/>
         <location filename="../modeledit/setup.cpp" line="558"/>
         <source>RS</source>
         <translation>RS</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="250"/>
-        <location filename="../eeprominterface.cpp" line="373"/>
-        <location filename="../modeledit/customfunctions.cpp" line="648"/>
+        <location filename="../eeprominterface.cpp" line="230"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
+        <location filename="../modeledit/customfunctions.cpp" line="645"/>
         <source>REa</source>
         <translation>DGa</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="250"/>
-        <location filename="../eeprominterface.cpp" line="373"/>
-        <location filename="../modeledit/customfunctions.cpp" line="649"/>
+        <location filename="../eeprominterface.cpp" line="230"/>
+        <location filename="../eeprominterface.cpp" line="356"/>
+        <location filename="../modeledit/customfunctions.cpp" line="646"/>
         <source>REb</source>
         <translation>DGb</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="264"/>
+        <location filename="../eeprominterface.cpp" line="244"/>
         <source>Alt</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="264"/>
+        <location filename="../eeprominterface.cpp" line="244"/>
         <source>Rpm</source>
-        <translation type="unfinished"></translation>
+        <translation>Rpm</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="264"/>
+        <location filename="../eeprominterface.cpp" line="244"/>
         <source>Fuel</source>
-        <translation type="unfinished"></translation>
+        <translation>Fuel</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="265"/>
+        <location filename="../eeprominterface.cpp" line="245"/>
         <source>Speed</source>
         <translation>Geschw</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="265"/>
+        <location filename="../eeprominterface.cpp" line="245"/>
         <source>Dist</source>
-        <translation type="unfinished"></translation>
+        <translation>Dist</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="265"/>
+        <location filename="../eeprominterface.cpp" line="245"/>
         <source>GPS Alt</source>
         <translation>GPS Alt</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="266"/>
+        <location filename="../eeprominterface.cpp" line="246"/>
         <source>Cell</source>
         <translation>Zelle</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="266"/>
+        <location filename="../eeprominterface.cpp" line="246"/>
         <source>Vfas</source>
         <translation>Vfas</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="266"/>
+        <location filename="../eeprominterface.cpp" line="246"/>
         <source>Curr</source>
-        <translation>Str</translation>
+        <translation>Strom</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="266"/>
+        <location filename="../eeprominterface.cpp" line="246"/>
         <source>Cnsp</source>
-        <translation>Verbr</translation>
+        <translation>Verbrauch</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="266"/>
+        <location filename="../eeprominterface.cpp" line="246"/>
         <source>Powr</source>
-        <translation>Leist</translation>
+        <translation>Leistung</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="267"/>
+        <location filename="../eeprominterface.cpp" line="247"/>
         <source>AccX</source>
-        <translation type="unfinished"></translation>
+        <translation>AccX</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="267"/>
+        <location filename="../eeprominterface.cpp" line="247"/>
         <source>AccY</source>
-        <translation type="unfinished"></translation>
+        <translation>AccY</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="267"/>
+        <location filename="../eeprominterface.cpp" line="247"/>
         <source>AccZ</source>
-        <translation type="unfinished"></translation>
+        <translation>AccZ</translation>
     </message>
     <message>
+        <location filename="../eeprominterface.cpp" line="248"/>
         <source>HDG </source>
-        <translation type="obsolete">HDG </translation>
+        <translation>HDG </translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="268"/>
+        <location filename="../eeprominterface.cpp" line="248"/>
         <source>VSpd</source>
-        <translation>VSpd</translation>
+        <translation>V-Speed</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="269"/>
+        <location filename="../eeprominterface.cpp" line="249"/>
         <source>A1-</source>
         <translation>A1-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="269"/>
+        <location filename="../eeprominterface.cpp" line="249"/>
         <source>A2-</source>
         <translation>A2-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="270"/>
+        <location filename="../eeprominterface.cpp" line="250"/>
         <source>Alt-</source>
         <translation>Alt-</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="270"/>
+        <location filename="../eeprominterface.cpp" line="250"/>
         <source>Alt+</source>
         <translation>Alt+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="270"/>
+        <location filename="../eeprominterface.cpp" line="250"/>
         <source>Rpm+</source>
-        <translation type="unfinished"></translation>
+        <translation>Rpm+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="270"/>
+        <location filename="../eeprominterface.cpp" line="250"/>
         <source>T1+</source>
         <translation>T1+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="270"/>
+        <location filename="../eeprominterface.cpp" line="250"/>
         <source>T2+</source>
         <translation>T2+</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="272"/>
+        <location filename="../eeprominterface.cpp" line="252"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
+        <location filename="../eeprominterface.cpp" line="294"/>
         <source>X%1</source>
-        <translation type="obsolete">X%1</translation>
+        <translation>X%1</translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1020"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1022"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1024"/>
         <source>Support for frsky telemetry mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1020"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1022"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1024"/>
         <source>Support for jeti telemetry mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1020"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1022"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1024"/>
         <source>Support for receiving ardupilot data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1020"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1022"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1024"/>
         <source>Support for receiving NMEA data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1020"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1022"/>
         <source>Support for telemetry easy board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1020"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1022"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1024"/>
         <source>Support for MAVLINK devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1021"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1023"/>
         <source>Rotary Encoder use in menus navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1023"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1025"/>
         <source>Possibility to enable FAI MODE at field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1023"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1025"/>
         <source>FAI MODE always enabled</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1027"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1064"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1096"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1130"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1160"/>
-        <source>Enable heli menu and cyclic mix support</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1028"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1065"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1097"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1131"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1161"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1191"/>
-        <source>Enable TEMPLATES menu</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1029"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1066"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1098"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1132"/>
-        <source>No splash screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1031"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1068"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1100"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1134"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1163"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1193"/>
-        <source>Disable curves menus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1032"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1069"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1101"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1135"/>
-        <source>Support for radio modified with regular speaker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1033"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1070"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1102"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1136"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1165"/>
-        <source>Used if you have modified your radio with voice mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1034"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1071"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1103"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1137"/>
-        <source>Used if you have modified your radio with haptic mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1038"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1075"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1107"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1141"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1170"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1195"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1217"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1227"/>
-        <source>Channel values displayed in us</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1043"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1080"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1111"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1145"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1174"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1199"/>
-        <source>In model setup menus automatically set source by moving the control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1044"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1081"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1112"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1146"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1175"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1200"/>
-        <source>In model setup menus automatically set switch by moving the control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1049"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1086"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1116"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1150"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1180"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1205"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1218"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1228"/>
-        <source>Use alternative SQT5 font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1050"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1087"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1117"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1151"/>
-        <source>Enable the throttle trace in Statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1051"/>
-        <source>EEprom write progress bar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1053"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1120"/>
-        <source>No Winged Shadow How High support</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1054"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1121"/>
-        <source>No vario support</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1055"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1122"/>
-        <source>No GPS support</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1056"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1123"/>
-        <source>No gauges in the custom telemetry screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1057"/>
-        <source>Allow compensating for offset errors in FrSky FAS current sensors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1213"/>
-        <source>OpenTX for FrSky Taranis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1223"/>
-        <source>OpenTX for FrSky Taranis Rev4a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1166"/>
-        <source>Support of FrSky PXX protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1188"/>
-        <source>OpenTX for Sky9x board / 9X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1206"/>
-        <source>Use FrSky Taranis sticks in a 9X/9XR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1214"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1224"/>
-        <source>Disable HELI menu and cyclic mix support</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1215"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1225"/>
-        <source>Disable TEMPLATES menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1216"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1226"/>
-        <source>Disable Global variables</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1036"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1073"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1105"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1139"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1167"/>
-        <source>Support for DSM2 modules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1037"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1074"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1106"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1140"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1169"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1194"/>
-        <source>PPM center adjustment in limits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1040"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1077"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1109"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1143"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1172"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1197"/>
-        <source>Symetrical Limits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1021"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1110"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1144"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1173"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1198"/>
-        <source>Pots use in menus navigation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="310"/>
-        <source>Your radio probably uses a wrong firmware,
- eeprom size is 4096 but only the first 2048 are used</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1025"/>
-        <source>OpenTX for 9X board</source>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1162"/>
+        <source>Enable heli menu and cyclic mix support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5917,66 +5635,64 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1067"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1099"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1133"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1162"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1192"/>
-        <source>No flight modes</source>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1163"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1193"/>
+        <source>Enable TEMPLATES menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1042"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1079"/>
-        <source>SmartieParts 2.2 Backlight support</source>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1031"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1068"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1100"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1134"/>
+        <source>No splash screen</source>
+        <translation>Kein Startbild</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1033"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1070"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1102"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1136"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1165"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1195"/>
+        <source>Disable curves menus</source>
+        <translation>Kein Kurvenmenü</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1034"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1071"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1103"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1137"/>
+        <source>Support for radio modified with regular speaker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1045"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1082"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1176"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1201"/>
-        <source>Enable resetting values by pressing up and down at the same time</source>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1035"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1072"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1104"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1138"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1167"/>
+        <source>Used if you have modified your radio with voice mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1046"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1083"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1113"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1147"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1177"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1202"/>
-        <source>No graphical check boxes and sliders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1047"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1084"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1114"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1148"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1178"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1203"/>
-        <source>Battery graph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1048"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1085"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1115"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1149"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1179"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1204"/>
-        <source>Don&apos;t use bold font for highlighting active items</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1062"/>
-        <source>OpenTX for M128 / 9X board</source>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1036"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1073"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1105"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1139"/>
+        <source>Used if you have modified your radio with haptic mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1051"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1088"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1118"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1152"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1181"/>
-        <source>EEprom write Progress bar</source>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1182"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1207"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1220"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1230"/>
+        <source>Use alternative SQT5 font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5984,13 +5700,93 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1089"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1119"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1153"/>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1182"/>
-        <source>Imperial units</source>
-        <translation>Imperial Einheiten</translation>
+        <source>Enable the throttle trace in Statistics</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1207"/>
-        <source>Bluetooth interface</source>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1053"/>
+        <source>EEprom write progress bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1055"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1122"/>
+        <source>No Winged Shadow How High support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1056"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1123"/>
+        <source>No vario support</source>
+        <translation>Kein Vario</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1057"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1124"/>
+        <source>No GPS support</source>
+        <translation>Kein GPS</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1058"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1125"/>
+        <source>No gauges in the custom telemetry screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1059"/>
+        <source>Allow compensating for offset errors in FrSky FAS current sensors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1215"/>
+        <source>OpenTX for FrSky Taranis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1225"/>
+        <source>OpenTX for FrSky Taranis Rev4a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1168"/>
+        <source>Support of FrSky PXX protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1190"/>
+        <source>OpenTX for Sky9x board / 9X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1208"/>
+        <source>Use FrSky Taranis sticks in a 9X/9XR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1216"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1226"/>
+        <source>Disable HELI menu and cyclic mix support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1217"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1227"/>
+        <source>Disable TEMPLATES menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1218"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1228"/>
+        <source>Disable Global variables</source>
+        <translation>Anzeige Globale Variablen</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1038"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1075"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1107"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1141"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1169"/>
+        <source>Support for DSM2 modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6000,72 +5796,224 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1142"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1171"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1196"/>
+        <source>PPM center adjustment in limits</source>
+        <translation>PPM Mitten-Einstellung bei Servo Limits </translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1040"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1077"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1109"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1143"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1172"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1197"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1219"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1229"/>
+        <source>PPM values displayed in us</source>
+        <translation>PPM Wert in us angezeigt</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1042"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1079"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1111"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1145"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1174"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1199"/>
+        <source>Symetrical Limits</source>
+        <translation>Symetrische Grenzen</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1023"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1112"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1146"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1175"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1200"/>
+        <source>Pots use in menus navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="310"/>
+        <source>Your radio probably uses a wrong firmware, eeprom size is 4096 but only the first 2048 are used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1027"/>
+        <source>OpenTX for 9X board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1032"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1069"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1101"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1135"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1164"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1194"/>
+        <source>No flight modes</source>
+        <translation>Keine Flugphasen</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1044"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1081"/>
+        <source>SmartieParts 2.2 Backlight support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1045"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1082"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1113"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1147"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1176"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1201"/>
+        <source>In model setup menus automatically set source by moving some of them</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1046"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1083"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1114"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1148"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1177"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1202"/>
+        <source>In model setup menus automatically set switch by moving some of them</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1047"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1084"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1178"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1203"/>
+        <source>Enable resetting values by pressing up and down at the same time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1048"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1085"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1115"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1149"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1179"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1204"/>
+        <source>No graphical check boxes and sliders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1049"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1086"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1116"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1150"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1180"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1205"/>
+        <source>Battery graph</source>
+        <translation>Akku Ladezustand Balken</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1050"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1087"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1117"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1151"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1181"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1206"/>
+        <source>Don&apos;t use bold font for highlighting active items</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1064"/>
+        <source>OpenTX for M128 / 9X board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1090"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1120"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1154"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1183"/>
+        <source>EEprom write Progress bar</source>
+        <translation>EEprom Schreib-Balken</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1054"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1091"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1121"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1155"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1184"/>
+        <source>Imperial units</source>
+        <translation>Zöllige Einheiten</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1209"/>
+        <source>Bluetooth interface</source>
+        <translation>Bluetooth Schnittstelle</translation>
+    </message>
+    <message>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1041"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1078"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1110"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1144"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1173"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1198"/>
         <source>Global variables</source>
         <translation>Globale Variablen</translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1094"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1096"/>
         <source>OpenTX for 9XR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1128"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1130"/>
         <source>OpenTX for 9XR with M128 chip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1158"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1160"/>
         <source>OpenTX for Gruvin9x board / 9X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1164"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1166"/>
         <source>Support for SD memory card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1167"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1169"/>
         <source>Support for DSM2 modules using ppm instead of true serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1190"/>
+        <location filename="../firmwares/opentx/opentxinterface.cpp" line="1192"/>
         <source>Enable HELI menu and cyclic mix support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="261"/>
-        <location filename="../eeprominterface.cpp" line="633"/>
-        <location filename="../eeprominterface.cpp" line="763"/>
-        <location filename="../modeledit/customfunctions.cpp" line="639"/>
+        <location filename="../eeprominterface.cpp" line="241"/>
+        <location filename="../eeprominterface.cpp" line="616"/>
+        <location filename="../eeprominterface.cpp" line="746"/>
+        <location filename="../modeledit/customfunctions.cpp" line="636"/>
         <source>Timer1</source>
         <translation>Stoppuhr1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="261"/>
-        <location filename="../eeprominterface.cpp" line="634"/>
-        <location filename="../eeprominterface.cpp" line="764"/>
-        <location filename="../modeledit/customfunctions.cpp" line="640"/>
+        <location filename="../eeprominterface.cpp" line="241"/>
+        <location filename="../eeprominterface.cpp" line="617"/>
+        <location filename="../eeprominterface.cpp" line="747"/>
+        <location filename="../modeledit/customfunctions.cpp" line="637"/>
         <source>Timer2</source>
         <translation>Stoppuhr2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="263"/>
+        <location filename="../eeprominterface.cpp" line="243"/>
         <source>A1</source>
         <translation>A1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="263"/>
+        <location filename="../eeprominterface.cpp" line="243"/>
         <source>A2</source>
         <translation>A2</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="264"/>
+        <location filename="../eeprominterface.cpp" line="244"/>
         <source>T1</source>
         <translation>T1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="264"/>
+        <location filename="../eeprominterface.cpp" line="244"/>
         <source>T2</source>
         <translation>T2</translation>
     </message>
@@ -6076,31 +6024,37 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="307"/>
-        <source>CYC%1</source>
+        <location filename="../firmwares/opentx/open9xStockeeprom.cpp" line="92"/>
+        <source>Simultaneous usage of expo and curves is no longer supported in open9x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CH%1%2</source>
-        <oldsource>CH%1</oldsource>
-        <translation type="obsolete">CH%1%2</translation>
+        <location filename="../eeprominterface.cpp" line="287"/>
+        <source>CYC%1</source>
+        <translation>CYC%1</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="400"/>
-        <location filename="../helpers.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="292"/>
+        <source>CH%1%2</source>
+        <oldsource>CH%1</oldsource>
+        <translation>CH%1%2</translation>
+    </message>
+    <message>
+        <location filename="../eeprominterface.cpp" line="383"/>
+        <location filename="../helpers.cpp" line="352"/>
         <source>ON</source>
         <translation>EIN</translation>
     </message>
     <message>
-        <location filename="../eeprominterface.cpp" line="377"/>
-        <location filename="../eeprominterface.cpp" line="402"/>
-        <location filename="../helpers.cpp" line="353"/>
+        <location filename="../eeprominterface.cpp" line="360"/>
+        <location filename="../eeprominterface.cpp" line="385"/>
+        <location filename="../helpers.cpp" line="352"/>
         <source>OFF</source>
         <translation>AUS</translation>
     </message>
     <message>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="402"/>
-        <location filename="../helpers.cpp" line="936"/>
+        <location filename="../helpers.cpp" line="933"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
@@ -6110,7 +6064,7 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <translation>EEPROM gespeichert mit diesen Warnungen:</translation>
     </message>
     <message>
-        <location filename="../helpers.cpp" line="937"/>
+        <location filename="../helpers.cpp" line="934"/>
         <source>Simulator for this firmware is not yet available</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6120,29 +6074,35 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1235"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1196"/>
         <source>OpenTX only accepts %1 points in all curves</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1743"/>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1939"/>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1946"/>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1950"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1700"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1896"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1903"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="1907"/>
         <source>OpenTX on this board doesn&apos;t accept this function</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2354"/>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2458"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2311"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2415"/>
         <source>OpenTX doesn&apos;t accept this protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2361"/>
+        <location filename="../firmwares/opentx/opentxeeprom.cpp" line="2318"/>
         <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>
     <message>
         <location filename="../modeledit/flightmodes.cpp" line="72"/>
         <source>Trim disabled</source>
@@ -6178,18 +6138,6 @@ Anzahl Sekunden fest, welche der Mischer für einen Durchgang von -100 bis +100
         <source>Profile image</source>
         <translation>Profil Bild</translation>
     </message>
-    <message>
-        <location filename="../firmwares/opentx/open9xStockeeprom.cpp" line="92"/>
-        <source>Simultaneous usage of expo and curves is no longer supported in OpenTX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../warnings.h" line="5"/>
-        <source>Thank you for upgrading to OpenTX 2.0. This is a major upgrade that adds and modifies a lot of things, so please make sure that you read release notes carefully to learn about the changes, and thoroughly check each of your models for proper function.
-
-The OpenTX Team.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RudderPage</name>
@@ -6212,16 +6160,19 @@ The OpenTX Team.</source>
 <context>
     <name>Setup</name>
     <message>
+        <location filename="../modeledit/setup.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
+        <location filename="../modeledit/setup.ui" line="156"/>
         <source>Timer2</source>
-        <translation type="obsolete">Stoppuhr2</translation>
+        <translation>Stoppuhr2</translation>
     </message>
     <message>
+        <location filename="../modeledit/setup.ui" line="172"/>
         <source>Timer1</source>
-        <translation type="obsolete">Stoppuhr1</translation>
+        <translation>Stoppuhr1</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="258"/>
@@ -6273,16 +6224,6 @@ The OpenTX Team.</source>
         <source>Display Checklist</source>
         <translation>Anzeige Checkliste</translation>
     </message>
-    <message>
-        <location filename="../modeledit/setup.ui" line="156"/>
-        <source>Timer 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../modeledit/setup.ui" line="172"/>
-        <source>Timer 1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/setup.ui" line="190"/>
         <source>Timer Source</source>
@@ -6340,12 +6281,10 @@ The OpenTX Team.</source>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="24"/>
-        <source>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.
+        <source>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.
 
 </source>
-        <translation>Gasminimum vorne.
-Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufstellung ist vorne, die Trimmung sowie die Knüppelstellungswarnung ist ebenfalls umgedreht.</translation>
+        <translation>Gasminimum vorne. Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufstellung ist vorne, die Trimmung sowie die Knüppelstellungswarnung ist ebenfalls umgedreht.</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="33"/>
@@ -6364,29 +6303,29 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
 <context>
     <name>SimulatorDialog</name>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="304"/>
-        <location filename="../simulation/simulatordialog.cpp" line="326"/>
+        <location filename="../simulation/simulatordialog.cpp" line="303"/>
+        <location filename="../simulation/simulatordialog.cpp" line="325"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="304"/>
+        <location filename="../simulation/simulatordialog.cpp" line="303"/>
         <source>Joystick enabled but not configured correctly</source>
         <translation>Joystick eingeschaltet, aber nicht korrekt eingestellt</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="326"/>
+        <location filename="../simulation/simulatordialog.cpp" line="325"/>
         <source>Cannot open joystick, joystick disabled</source>
         <translation>Kann joystick nicht öffnen, joystick ausgeschaltet</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="335"/>
+        <location filename="../simulation/simulatordialog.cpp" line="334"/>
         <source>Simulating Radio (%1)</source>
         <translatorcomment>Simulatione Sender (%1)</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog.cpp" line="468"/>
+        <location filename="../simulation/simulatordialog.cpp" line="467"/>
         <source>Firmware %1 error: %2</source>
         <translation>Firmware %1 Fehler: %2</translation>
     </message>
@@ -6399,105 +6338,124 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <translation>Companion Simulator</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="124"/>
         <source>THR</source>
-        <translation type="obsolete">Gas</translation>
+        <translation>Gas</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="154"/>
         <source>RUD</source>
-        <translation type="obsolete">Sei</translation>
+        <translation>Sei</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="184"/>
         <source>ELE</source>
-        <translation type="obsolete">Höh</translation>
+        <translation>Höh</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="214"/>
         <source>AIL</source>
-        <translation type="obsolete">Que</translation>
+        <translation>Que</translation>
     </message>
     <message>
         <location filename="../simulation/simulatordialog-9x.ui" line="248"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="717"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="705"/>
         <source>Hold X</source>
         <translation>Halte X</translation>
     </message>
     <message>
         <location filename="../simulation/simulatordialog-9x.ui" line="278"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="747"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="735"/>
         <source>Fix X</source>
         <translation>Fixiere X</translation>
     </message>
     <message>
         <location filename="../simulation/simulatordialog-9x.ui" line="308"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="777"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="765"/>
         <source>Fix Y</source>
         <translation>Fixiere Y</translation>
     </message>
     <message>
         <location filename="../simulation/simulatordialog-9x.ui" line="338"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="807"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="795"/>
         <source>Hold Y</source>
         <translation>Halte Y</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="358"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="368"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="815"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="825"/>
         <source>TextLabel</source>
-        <translation type="obsolete">Textlabel</translation>
+        <translation>Textlabel</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="404"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="468"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="873"/>
-        <location filename="../simulation/simulatordialog-9x.ui" line="937"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="401"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="459"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="858"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="916"/>
         <source>Right Double Click to Reset</source>
         <translation>Zurücksetzen mit rechtem Doppelklick</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="538"/>
         <source>TRN</source>
-        <translation type="obsolete">TRN</translation>
+        <translation>TRN</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="565"/>
         <source>GEA</source>
-        <translation type="obsolete">GEA</translation>
+        <translation>GEA</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="598"/>
         <source>ID0</source>
-        <translation type="obsolete">ID0</translation>
+        <translation>ID0</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="635"/>
         <source>ID1</source>
-        <translation type="obsolete">ID1</translation>
+        <translation>ID1</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="668"/>
         <source>ID2</source>
-        <translation type="obsolete">ID2</translation>
+        <translation>ID2</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="999"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="975"/>
         <source>BEEP</source>
         <translation>Piepston</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1013"/>
         <source>P1</source>
-        <translation type="obsolete">P1</translation>
+        <translation>P1</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1035"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1095"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1152"/>
         <source>0 %</source>
-        <translation type="obsolete">0 %</translation>
+        <translation>0 %</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1070"/>
         <source>P2</source>
-        <translation type="obsolete">P2</translation>
+        <translation>P2</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1130"/>
         <source>P3</source>
-        <translation type="obsolete">P3</translation>
+        <translation>P3</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="1239"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1215"/>
         <source>9x Simulator</source>
         <translation>9x Simulator</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-9x.ui" line="1432"/>
+        <location filename="../simulation/simulatordialog-9x.ui" line="1408"/>
         <source>Outputs</source>
         <translation>Ausgaben</translation>
     </message>
@@ -6507,7 +6465,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../simulation/simulatordialog-taranis.ui" line="26"/>
         <source>Companion Simulator</source>
-        <translation>Companion simulator</translation>
+        <translation>Companion Simulator</translation>
     </message>
     <message>
         <location filename="../simulation/simulatordialog-taranis.ui" line="77"/>
@@ -6520,88 +6478,117 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <translation>Ausgaben</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="318"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="916"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1005"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1599"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="315"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="907"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="990"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1578"/>
         <source>Right Double Click to Reset</source>
         <translation>Zurücksetzen mit rechtem Doppelklick</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="437"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1161"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="431"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1143"/>
         <source>Hold Y</source>
         <translation>Halte Y</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="467"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1191"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="461"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1173"/>
         <source>Fix Y</source>
         <translation>Fixiere Y</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="497"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1221"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="491"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1203"/>
         <source>Fix X</source>
         <translation>Fixiere X</translation>
     </message>
     <message>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="527"/>
-        <location filename="../simulation/simulatordialog-taranis.ui" line="1251"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="521"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1233"/>
         <source>Hold X</source>
         <translation>Halte X</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="558"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="876"/>
         <source>S1</source>
-        <translation type="obsolete">S1</translation>
+        <translation>S1</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="588"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="598"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1529"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1539"/>
         <source>TextLabel</source>
-        <translation type="obsolete">Textlabel</translation>
+        <translation>Textlabel</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="622"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="846"/>
         <source>SB</source>
-        <translation type="obsolete">SB</translation>
+        <translation>SB</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="678"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="836"/>
         <source>SA</source>
-        <translation type="obsolete">SA</translation>
+        <translation>SA</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="718"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="856"/>
         <source>SE</source>
-        <translation type="obsolete">SE</translation>
+        <translation>SE</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="746"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="768"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="771"/>
         <source>SF</source>
-        <translation type="obsolete">SF</translation>
+        <translation>SF</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="814"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="866"/>
         <source>LS</source>
-        <translation type="obsolete">LS</translation>
+        <translation>LS</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1041"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1063"/>
         <source>S2</source>
-        <translation type="obsolete">S2</translation>
+        <translation>S2</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1257"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1481"/>
         <source>SD</source>
-        <translation type="obsolete">SD</translation>
+        <translation>SD</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1297"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1471"/>
         <source>SC</source>
-        <translation type="obsolete">SC</translation>
+        <translation>SC</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1363"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1491"/>
         <source>SG</source>
-        <translation type="obsolete">SG</translation>
+        <translation>SG</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1406"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1511"/>
         <source>RS</source>
-        <translation type="obsolete">RS</translation>
+        <translation>RS</translation>
     </message>
     <message>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1440"/>
+        <location filename="../simulation/simulatordialog-taranis.ui" line="1501"/>
         <source>SH</source>
-        <translation type="obsolete">SH</translation>
+        <translation>SH</translation>
     </message>
 </context>
 <context>
@@ -6651,8 +6638,9 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
 <context>
     <name>Telemetry</name>
     <message>
+        <location filename="../modeledit/telemetry.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="64"/>
@@ -6709,11 +6697,6 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <source>Alarm 2</source>
         <translation>Alarm 2</translation>
     </message>
-    <message>
-        <location filename="../modeledit/telemetry.ui" line="537"/>
-        <source>CELS</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="583"/>
         <source>Serial Protocol</source>
@@ -6766,8 +6749,9 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <translation>FrSky Sensor Hub</translation>
     </message>
     <message>
+        <location filename="../modeledit/telemetry.ui" line="537"/>
         <source>CEL</source>
-        <translation type="obsolete">Zelle</translation>
+        <translation>Zelle</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="557"/>
@@ -6782,12 +6766,12 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../modeledit/telemetry.ui" line="660"/>
         <source>Alti</source>
-        <translation type="unfinished"></translation>
+        <translation>Alti</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="665"/>
         <source>Alti+</source>
-        <translation type="unfinished"></translation>
+        <translation>Alti+</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="670"/>
@@ -6797,7 +6781,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../modeledit/telemetry.ui" line="696"/>
         <source>Sink Max</source>
-        <translation type="unfinished"></translation>
+        <translation>Sink Max</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="806"/>
@@ -6857,29 +6841,30 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../modeledit/telemetry.ui" line="1059"/>
         <source>Various</source>
-        <translation type="unfinished"></translation>
+        <translation>Varios</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="966"/>
         <source>mAh count</source>
-        <translation type="unfinished"></translation>
+        <translation>mAh zählen</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="1020"/>
         <source>FAS Offset</source>
-        <translation type="unfinished"></translation>
+        <translation>FAS Offset</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="1027"/>
         <source>Persistent mAh</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern der mAh</translation>
     </message>
 </context>
 <context>
     <name>TelemetryAnalog</name>
     <message>
+        <location filename="../modeledit/telemetry_analog.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="34"/>
@@ -6945,7 +6930,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="279"/>
         <source>Volts (V)</source>
-        <translation>Volt(v)</translation>
+        <translation>Volt(V)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="284"/>
@@ -6955,7 +6940,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="289"/>
         <source>Speed (m/s or ft/s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Speed (m/s or ft/s)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="294"/>
@@ -6965,7 +6950,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="299"/>
         <source>Speed (km/h or miles/h)</source>
-        <translation type="unfinished"></translation>
+        <translation>Speed (km/h oder miles/h)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="304"/>
@@ -6980,7 +6965,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="314"/>
         <source>Fuel (%)</source>
-        <translation type="unfinished"></translation>
+        <translation>Füllst(%)</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_analog.ui" line="319"/>
@@ -7006,13 +6991,14 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
 <context>
     <name>TelemetryCustomScreen</name>
     <message>
+        <location filename="../modeledit/telemetry_customscreen.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="34"/>
         <source>Custom Screen Type</source>
-        <translation type="unfinished">Telemetrie Anzeige als</translation>
+        <translation>Telemetrie Anzeige als</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry_customscreen.ui" line="54"/>
@@ -7094,12 +7080,14 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
 <context>
     <name>Timer</name>
     <message>
+        <location filename="../modeledit/setup_timer.ui" line="14"/>
         <source>Form</source>
-        <translation type="obsolete">Form</translation>
+        <translation>Form</translation>
     </message>
     <message>
+        <location filename="../modeledit/setup_timer.ui" line="29"/>
         <source>mm:ss</source>
-        <translation type="obsolete">mm:ss</translation>
+        <translation>mm:ss</translation>
     </message>
     <message>
         <location filename="../modeledit/setup_timer.ui" line="39"/>
@@ -7116,6 +7104,11 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <source>Persistent</source>
         <translation>Dauerhaft</translation>
     </message>
+    <message>
+        <location filename="../modeledit/setup_timer.ui" line="63"/>
+        <source> (00:00:00)</source>
+        <translation></translation>
+    </message>
 </context>
 <context>
     <name>TimerPanel</name>
@@ -7140,12 +7133,12 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="619"/>
         <source>First Tail Channel:</source>
-        <translation>Erster rechter Leitwerk Kanal</translation>
+        <translation>Erster, rechter Leitwerk Kanal</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="621"/>
         <source>Second Tail Channel:</source>
-        <translation>Zweiter linker Leitwerk Kanal</translation>
+        <translation>Zweiter, linker Leitwerk Kanal</translation>
     </message>
 </context>
 <context>
@@ -7166,7 +7159,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="26"/>
         <source>Model Wizard</source>
-        <translation type="unfinished"></translation>
+        <translation>Modell Wizard</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="28"/>
@@ -7176,7 +7169,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="28"/>
         <source>Enter model name and model type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modellname und Modelltyp eingeben</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="29"/>
@@ -7206,7 +7199,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="31"/>
         <source>Has your model got ailerons?</source>
-        <translation type="unfinished"></translation>
+        <translation>Hat das Modell Querruder</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="32"/>
@@ -7226,12 +7219,12 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="33"/>
         <source>Has your model got airbrakes?</source>
-        <translation type="unfinished"></translation>
+        <translation>Hat das Modell Airbrakes</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="34"/>
         <source>Flying-wing / Delta-wing</source>
-        <translation type="unfinished"></translation>
+        <translation>Normale Fläche oder Deltaflügel</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="34"/>
@@ -7246,17 +7239,17 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="35"/>
         <source>Does your model have a rudder?</source>
-        <translation type="unfinished"></translation>
+        <translation>Hat das Modell ein Seitenruder</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="36"/>
         <source>Tail Type</source>
-        <translation>Leitwerk typ</translation>
+        <translation>Leitwerkstyp</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="36"/>
         <source>Select which type of tail your model is equiped with.</source>
-        <translation type="unfinished"></translation>
+        <translation>Welchen Hecktyp hat das Modell</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
@@ -7268,7 +7261,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizarddialog.cpp" line="38"/>
         <source>Select channels for tail control.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle die Kanäle für das Leitwerk</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="38"/>
@@ -7278,12 +7271,12 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="39"/>
         <source>Select elevator channel.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle den Höhenruder Kanal</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="40"/>
         <source>Cyclic</source>
-        <translation type="unfinished"></translation>
+        <translation>Cyclisch</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="40"/>
@@ -7303,7 +7296,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="42"/>
         <source>Rotor Type</source>
-        <translation>Rotor Kopf type</translation>
+        <translation>Rotorkopf-Typ</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="42"/>
@@ -7314,7 +7307,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <location filename="../wizarddialog.cpp" line="43"/>
         <location filename="../wizarddialog.cpp" line="44"/>
         <source>Helicopter</source>
-        <translation type="unfinished">Hubschrauber</translation>
+        <translation>Hubschrauber</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="43"/>
@@ -7335,7 +7328,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     <message>
         <location filename="../wizarddialog.cpp" line="46"/>
         <source>Save Changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere die Kanäle</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="46"/>
@@ -7354,17 +7347,12 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="70"/>
-        <source>Most aircraft have a main wing and a tail with control surfaces. Flying wings and delta winged aircraft only have a single wing. The main control surface on a standard wing controls the roll of the aircraft. This surface is called an aileron.&lt;br&gt;The control surface of a delta wing controls both roll and pitch. This surface is called an elevon. </source>
+        <source>Most aircraft have a main wing and a tail with control surfaces. Flying wings and delta winged aircraft only have a single wing. The main control surface on a standard wing controlls the roll of the aircraft. This surface is called an aileron.&lt;br&gt;The control surface of a delta wing controls both roll and elevation. This surface is called an elevon. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="74"/>
-        <source>Models use one or two channels to control the ailerons.&lt;br&gt;A so called Y-cable can be used to connect a single receiver channel to two separate aileron servos. If your servos are connected by a Y-cable you should select the single-servo option.&lt;br&gt;&lt;br&gt;Aileron - Spektrum: CH2, Futaba: CH1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.cpp" line="85"/>
-        <source>Models use one or two channels to control the elevons.&lt;br&gt;A so called Y-cable can be used to connect single a receiver channel to two separate elevon servos. If your servos are connected by a Y-cable you should select the single-servo option.</source>
+        <source>Models use one or two channels to control the ailerons.&lt;br&gt;A so called Y-cable can be used to connect single receiver channel to two separeate aileron servos. If your servos are connected by a Y-cable you should select the single-servo option.&lt;br&gt;&lt;br&gt;Aileron - Spektrum: CH2, Futaba: CH1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7377,6 +7365,11 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <source>Air brakes are used to reduce the speed of advanced sail planes.&lt;br&gt;They are very uncommon on other types of planes.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="85"/>
+        <source>Models use one or two channels to control the elevons.&lt;br&gt;A so called Y-cable can be used to connect single receiver channel to two separeate elevon servos. If your servos are connected by a Y-cable you should select the single-servo option.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../wizarddialog.cpp" line="89"/>
         <source>Select the receiver channel that is connected to your rudder.&lt;br&gt;&lt;br&gt;Rudder - Spektrum: CH4, Futaba: CH4</source>
@@ -7406,7 +7399,7 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
         <location filename="../wizarddialog.cpp" line="113"/>
         <location filename="../wizarddialog.cpp" line="121"/>
         <source>TBD.</source>
-        <translation type="unfinished"></translation>
+        <translation>TBS.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="115"/>
@@ -7445,20 +7438,20 @@ Wenn dieses angewählt wurde ist der Knüppelweg für Gas reversiert. Leerlaufst
 <context>
     <name>appPreferencesDialog</name>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="955"/>
+        <location filename="../apppreferencesdialog.ui" line="957"/>
         <source>Simulator capture folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="998"/>
+        <location filename="../apppreferencesdialog.ui" line="1000"/>
         <source>Remember simulator switch values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="387"/>
-        <location filename="../apppreferencesdialog.ui" line="661"/>
-        <location filename="../apppreferencesdialog.ui" line="708"/>
-        <location filename="../apppreferencesdialog.ui" line="880"/>
+        <location filename="../apppreferencesdialog.ui" line="389"/>
+        <location filename="../apppreferencesdialog.ui" line="663"/>
+        <location filename="../apppreferencesdialog.ui" line="710"/>
+        <location filename="../apppreferencesdialog.ui" line="882"/>
         <source>Open Folder</source>
         <translation>Verzeichnis öffnen</translation>
     </message>
@@ -7534,355 +7527,352 @@ Mode 4:
         <translation>Mode 4 (Que Gas Höh Sei)</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="144"/>
+        <location filename="../apppreferencesdialog.ui" line="137"/>
+        <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="../apppreferencesdialog.ui" line="146"/>
         <source>R E T A</source>
         <translation>S H G Q</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="149"/>
+        <location filename="../apppreferencesdialog.ui" line="151"/>
         <source>R E A T</source>
         <translation>S H Q G</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="154"/>
+        <location filename="../apppreferencesdialog.ui" line="156"/>
         <source>R T E A</source>
         <translation>S G H Q</translation>
     </message>
     <message>
+        <location filename="../apppreferencesdialog.ui" line="161"/>
         <source>R T A E </source>
-        <translation type="obsolete">S G Q H</translation>
+        <translation>S G Q H</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="164"/>
+        <location filename="../apppreferencesdialog.ui" line="166"/>
         <source>R A E T</source>
         <translation>S Q H G</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="169"/>
+        <location filename="../apppreferencesdialog.ui" line="171"/>
         <source>R A T E</source>
         <translation>S Q G H</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="174"/>
+        <location filename="../apppreferencesdialog.ui" line="176"/>
         <source>E R T A</source>
         <translation>H S G Q</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="179"/>
+        <location filename="../apppreferencesdialog.ui" line="181"/>
         <source>E R A T</source>
         <translation>H S Q G</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="184"/>
+        <location filename="../apppreferencesdialog.ui" line="186"/>
         <source>E T R A</source>
         <translation>H G S Q</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="189"/>
+        <location filename="../apppreferencesdialog.ui" line="191"/>
         <source>E T A R</source>
         <translation>H G Q S</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="194"/>
+        <location filename="../apppreferencesdialog.ui" line="196"/>
         <source>E A R T</source>
         <translation>H Q S G</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="199"/>
+        <location filename="../apppreferencesdialog.ui" line="201"/>
         <source>E A T R</source>
         <translation>H Q G S</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="204"/>
+        <location filename="../apppreferencesdialog.ui" line="206"/>
         <source>T R E A</source>
         <translation>G S H Q</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="209"/>
+        <location filename="../apppreferencesdialog.ui" line="211"/>
         <source>T R A E</source>
         <translation>G S Q H</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="214"/>
+        <location filename="../apppreferencesdialog.ui" line="216"/>
         <source>T E R A</source>
         <translation>G H S Q</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="219"/>
+        <location filename="../apppreferencesdialog.ui" line="221"/>
         <source>T E A R</source>
         <translation>G H Q S</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="224"/>
+        <location filename="../apppreferencesdialog.ui" line="226"/>
         <source>T A R E</source>
         <translation>G Q S H</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="229"/>
+        <location filename="../apppreferencesdialog.ui" line="231"/>
         <source>T A E R</source>
         <translation>G Q H S</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="234"/>
+        <location filename="../apppreferencesdialog.ui" line="236"/>
         <source>A R E T</source>
         <translation>Q S H G</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="239"/>
+        <location filename="../apppreferencesdialog.ui" line="241"/>
         <source>A R T E</source>
         <translation>Q S G H</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="244"/>
+        <location filename="../apppreferencesdialog.ui" line="246"/>
         <source>A E R T</source>
         <translation>Q H S G</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="249"/>
+        <location filename="../apppreferencesdialog.ui" line="251"/>
         <source>A E T R</source>
         <translation>Q H G S</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="254"/>
+        <location filename="../apppreferencesdialog.ui" line="256"/>
         <source>A T R E</source>
         <translation>Q G S H</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="259"/>
+        <location filename="../apppreferencesdialog.ui" line="261"/>
         <source>A T E R</source>
         <translation>Q G H S</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="273"/>
+        <location filename="../apppreferencesdialog.ui" line="275"/>
         <source>Default Stick Mode</source>
         <translation>Standard Knüppelmodus</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="280"/>
+        <location filename="../apppreferencesdialog.ui" line="282"/>
         <source>Profile Name</source>
         <translation>Profil Name</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="306"/>
+        <location filename="../apppreferencesdialog.ui" line="308"/>
         <source>Splash Screen</source>
         <translation>Splash Screen</translation>
     </message>
     <message>
+        <location filename="../apppreferencesdialog.ui" line="321"/>
         <source>Channel Order</source>
-        <translation type="obsolete">Kanal Reihenfolge</translation>
+        <translation>Kanal Reihenfolge</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="335"/>
+        <location filename="../apppreferencesdialog.ui" line="337"/>
         <source>SD Structure path</source>
         <translation>SD Verzeichnis Pfad</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="380"/>
+        <location filename="../apppreferencesdialog.ui" line="382"/>
         <source>Remove Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufruf Profil</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="416"/>
+        <location filename="../apppreferencesdialog.ui" line="418"/>
         <source>Select Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle Bild</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="423"/>
+        <location filename="../apppreferencesdialog.ui" line="425"/>
         <source>Radio Type</source>
         <translation>Sender Typ</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="430"/>
+        <location filename="../apppreferencesdialog.ui" line="432"/>
         <source>Clear Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösche Bild</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="498"/>
+        <location filename="../apppreferencesdialog.ui" line="500"/>
         <source>9X</source>
         <translation>9X</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="503"/>
+        <location filename="../apppreferencesdialog.ui" line="505"/>
         <source>9X with m128</source>
         <translation>9x mit m128</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="508"/>
+        <location filename="../apppreferencesdialog.ui" line="510"/>
         <source>9XR</source>
         <translation>9XR</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="513"/>
+        <location filename="../apppreferencesdialog.ui" line="515"/>
         <source>9XR with m128</source>
         <translation>9XR mit m128</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="518"/>
+        <location filename="../apppreferencesdialog.ui" line="520"/>
         <source>Gruvin9x Board</source>
         <translation>Gruvin9x Board</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="523"/>
+        <location filename="../apppreferencesdialog.ui" line="525"/>
         <source>Sky9x Board</source>
         <translation>Sky9x Board</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="528"/>
+        <location filename="../apppreferencesdialog.ui" line="530"/>
         <source>Taranis</source>
         <translation>Taranis</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="536"/>
+        <location filename="../apppreferencesdialog.ui" line="538"/>
         <source>General Settings</source>
         <translation>Generelle Einstellungen</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="543"/>
+        <location filename="../apppreferencesdialog.ui" line="545"/>
         <source>Append version number to FW file name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="550"/>
+        <location filename="../apppreferencesdialog.ui" line="552"/>
         <source>Offer to write FW to Tx after download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="568"/>
+        <location filename="../apppreferencesdialog.ui" line="562"/>
+        <source>General Settings Label</source>
+        <translation>Grundeinstellungen Label</translation>
+    </message>
+    <message>
+        <location filename="../apppreferencesdialog.ui" line="570"/>
         <source>Application Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Anwendungs-Einstellungen</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="742"/>
+        <location filename="../apppreferencesdialog.ui" line="744"/>
         <source>Only show user splash images</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur das Benutzter-Bild zeigen</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="747"/>
+        <location filename="../apppreferencesdialog.ui" line="749"/>
         <source>Show user and companion splash images</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige Benutzer-und CompanionBild</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="761"/>
+        <location filename="../apppreferencesdialog.ui" line="763"/>
         <source>User Splash Screens</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwende Startbild</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="830"/>
+        <location filename="../apppreferencesdialog.ui" line="832"/>
         <source>Use model wizard when creating a new model</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwende den Modell-Wizard für neue Modelle</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="838"/>
+        <location filename="../apppreferencesdialog.ui" line="840"/>
         <source>Simulator Settings</source>
         <translation>Simulator Einstellungen</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="897"/>
+        <location filename="../apppreferencesdialog.ui" line="899"/>
         <source>Blue</source>
         <translation>Blau</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="902"/>
+        <location filename="../apppreferencesdialog.ui" line="904"/>
         <source>Green</source>
         <translation>Grün</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="907"/>
+        <location filename="../apppreferencesdialog.ui" line="909"/>
         <source>Red</source>
         <translation>Rot</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="912"/>
+        <location filename="../apppreferencesdialog.ui" line="914"/>
         <source>Orange</source>
         <translation>Orange</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="917"/>
+        <location filename="../apppreferencesdialog.ui" line="919"/>
         <source>Yellow</source>
         <translation>Gelb</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="674"/>
+        <location filename="../apppreferencesdialog.ui" line="676"/>
         <source>Splash Screen Library</source>
         <translation>Splash Screen Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="687"/>
+        <location filename="../apppreferencesdialog.ui" line="689"/>
         <source>Files to keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="850"/>
+        <location filename="../apppreferencesdialog.ui" line="852"/>
         <source>Simulator BackLight</source>
-        <translation>Simulatro LCD Beleuchtung</translation>
+        <translation>Simulator LCD Beleuchtung</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="790"/>
+        <location filename="../apppreferencesdialog.ui" line="792"/>
         <source>Automatic Backup Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisches Bachup-Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="991"/>
+        <location filename="../apppreferencesdialog.ui" line="993"/>
         <source>Only capture to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="931"/>
+        <location filename="../apppreferencesdialog.ui" line="933"/>
         <source>Joystick</source>
         <translation>Joystick</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="137"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="159"/>
-        <source>R T A E</source>
-        <translation type="unfinished">S G Q H</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="319"/>
-        <source>Default Channel Order</source>
-        <translation type="unfinished">Standardeinstellung Kanalzuordnung</translation>
-    </message>
-    <message>
-        <location filename="../apppreferencesdialog.ui" line="694"/>
+        <location filename="../apppreferencesdialog.ui" line="696"/>
         <source>Find Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Suche exe</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="728"/>
+        <location filename="../apppreferencesdialog.ui" line="730"/>
         <source>Google Earth Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Google Earth exe</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="948"/>
+        <location filename="../apppreferencesdialog.ui" line="950"/>
         <source>Calibrate</source>
         <translation>Kalibrieren</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="860"/>
+        <location filename="../apppreferencesdialog.ui" line="862"/>
         <source>Enable</source>
         <translation>Freigabe</translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="574"/>
+        <location filename="../apppreferencesdialog.ui" line="576"/>
         <source>Show splash screen when Companion starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="615"/>
+        <location filename="../apppreferencesdialog.ui" line="617"/>
         <source>Automatic check for OpenTX firmware updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="584"/>
+        <location filename="../apppreferencesdialog.ui" line="586"/>
         <source>Automatic check for Companion updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../apppreferencesdialog.ui" line="594"/>
+        <location filename="../apppreferencesdialog.ui" line="596"/>
         <source>Enable automatic backup before writing firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7930,7 +7920,7 @@ Mode 4:
     <message>
         <location filename="../apppreferencesdialog.cpp" line="216"/>
         <source>Select Google Earth executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle Google Earth exe</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="259"/>
@@ -7950,7 +7940,7 @@ Mode 4:
     <message>
         <location filename="../apppreferencesdialog.cpp" line="305"/>
         <source>Open Image to load</source>
-        <translation type="unfinished">Bilddatei öffnen</translation>
+        <translation>Öffne Bild zum laden</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.cpp" line="305"/>
@@ -7974,7 +7964,7 @@ Mode 4:
         <location filename="../avroutputdialog.cpp" line="57"/>
         <source>result</source>
         <oldsource> result</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>Ergebnis</translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="63"/>
@@ -8020,23 +8010,17 @@ Mode 4:
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="327"/>
-        <source>Your radio uses a %1 CPU!!!
-
-Please check advanced burn options to set the correct cpu type.</source>
+        <source>Your radio uses a %1 CPU!!! Please check advanced burn options to set the correct cpu type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="331"/>
-        <source>Your radio uses a %1 CPU!!!
-
-Please select an appropriate firmware type to program it.</source>
+        <source>Your radio uses a %1 CPU!!! Please select an appropriate firmware type to program it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="331"/>
-        <source>
-You are currently using:
- %1</source>
+        <source>You are currently using:  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8061,33 +8045,31 @@ You are currently using:
         <location filename="../avroutputdialog.cpp" line="400"/>
         <source>done - exit code %1</source>
         <oldsource> done - exit code %1</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>Fertig - exit code %1</translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="404"/>
         <source>done with errors</source>
         <oldsource> done with errors</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>fertig, keine Fehler</translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="407"/>
         <location filename="../avroutputdialog.cpp" line="410"/>
         <source>done - SUCCESSFUL</source>
         <oldsource> done - SUCCESSFUL</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>Fertig Erfolgreich</translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="437"/>
         <source>did not finish correctly</source>
         <oldsource> did not finish correctly</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>nicht korrekt beendet</translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="440"/>
-        <source>did not finish correctly!
-Do you want some help ?</source>
-        <oldsource> did not finish correctly!
-Do you want some help ?</oldsource>
+        <source>did not finish correctly! Do you want some help ?</source>
+        <oldsource> did not finish correctly!Do you want some help ?</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8099,18 +8081,18 @@ Do you want some help ?</oldsource>
         <location filename="../avroutputdialog.cpp" line="453"/>
         <source>finished correctly</source>
         <oldsource> finished correctly</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>Fehlerfrei durchgeführt</translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="457"/>
         <source>Copy finished correctly</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlerfrei kopiert</translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="473"/>
         <source>Started</source>
         <oldsource>Started </oldsource>
-        <translation type="unfinished"></translation>
+        <translation>gestartet</translation>
     </message>
     <message>
         <location filename="../avroutputdialog.cpp" line="481"/>
@@ -8123,7 +8105,7 @@ Do you want some help ?</oldsource>
     <message>
         <location filename="../burnconfigdialog.cpp" line="59"/>
         <source>AVRDUDE Configuration</source>
-        <translation type="unfinished">Einstellung AVRDUDE</translation>
+        <translation>Einstellung AVRDUDE</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="71"/>
@@ -8143,12 +8125,12 @@ Do you want some help ?</oldsource>
         <location filename="../burnconfigdialog.ui" line="26"/>
         <source>Programmer Configuration</source>
         <oldsource> Configuration AVRDUDE / SAM-BA</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>Programmer Konfiguration</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="64"/>
         <source>DFU-Util Location</source>
-        <translation type="unfinished"></translation>
+        <translation>DFU-Util Location</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="84"/>
@@ -8195,13 +8177,9 @@ Bitte konsultiere das Handbuch des Programmiergerätes und die Dokumentation von
     <message>
         <location filename="../burnconfigdialog.ui" line="438"/>
         <location filename="../burnconfigdialog.ui" line="745"/>
-        <source>Extra arguments used in AVRDUDE.
-This can be used for providing extra information to AVRDUDE.
-
+        <source>Extra arguments used in AVRDUDE.This can be used for providing extra information to AVRDUDE.
 Please only use this if you know what you are doing.  There are no error checks and you could cripple your controller.</source>
-        <translation>Zusätzliche Argumente welche in AVRDUDE genutzt werden.
-Dies kann benutzt werden um zusätzliche Informationen an AVRDUDE zu übergeben.
-
+        <translation>Zusätzliche Argumente welche in AVRDUDE genutzt werden.Dies kann benutzt werden um zusätzliche Informationen an AVRDUDE zu übergeben.
 Bitte nutze dies nur wenn Du weißt was Du machst. Es gibt keine Plausibilitätsprüfung und Du kannst den Controller kaputt machen.</translation>
     </message>
     <message>
@@ -8228,7 +8206,7 @@ Bitte nutze dies nur wenn Du weißt was Du machst. Es gibt keine Plausibilitäts
     <message>
         <location filename="../burnconfigdialog.ui" line="619"/>
         <source>MCU</source>
-        <translation type="unfinished"></translation>
+        <translation>MCU</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="735"/>
@@ -8254,7 +8232,7 @@ Bitte nutze dies nur wenn Du weißt was Du machst. Es gibt keine Plausibilitäts
     <message>
         <location filename="../burnconfigdialog.ui" line="679"/>
         <source>SAM-BA Location</source>
-        <translation type="unfinished"></translation>
+        <translation>SAM-BA Location</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="51"/>
@@ -8265,22 +8243,22 @@ Bitte nutze dies nur wenn Du weißt was Du machst. Es gibt keine Plausibilitäts
     <message>
         <location filename="../burnconfigdialog.ui" line="702"/>
         <source>ARM MCU</source>
-        <translation type="unfinished"></translation>
+        <translation>ARM MCU</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.ui" line="722"/>
         <source>sam-ba serial port</source>
-        <translation type="unfinished"></translation>
+        <translation>sam-ba serialer port</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="25"/>
         <source>DFU-UTIL Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>DFU-UTIL Konfiguration</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="43"/>
         <source>SAM-BA Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>SAM-BA Konfiguration</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="247"/>
@@ -8293,7 +8271,7 @@ Bitte nutze dies nur wenn Du weißt was Du machst. Es gibt keine Plausibilitäts
         <location filename="../burnconfigdialog.cpp" line="341"/>
         <location filename="../burnconfigdialog.cpp" line="418"/>
         <source>Companion</source>
-        <translation type="unfinished">Companion</translation>
+        <translation>Companion</translation>
     </message>
     <message>
         <location filename="../burnconfigdialog.cpp" line="342"/>
@@ -8314,12 +8292,8 @@ Bitte nutze dies nur wenn Du weißt was Du machst. Es gibt keine Plausibilitäts
     <message>
         <location filename="../burnconfigdialog.ui" line="632"/>
         <location filename="../burnconfigdialog.ui" line="662"/>
-        <source>CPU present on your 9x radio
-Should be m64 for stock radios
-m2560 for v4.1 boards</source>
-        <translation>CPU  in Ihrem 9x Radio
-Sollte m64 sein für Standard Radios,
-m2560 fürRadios mit v4.1 Boards</translation>
+        <source>CPU present on your 9x radio Should be m64 for stock radios m2560 for v4.1 boards</source>
+        <translation>CPU  in Ihrem 9x Radio Sollte m64 sein für Standard Radios, m2560 fürRadios mit v4.1 Boards</translation>
     </message>
 </context>
 <context>
@@ -8387,23 +8361,23 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../burndialog.ui" line="73"/>
         <source>Write to TX</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe in Sender</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="133"/>
         <source>Variant</source>
-        <translation type="unfinished"></translation>
+        <translation>Variante</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="147"/>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Version</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="194"/>
         <location filename="../burndialog.cpp" line="47"/>
         <source>Browse for file</source>
-        <translation type="unfinished"></translation>
+        <translation>Durchsuche nach Datei</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="212"/>
@@ -8413,12 +8387,12 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../burndialog.ui" line="238"/>
         <source>Current Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuelles Profil</translation>
     </message>
     <message>
         <location filename="../burndialog.ui" line="57"/>
         <source>Cancel</source>
-        <translation>abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="205"/>
@@ -8455,27 +8429,27 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../burndialog.cpp" line="41"/>
         <source>Write firmware to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Firmware in den Sender</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="62"/>
         <source>Write Backup to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Backup in den Sender</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="65"/>
         <source>Write Backup from %1 to Radio</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibe Backup von %1 in den Sender</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="67"/>
         <source>Current profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Akutelles Profil</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="143"/>
         <source>Open Firmware File</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne Firmware datei</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="149"/>
@@ -8496,17 +8470,13 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../burndialog.cpp" line="226"/>
         <location filename="../burndialog.cpp" line="234"/>
         <location filename="../burndialog.cpp" line="279"/>
-        <source>Error opening file %1:
-%2.</source>
-        <translation>Fehler beim Öffnen der Datei %1:
-%2.</translation>
+        <source>Error opening file %1:%2.</source>
+        <translation>Fehler beim Öffnen der Datei %1:%2.</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="287"/>
-        <source>Error reading file %1:
-%2.</source>
-        <translation>Fehler beim Lesen der Datei %1:
-%2.</translation>
+        <source>Error reading file %1:%2.</source>
+        <translation>Fehler beim Lesen der Datei %1:%2.</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="336"/>
@@ -8518,6 +8488,11 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <source>There is no start screen image in the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../burndialog.cpp" line="356"/>
+        <source>The profile image %1 does not contain an image.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../burndialog.cpp" line="372"/>
         <source>Open image file to use as radio start screen</source>
@@ -8540,11 +8515,6 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <source>Invalid binary Models and Settings File %1, Proceed anyway ?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../burndialog.cpp" line="356"/>
-        <source>Profile image %1 is invalid.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../burndialog.cpp" line="427"/>
         <source>Cannot save customized firmware</source>
@@ -8573,17 +8543,13 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../burndialog.cpp" line="558"/>
         <location filename="../burndialog.cpp" line="563"/>
-        <source>Cannot write file %1:
-%2.</source>
-        <translation>Kann Datei %1:
-%2 nicht schreiben.</translation>
+        <source>Cannot write file %1:%2.</source>
+        <translation>Kann Datei %1:%2 nicht schreiben.</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="571"/>
-        <source>Error writing file %1:
-%2.</source>
-        <translation>Fehler beim Schreiben der Datei %1:
-%2.</translation>
+        <source>Error writing file %1:%2.</source>
+        <translation>Fehler beim Schreiben der Datei %1:%2.</translation>
     </message>
 </context>
 <context>
@@ -8591,17 +8557,17 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../comparedialog.ui" line="29"/>
         <source>Compare Models</source>
-        <translation type="unfinished"></translation>
+        <translation>Vergleiche Modelle</translation>
     </message>
     <message>
         <location filename="../comparedialog.ui" line="49"/>
         <source>Drag first model here</source>
-        <translation type="unfinished"></translation>
+        <translation>Ziehe erst Modell hierher</translation>
     </message>
     <message>
         <location filename="../comparedialog.ui" line="71"/>
         <source>Drag second model here</source>
-        <translation type="unfinished"></translation>
+        <translation>Ziehe zweites Modell hierher</translation>
     </message>
     <message>
         <location filename="../comparedialog.ui" line="105"/>
@@ -8622,7 +8588,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../comparedialog.cpp" line="114"/>
         <location filename="../comparedialog.cpp" line="139"/>
         <source>No name</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Namen</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="246"/>
@@ -8640,7 +8606,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../comparedialog.cpp" line="251"/>
         <location filename="../comparedialog.cpp" line="274"/>
         <source>EEprom Size</source>
-        <translation type="unfinished">Grö&amp;szlig;e EEprom</translation>
+        <translation>Größe EEprom</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="253"/>
@@ -8746,7 +8712,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../comparedialog.cpp" line="352"/>
         <location filename="../comparedialog.cpp" line="441"/>
         <source>Gvars</source>
-        <translation type="unfinished">Gvars</translation>
+        <translation>Gvars</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="355"/>
@@ -8819,7 +8785,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../comparedialog.cpp" line="572"/>
         <source>Global Variables</source>
-        <translation type="unfinished">Globale Variable</translation>
+        <translation>Globale Variablen</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="580"/>
@@ -8838,16 +8804,6 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <source>Weight</source>
         <translation>Gewichtung</translation>
     </message>
-    <message>
-        <location filename="../comparedialog.cpp" line="974"/>
-        <source>5 Point Curves</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../comparedialog.cpp" line="1004"/>
-        <source>9 Point Curves</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../comparedialog.cpp" line="1041"/>
         <source>Logical Switches</source>
@@ -8865,7 +8821,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../comparedialog.cpp" line="862"/>
         <location filename="../comparedialog.cpp" line="941"/>
         <source>DISABLED</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesperrt</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="995"/>
@@ -8908,8 +8864,9 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <translation>Kurven</translation>
     </message>
     <message>
+        <location filename="../comparedialog.cpp" line="974"/>
         <source>5 Points Curves</source>
-        <translation type="obsolete">5 Punkte Kurve</translation>
+        <translation>5 Punkte Kurve</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="976"/>
@@ -8920,13 +8877,14 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <translation>Pt %1</translation>
     </message>
     <message>
+        <location filename="../comparedialog.cpp" line="1004"/>
         <source>9 Points Curves</source>
-        <translation type="obsolete">9 Punkte Kurve</translation>
+        <translation>9 Punkte Kurve</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1072"/>
         <source>Special Functions</source>
-        <translation type="unfinished">Spezial Funktionen</translation>
+        <translation>Spezial Funktionen</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1075"/>
@@ -8944,12 +8902,12 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../comparedialog.cpp" line="1078"/>
         <location filename="../comparedialog.cpp" line="1084"/>
         <source>Enable</source>
-        <translation>aktivieren</translation>
+        <translation>Freigabe</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1115"/>
         <source>SF</source>
-        <translation type="unfinished">SF</translation>
+        <translation>SF</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1150"/>
@@ -9021,7 +8979,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../comparedialog.cpp" line="301"/>
         <source>Flight modes Settings</source>
-        <translation type="unfinished">Flugphasen Einstellungen</translation>
+        <translation>Flugpahsen Einstellungen</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="305"/>
@@ -9029,7 +8987,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../comparedialog.cpp" line="406"/>
         <location filename="../comparedialog.cpp" line="446"/>
         <source>Flight mode name</source>
-        <translation type="unfinished">Flugphase Name</translation>
+        <translation>Flugphasen Name</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="314"/>
@@ -9059,19 +9017,19 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../comparedialog.cpp" line="844"/>
         <location filename="../comparedialog.cpp" line="923"/>
         <source>Flight mode</source>
-        <translation type="unfinished">Flugphase</translation>
+        <translation>Flugphasen</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1077"/>
         <location filename="../comparedialog.cpp" line="1083"/>
         <source>Repeat</source>
-        <translation type="unfinished">Wiederholen</translation>
+        <translation>Wiederholen</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1202"/>
         <location filename="../comparedialog.cpp" line="1321"/>
         <source>RSSI Alarm</source>
-        <translation type="unfinished">RSSi Alarm</translation>
+        <translation>RSSI Alarm</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1248"/>
@@ -9095,7 +9053,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../comparedialog.cpp" line="1233"/>
         <location filename="../comparedialog.cpp" line="1352"/>
         <source>Custom Telemetry View</source>
-        <translation type="unfinished"></translation>
+        <translation>Telemetrie Ansicht</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1399"/>
@@ -9111,8 +9069,9 @@ m2560 fürRadios mit v4.1 Boards</translation>
 <context>
     <name>contributorsDialog</name>
     <message>
+        <location filename="../contributorsdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="obsolete">Dialog</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../contributorsdialog.cpp" line="23"/>
@@ -9147,7 +9106,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../contributorsdialog.cpp" line="98"/>
         <source>OpenTX Release Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Opentx Release Notes</translation>
     </message>
 </context>
 <context>
@@ -9155,7 +9114,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../customizesplashdialog.ui" line="23"/>
         <source>Transmitter Splash Screen Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Sender Startbild-Editor</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="209"/>
@@ -9167,19 +9126,19 @@ m2560 fürRadios mit v4.1 Boards</translation>
         <location filename="../customizesplashdialog.ui" line="272"/>
         <location filename="../customizesplashdialog.ui" line="583"/>
         <source>Load FW</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade FW</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="282"/>
         <location filename="../customizesplashdialog.ui" line="593"/>
         <source>Load Pict</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade Bild</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="262"/>
         <location filename="../customizesplashdialog.ui" line="570"/>
         <source>Load Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade Profil</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.ui" line="308"/>
@@ -9212,7 +9171,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../customizesplashdialog.cpp" line="190"/>
         <source>Open Firmware File</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne Firmware Datei</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="193"/>
@@ -9236,7 +9195,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="228"/>
-        <source>Cannot load profile image %1.</source>
+        <source>Cannot load the profile image %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9247,7 +9206,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../customizesplashdialog.cpp" line="251"/>
         <source>File Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei gespeichert</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="251"/>
@@ -9267,7 +9226,7 @@ m2560 fürRadios mit v4.1 Boards</translation>
     <message>
         <location filename="../customizesplashdialog.cpp" line="257"/>
         <source>File Save Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei speichern Fehlerhaft</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="257"/>
@@ -9312,10 +9271,8 @@ m2560 fürRadios mit v4.1 Boards</translation>
     </message>
     <message>
         <location filename="../fusesdialog.ui" line="59"/>
-        <source>Reset Fuses
-EEPROM - PROTECT</source>
-        <translation>Fuses zurücksetzen
-EEPROM - PROTECT</translation>
+        <source>Reset Fuses EEPROM - PROTECT</source>
+        <translation>Fuses zurücksetzen EEPROM - PROTECT</translation>
     </message>
     <message>
         <location filename="../fusesdialog.ui" line="20"/>
@@ -9374,10 +9331,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../fusesdialog.ui" line="84"/>
-        <source>Reset Fuses
-EEPROM - DELETE</source>
-        <translation>Fuses zurücksetzen
-EEPROM - DELETE</translation>
+        <source>Reset Fuses EEPROM - DELETE</source>
+        <translation>Fuses zurücksetzen EEPROM - DELETE</translation>
     </message>
     <message>
         <location filename="../fusesdialog.ui" line="101"/>
@@ -9389,8 +9344,7 @@ p, li { white-space: pre-wrap; }
 &lt;p align=&quot;center&quot; 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 align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Changing the fuses can mess up your radio.&lt;/p&gt;
 &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Proceed only if you know what you are doing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>Das Ändern der Fuses kann Deine Fernsteuerung unbrauchbar machen.
-Mache nur weiter, wenn Du weißt was Du machst</translation>
+        <translation>Das Ändern der Fuses kann Deine Fernsteuerung unbrauchbar machen. Mache nur weiter, wenn Du weißt was Du machst</translation>
     </message>
 </context>
 <context>
@@ -9398,22 +9352,63 @@ Mache nur weiter, wenn Du weißt was Du machst</translation>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="26"/>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation>Downloads</translation>
     </message>
     <message>
+        <location filename="../fwpreferencesdialog.ui" line="54"/>
+        <location filename="../fwpreferencesdialog.ui" line="67"/>
+        <location filename="../fwpreferencesdialog.ui" line="80"/>
+        <location filename="../fwpreferencesdialog.ui" line="103"/>
+        <location filename="../fwpreferencesdialog.ui" line="116"/>
+        <location filename="../fwpreferencesdialog.ui" line="129"/>
+        <location filename="../fwpreferencesdialog.ui" line="142"/>
+        <location filename="../fwpreferencesdialog.ui" line="155"/>
+        <location filename="../fwpreferencesdialog.ui" line="217"/>
+        <location filename="../fwpreferencesdialog.ui" line="230"/>
+        <location filename="../fwpreferencesdialog.ui" line="243"/>
+        <location filename="../fwpreferencesdialog.ui" line="256"/>
+        <location filename="../fwpreferencesdialog.ui" line="269"/>
+        <location filename="../fwpreferencesdialog.ui" line="282"/>
+        <location filename="../fwpreferencesdialog.ui" line="295"/>
+        <location filename="../fwpreferencesdialog.ui" line="308"/>
+        <location filename="../fwpreferencesdialog.ui" line="321"/>
+        <location filename="../fwpreferencesdialog.ui" line="334"/>
+        <location filename="../fwpreferencesdialog.ui" line="347"/>
+        <location filename="../fwpreferencesdialog.ui" line="360"/>
+        <location filename="../fwpreferencesdialog.ui" line="373"/>
+        <location filename="../fwpreferencesdialog.ui" line="386"/>
+        <location filename="../fwpreferencesdialog.ui" line="399"/>
+        <location filename="../fwpreferencesdialog.ui" line="412"/>
+        <location filename="../fwpreferencesdialog.ui" line="425"/>
+        <location filename="../fwpreferencesdialog.ui" line="438"/>
+        <location filename="../fwpreferencesdialog.ui" line="451"/>
+        <location filename="../fwpreferencesdialog.ui" line="464"/>
+        <location filename="../fwpreferencesdialog.ui" line="477"/>
+        <location filename="../fwpreferencesdialog.ui" line="490"/>
+        <location filename="../fwpreferencesdialog.ui" line="503"/>
+        <location filename="../fwpreferencesdialog.ui" line="516"/>
+        <location filename="../fwpreferencesdialog.ui" line="577"/>
+        <location filename="../fwpreferencesdialog.ui" line="590"/>
+        <location filename="../fwpreferencesdialog.ui" line="617"/>
+        <location filename="../fwpreferencesdialog.ui" line="630"/>
+        <location filename="../fwpreferencesdialog.ui" line="643"/>
+        <location filename="../fwpreferencesdialog.ui" line="656"/>
+        <location filename="../fwpreferencesdialog.ui" line="669"/>
+        <location filename="../fwpreferencesdialog.ui" line="682"/>
+        <location filename="../fwpreferencesdialog.ui" line="702"/>
+        <location filename="../fwpreferencesdialog.ui" line="728"/>
         <source>CheckBox</source>
-        <translation type="obsolete">CheckBox</translation>
+        <translation>CheckBox</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="556"/>
-        <source>Set language of voice.
-May be different from firmware language</source>
+        <source>Set language of voice.May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="689"/>
         <source>Processor ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Prozessor ID</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="604"/>
@@ -9433,21 +9428,22 @@ May be different from firmware language</source>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="201"/>
         <source>Firmware Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmware Typ</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="564"/>
         <source>Download Voice</source>
-        <translation type="unfinished"></translation>
+        <translation>Download Stimme</translation>
     </message>
     <message>
+        <location filename="../fwpreferencesdialog.ui" line="715"/>
         <source>FwInfo</source>
-        <translation type="obsolete">FwInfo</translation>
+        <translation>FwInfo</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="597"/>
         <source>Download FW</source>
-        <translation type="unfinished"></translation>
+        <translation>Download FW</translation>
     </message>
     <message>
         <location filename="../fwpreferencesdialog.ui" line="529"/>
@@ -9492,7 +9488,7 @@ May be different from firmware language</source>
         <location filename="../simulation/joystickdialog.ui" line="579"/>
         <location filename="../simulation/joystickdialog.ui" line="666"/>
         <source>Not  Assigned</source>
-        <translation>nicht zugewiesen</translation>
+        <translation>Nicht zugewiesen</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.ui" line="87"/>
@@ -9504,7 +9500,7 @@ May be different from firmware language</source>
         <location filename="../simulation/joystickdialog.ui" line="584"/>
         <location filename="../simulation/joystickdialog.ui" line="671"/>
         <source>Right Vertical</source>
-        <translation>rechts vertikal</translation>
+        <translation>Rechts Vertikal</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.ui" line="92"/>
@@ -9516,7 +9512,7 @@ May be different from firmware language</source>
         <location filename="../simulation/joystickdialog.ui" line="589"/>
         <location filename="../simulation/joystickdialog.ui" line="676"/>
         <source>Right Horizontal</source>
-        <translation>rechts horizontal</translation>
+        <translation>Rechts Horizontal</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.ui" line="97"/>
@@ -9528,7 +9524,7 @@ May be different from firmware language</source>
         <location filename="../simulation/joystickdialog.ui" line="594"/>
         <location filename="../simulation/joystickdialog.ui" line="681"/>
         <source>Left Vertical</source>
-        <translation>links vertikal</translation>
+        <translation>Links Vertikal</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.ui" line="102"/>
@@ -9540,7 +9536,7 @@ May be different from firmware language</source>
         <location filename="../simulation/joystickdialog.ui" line="599"/>
         <location filename="../simulation/joystickdialog.ui" line="686"/>
         <source>Left Horizontal</source>
-        <translation>Links horizontal</translation>
+        <translation>Links Horizontal</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.ui" line="107"/>
@@ -9647,10 +9643,8 @@ May be different from firmware language</source>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.cpp" line="22"/>
-        <source>Move sticks and pots in every direction making full movement
-Press next when finished</source>
-        <translation>Bewege Knüppel und Potis bis zu den Anschlägen in jeweils&lt;br /&gt;beide Richtungen.
-Wähle &quot;weiter&quot; wenn fertig</translation>
+        <source>Move sticks and pots in every direction making full movement Press next when finished</source>
+        <translation>Bewege Knüppel und Potis bis zu den Anschlägen in jeweils beide Richtungen. Wähle weiter wenn fertig</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.cpp" line="55"/>
@@ -9661,40 +9655,32 @@ Wähle &quot;weiter&quot; wenn fertig</translation>
     <message>
         <location filename="../simulation/joystickdialog.cpp" line="55"/>
         <source>Cannot open joystick.</source>
-        <translation>kann joystick nicht öffnen.</translation>
+        <translation>kann Joystick nicht öffnen.</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.cpp" line="83"/>
-        <source>Place sticks and pots in middle position.
-Press next when done</source>
-        <translation>Positioniere Knüppel und Potis in Mittelposition.
-Wähle &quot;weiter&quot; wenn fertig</translation>
+        <source>Place sticks and pots in middle position. Press next when done</source>
+        <translation>Positioniere Knüppel und Potis in Mittelposition. Wähle weiterwenn fertig</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.cpp" line="94"/>
-        <source>Map joystick channels to controls using comboboxes.
-Press next when done</source>
-        <translation>Weise joystick Kanäle mittels den Komboboxen zu.
-Wähle &quot;weiter&quot; wenn fertig</translation>
+        <source>Map joystick channels to controls using comboboxes. Press next when done</source>
+        <translation>Weise Joystick Kanäle mittels den Komboboxen zu. Wähle weiter wenn fertig</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.cpp" line="101"/>
-        <source>Check inversion checkbox to get maximum at top-right position.
-Press next when done</source>
-        <translation>Wähle &quot;Farbe umkehren&quot; checkbox für optimale Ergebnisse
-Wähle &quot;weiter&quot; wenn fertig</translation>
+        <source>Check inversion checkbox to get maximum at top-right position.Press next when done</source>
+        <translation>Wähle &quot;Farbe umkehren&quot; checkbox für optimale Ergebnisse Wähle &quot;weiter&quot; wenn fertig</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.cpp" line="108"/>
-        <source>Press ok to save configuration
-Press cancel to abort joystick calibration</source>
-        <translation>Wähle &quot;Ok&quot;, um die Konfiguration zu speichern.
-Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
+        <source>Press ok to save configuration Press cancel to abort joystick calibration</source>
+        <translation>Wähle &quot;Ok&quot;, um die Konfiguration zu speichern. Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
     </message>
     <message>
         <location filename="../simulation/joystickdialog.cpp" line="130"/>
         <source>Duplicated stick assignement</source>
-        <translation>doppelte Knüppel Zuweisung</translation>
+        <translation>Doppelte Knüppel Zuweisung</translation>
     </message>
 </context>
 <context>
@@ -9702,47 +9688,42 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
     <message>
         <location filename="../logsdialog.ui" line="14"/>
         <source>Companion Log Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Companion Log ansehen</translation>
     </message>
     <message>
         <location filename="../logsdialog.ui" line="25"/>
         <source>Filename</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateiname</translation>
     </message>
     <message>
         <location filename="../logsdialog.ui" line="39"/>
         <source>Open LogFile</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne LogDatei</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="90"/>
+        <location filename="../logsdialog.ui" line="99"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="97"/>
+        <location filename="../logsdialog.ui" line="106"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="104"/>
+        <location filename="../logsdialog.ui" line="113"/>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
-        <location filename="../logsdialog.ui" line="111"/>
-        <source>Reset</source>
-        <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-        <location filename="../logsdialog.ui" line="135"/>
+        <location filename="../logsdialog.ui" line="137"/>
         <source>Fly sessions</source>
-        <translation type="unfinished"></translation>
+        <translation>Flugdaten</translation>
     </message>
     <message>
         <location filename="../logsdialog.cpp" line="30"/>
         <source>Telemetry logs</source>
-        <translation type="unfinished"></translation>
+        <translation>Telemetrie Logs</translation>
     </message>
     <message>
         <location filename="../logsdialog.cpp" line="31"/>
@@ -9750,29 +9731,27 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="254"/>
+        <location filename="../logsdialog.cpp" line="253"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="255"/>
-        <source>Cannot write file %1:
-%2.</source>
-        <translation>Kann Datei %1:
-%2 nicht schreiben.</translation>
+        <location filename="../logsdialog.cpp" line="254"/>
+        <source>Cannot write file %1:%2.</source>
+        <translation>Kann Datei %1:%2 nicht schreiben.</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="590"/>
+        <location filename="../logsdialog.cpp" line="589"/>
         <source>Select your log file</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle die Log Datei aus</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="601"/>
+        <location filename="../logsdialog.cpp" line="600"/>
         <source>Available fields</source>
-        <translation type="unfinished"></translation>
+        <translation>Verfügbare Felder</translation>
     </message>
     <message>
-        <location filename="../logsdialog.cpp" line="698"/>
+        <location filename="../logsdialog.cpp" line="697"/>
         <source>The selected logfile contains %1 invalid lines out of  %2 total lines</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9782,7 +9761,7 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
     <message>
         <location filename="../mdichild.ui" line="23"/>
         <source>Simulate Tx</source>
-        <translation>Tx Simulation</translation>
+        <translation>Sender Simulation</translation>
     </message>
 </context>
 <context>
@@ -9791,7 +9770,7 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
         <location filename="../imgpreferences.ui" line="26"/>
         <location filename="../preferencesdialog.ui" line="26"/>
         <source>Preferences</source>
-        <translation>Einstellungen</translation>
+        <translation>Vor-Einstellungen</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="953"/>
@@ -9811,12 +9790,8 @@ Wähle &quot;abbrechen&quot;, um die Kalibration abzubrechen</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="382"/>
-        <source>Channel order
-
-This is used by the templated to determine which channel goes to what number output.</source>
-        <translation>Kanalzuordnung
-
-Hier wird die Zuordnung der Kanäle zum Ausgang festgelegt.</translation>
+        <source>Channel order This is used by the templated to determine which channel goes to what number output.</source>
+        <translation>Kanalzuordnung Hier wird die Zuordnung der Kanäle zum Ausgang festgelegt.</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="743"/>
@@ -9887,7 +9862,7 @@ Mode 4:
     <message>
         <location filename="../preferencesdialog.ui" line="143"/>
         <source>Automatic Backup Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Autmatisches Backup Verzeichnis</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="391"/>
@@ -10017,12 +9992,11 @@ Mode 4:
     <message>
         <location filename="../preferencesdialog.ui" line="821"/>
         <source>Voice</source>
-        <translation type="unfinished">Stimme</translation>
+        <translation>Stimme</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="841"/>
-        <source>Set language of voice.
-May be different from firmware language</source>
+        <source>Set language of voice. May be different from firmware language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10058,7 +10032,7 @@ May be different from firmware language</source>
         <location filename="../imgpreferences.ui" line="253"/>
         <location filename="../preferencesdialog.ui" line="1533"/>
         <source>Include companion splashes</source>
-        <translation>&apos;companion&apos; Startbilder einschliessen</translation>
+        <translation>Startbilder einschliessen</translation>
     </message>
     <message>
         <location filename="../imgpreferences.ui" line="258"/>
@@ -10102,7 +10076,7 @@ May be different from firmware language</source>
     <message>
         <location filename="../preferencesdialog.ui" line="938"/>
         <source>Processor ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Prozessor ID</translation>
     </message>
     <message>
         <location filename="../imgpreferences.ui" line="74"/>
@@ -10114,11 +10088,53 @@ May be different from firmware language</source>
         <location filename="../imgpreferences.ui" line="129"/>
         <location filename="../preferencesdialog.ui" line="728"/>
         <source>Use clipboard only</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwende nur Zwischenablage</translation>
     </message>
     <message>
+        <location filename="../preferencesdialog.ui" line="971"/>
+        <location filename="../preferencesdialog.ui" line="984"/>
+        <location filename="../preferencesdialog.ui" line="997"/>
+        <location filename="../preferencesdialog.ui" line="1010"/>
+        <location filename="../preferencesdialog.ui" line="1023"/>
+        <location filename="../preferencesdialog.ui" line="1036"/>
+        <location filename="../preferencesdialog.ui" line="1049"/>
+        <location filename="../preferencesdialog.ui" line="1062"/>
+        <location filename="../preferencesdialog.ui" line="1075"/>
+        <location filename="../preferencesdialog.ui" line="1088"/>
+        <location filename="../preferencesdialog.ui" line="1101"/>
+        <location filename="../preferencesdialog.ui" line="1114"/>
+        <location filename="../preferencesdialog.ui" line="1127"/>
+        <location filename="../preferencesdialog.ui" line="1140"/>
+        <location filename="../preferencesdialog.ui" line="1153"/>
+        <location filename="../preferencesdialog.ui" line="1166"/>
+        <location filename="../preferencesdialog.ui" line="1179"/>
+        <location filename="../preferencesdialog.ui" line="1192"/>
+        <location filename="../preferencesdialog.ui" line="1205"/>
+        <location filename="../preferencesdialog.ui" line="1218"/>
+        <location filename="../preferencesdialog.ui" line="1231"/>
+        <location filename="../preferencesdialog.ui" line="1244"/>
+        <location filename="../preferencesdialog.ui" line="1257"/>
+        <location filename="../preferencesdialog.ui" line="1270"/>
+        <location filename="../preferencesdialog.ui" line="1283"/>
+        <location filename="../preferencesdialog.ui" line="1296"/>
+        <location filename="../preferencesdialog.ui" line="1309"/>
+        <location filename="../preferencesdialog.ui" line="1322"/>
+        <location filename="../preferencesdialog.ui" line="1335"/>
+        <location filename="../preferencesdialog.ui" line="1348"/>
+        <location filename="../preferencesdialog.ui" line="1361"/>
+        <location filename="../preferencesdialog.ui" line="1374"/>
+        <location filename="../preferencesdialog.ui" line="1387"/>
+        <location filename="../preferencesdialog.ui" line="1400"/>
+        <location filename="../preferencesdialog.ui" line="1413"/>
+        <location filename="../preferencesdialog.ui" line="1426"/>
+        <location filename="../preferencesdialog.ui" line="1439"/>
+        <location filename="../preferencesdialog.ui" line="1452"/>
+        <location filename="../preferencesdialog.ui" line="1465"/>
+        <location filename="../preferencesdialog.ui" line="1478"/>
+        <location filename="../preferencesdialog.ui" line="1491"/>
+        <location filename="../preferencesdialog.ui" line="1504"/>
         <source>CheckBox</source>
-        <translation type="obsolete">CheckBox</translation>
+        <translation>CheckBox</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="566"/>
@@ -10128,17 +10144,17 @@ May be different from firmware language</source>
     <message>
         <location filename="../preferencesdialog.ui" line="859"/>
         <source>Language</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprache</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="694"/>
         <source>Profile Name</source>
-        <translation type="unfinished">Profil Name</translation>
+        <translation>Profil Name</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="660"/>
         <source>Export Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Export Profil</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="667"/>
@@ -10148,7 +10164,7 @@ May be different from firmware language</source>
     <message>
         <location filename="../preferencesdialog.ui" line="684"/>
         <source>Import Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Import Profil</translation>
     </message>
     <message>
         <location filename="../imgpreferences.ui" line="64"/>
@@ -10169,7 +10185,7 @@ May be different from firmware language</source>
     <message>
         <location filename="../preferencesdialog.ui" line="156"/>
         <source>Show Splash At Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige Startbild beim Start</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="312"/>
@@ -10181,31 +10197,31 @@ May be different from firmware language</source>
         <location filename="../preferencesdialog.ui" line="90"/>
         <source>Blue</source>
         <oldsource>Blu</oldsource>
-        <translation>blau</translation>
+        <translation>Blau</translation>
     </message>
     <message>
         <location filename="../imgpreferences.ui" line="151"/>
         <location filename="../preferencesdialog.ui" line="95"/>
         <source>Green</source>
-        <translation>grün</translation>
+        <translation>Grün</translation>
     </message>
     <message>
         <location filename="../imgpreferences.ui" line="156"/>
         <location filename="../preferencesdialog.ui" line="100"/>
         <source>Red</source>
-        <translation>rot</translation>
+        <translation>Rot</translation>
     </message>
     <message>
         <location filename="../imgpreferences.ui" line="161"/>
         <location filename="../preferencesdialog.ui" line="105"/>
         <source>Orange</source>
-        <translation>orange</translation>
+        <translation>Orange</translation>
     </message>
     <message>
         <location filename="../imgpreferences.ui" line="166"/>
         <location filename="../preferencesdialog.ui" line="110"/>
         <source>Yellow</source>
-        <translation>gelb</translation>
+        <translation>Gelb</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="766"/>
@@ -10215,7 +10231,7 @@ May be different from firmware language</source>
     <message>
         <location filename="../preferencesdialog.ui" line="134"/>
         <source>auto backup before write</source>
-        <translation type="unfinished"></translation>
+        <translation>AutoBackup vor Schreiben</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="1622"/>
@@ -10225,7 +10241,7 @@ May be different from firmware language</source>
     <message>
         <location filename="../preferencesdialog.ui" line="1606"/>
         <source>Google Earth Executable</source>
-        <translation type="unfinished"></translation>
+        <translation>Google Earth exe</translation>
     </message>
     <message>
         <location filename="../preferencesdialog.ui" line="639"/>
@@ -10265,8 +10281,9 @@ May be different from firmware language</source>
 <context>
     <name>printDialog</name>
     <message>
+        <location filename="../printdialog.ui" line="26"/>
         <source>Dialog</source>
-        <translation type="obsolete">Dialog</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../printdialog.ui" line="54"/>
@@ -10479,7 +10496,7 @@ May be different from firmware language</source>
     <message>
         <location filename="../printdialog.cpp" line="233"/>
         <source>Expo/Dr Settings</source>
-        <translation>Expo/Dual Rate</translation>
+        <translation>Expo/Dualrate Einstellungen</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="264"/>
@@ -10490,7 +10507,7 @@ May be different from firmware language</source>
         <location filename="../printdialog.cpp" line="299"/>
         <location filename="../printdialog.cpp" line="395"/>
         <source>DISABLED</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesperrt</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="549"/>
@@ -10669,7 +10686,7 @@ May be different from firmware language</source>
     <message>
         <location filename="../printdialog.cpp" line="755"/>
         <source>System of units</source>
-        <translation>Ma&amp;szlig;einheit</translation>
+        <translation>Maßeinheiten</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="791"/>
@@ -10690,7 +10707,7 @@ May be different from firmware language</source>
         <location filename="../printdialog.cpp" line="765"/>
         <location filename="../printdialog.cpp" line="767"/>
         <source>Custom Telemetry View</source>
-        <translation type="unfinished"></translation>
+        <translation>Telemetrie Ansicht</translation>
     </message>
     <message>
         <location filename="../printdialog.cpp" line="167"/>
diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts
index 2c21a718e..8f63972c7 100644
--- a/companion/src/translations/companion_fr.ts
+++ b/companion/src/translations/companion_fr.ts
@@ -8726,7 +8726,7 @@ m2560 for v4.1 boards</source>
     <message>
         <location filename="../contributorsdialog.cpp" line="23"/>
         <source>People who have contributed to this project</source>
-        <translation>Personnes qui ont contribué au projet</translation>
+        <translation>Donateurs supportant le projet</translation>
     </message>
     <message>
         <location filename="../contributorsdialog.cpp" line="52"/>
diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts
index e577623de..c0fc29925 100644
--- a/companion/src/translations/companion_pl.ts
+++ b/companion/src/translations/companion_pl.ts
@@ -225,12 +225,12 @@
     <message>
         <location filename="../modeledit/curves.ui" line="68"/>
         <source>Fixed X</source>
-        <translation type="unfinished"></translation>
+        <translation>Stałe X</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="73"/>
         <source>Custom X</source>
-        <translation type="unfinished"></translation>
+        <translation>Własny X</translation>
     </message>
     <message>
         <location filename="../modeledit/curves.ui" line="82"/>
@@ -567,13 +567,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/expodialog.ui" line="36"/>
         <source>Source for the mixer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Źródło miksera.</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="269"/>
         <source>Switch used to enable the line.
 If blank then the input is considered to be &quot;ON&quot; all the time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Przełącznik używany do akrywacji linii. Jeśli puste linia jest uznawana za aktywną cały czas.</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.ui" line="285"/>
@@ -593,7 +593,7 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</source
     <message>
         <location filename="../modeledit/expodialog.ui" line="388"/>
         <source>Curve applied to the source.</source>
-        <translation type="unfinished"></translation>
+        <translation>Krzywa załączona do źródła.</translation>
     </message>
     <message>
         <location filename="../modeledit/expodialog.cpp" line="17"/>
@@ -630,7 +630,7 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</source
     <message>
         <location filename="../wizarddialog.cpp" line="739"/>
         <source>Throttle Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanał gazu:</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="741"/>
@@ -1357,12 +1357,12 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j
     <message>
         <location filename="../generaledit.ui" line="543"/>
         <source>Default Channel Order</source>
-        <translation type="unfinished">Bazowa kolejność kanałów</translation>
+        <translation>Bazowa kolejność kanałów</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="686"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kolejność kanałów&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Definiuje kolejność standardowych mikserów dla nowego modelu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="703"/>
@@ -1527,42 +1527,42 @@ To ustawienie jest używane przez szablony, określa jakie wyjście przypisane j
     <message>
         <location filename="../generaledit.ui" line="2384"/>
         <source>Pot. 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Potencj. 4</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="2398"/>
         <source>Pot. 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Potencj. 3</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="2418"/>
         <source>Pot. 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Potencj. 2</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="2425"/>
         <source>Pot. 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Potencj. 1</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="2452"/>
         <source>Stick 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Drążek 3</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="2489"/>
         <source>Stick 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Drążek 1</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="2538"/>
         <source>Stick 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Drążek 2</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="2623"/>
         <source>Stick 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Drążek 4</translation>
     </message>
     <message>
         <location filename="../generaledit.ui" line="3170"/>
@@ -1994,7 +1994,7 @@ Jesteś pewien ?</translation>
     <message>
         <location filename="../wizarddialog.cpp" line="774"/>
         <source>Throttle Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanał gazu:</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="776"/>
@@ -2045,7 +2045,7 @@ Jesteś pewien ?</translation>
     <message>
         <location filename="../modeledit/inputs.cpp" line="23"/>
         <source>Clear All Inputs</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyczyść wszystkie wejścia</translation>
     </message>
     <message>
         <location filename="../modeledit/inputs.cpp" line="92"/>
@@ -2344,13 +2344,13 @@ Jesteś pewien ?</translation>
     <message>
         <location filename="../mainwindow.cpp" line="280"/>
         <source>A new release of Companion is available, please check the OpenTX website!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe wydanie Companion jest dostępne, proszę sprawdzić stronę OpenTX!</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="344"/>
         <location filename="../mainwindow.cpp" line="383"/>
         <source>Not enough memory for all the selected firmware options</source>
-        <translation type="unfinished"></translation>
+        <translation>Za mało pamięci dla wybranej konfiguracji firmware</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="347"/>
@@ -2492,32 +2492,32 @@ Chcesz pobrać teraz?</translation>
     <message>
         <location filename="../mainwindow.cpp" line="1614"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1615"/>
         <source>Open...</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz...</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1616"/>
         <source>Save</source>
-        <translation type="unfinished">Zapisz</translation>
+        <translation>Zapisz</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1617"/>
         <source>Save As...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz jako...</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1620"/>
         <source>Copy Model</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj Model</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1621"/>
         <source>Paste Model</source>
-        <translation type="unfinished"></translation>
+        <translation>Wklej Model</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1651"/>
@@ -2972,7 +2972,7 @@ Chcesz pobrać teraz?</translation>
     <message>
         <location filename="../mainwindow.cpp" line="1684"/>
         <source>Recent Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Ostatnie Pliki</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1830"/>
@@ -3423,7 +3423,7 @@ Czy mimo wszystko zapisać?</translation>
     <message>
         <location filename="../mainwindow.cpp" line="1846"/>
         <source>Show the list of radio profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż listę profili radia</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1886"/>
@@ -3836,7 +3836,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/mixerdialog.cpp" line="19"/>
         <source>DEST -&gt; CH%1</source>
-        <translation type="unfinished">Cel -&gt; KAN%1</translation>
+        <translation>Cel -&gt; KAN%1</translation>
     </message>
     <message>
         <location filename="../modeledit/mixerdialog.cpp" line="38"/>
@@ -3963,12 +3963,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/mixes.cpp" line="469"/>
         <source>&amp;Toggle highlight</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Przełącz podświetlenie</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="469"/>
         <source>Ctrl+T</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+T</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="471"/>
@@ -4002,7 +4002,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/mixes.cpp" line="473"/>
         <source>C&amp;ut</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wytnij</translation>
     </message>
     <message>
         <location filename="../modeledit/mixes.cpp" line="474"/>
@@ -4352,17 +4352,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../modeledit/setup_module.ui" line="91"/>
         <source>CH </source>
-        <translation type="unfinished"></translation>
+        <translation>Kan</translation>
     </message>
     <message>
         <location filename="../modeledit/setup_module.ui" line="198"/>
         <source> us</source>
-        <translation type="unfinished"></translation>
+        <translation> us</translation>
     </message>
     <message>
         <location filename="../modeledit/setup_module.ui" line="313"/>
         <source> ms</source>
-        <translation type="unfinished"> ms</translation>
+        <translation> ms</translation>
     </message>
     <message>
         <location filename="../modeledit/setup_module.ui" line="391"/>
@@ -4443,7 +4443,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../wizarddialog.cpp" line="809"/>
         <source>Throttle Channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanał gazu:</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="811"/>
@@ -4939,7 +4939,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1217"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1227"/>
         <source>Channel values displayed in us</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartosći kanałów wyswietlone w us</translation>
     </message>
     <message>
         <source>In model setup menus automatically set source by moving some of them</source>
@@ -5223,7 +5223,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1174"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1199"/>
         <source>In model setup menus automatically set source by moving the control</source>
-        <translation type="unfinished"></translation>
+        <translation>W menu ustawień modelu automatycznie wybierz źródło poprzez poruszenie nim</translation>
     </message>
     <message>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1044"/>
@@ -5233,7 +5233,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1175"/>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1200"/>
         <source>In model setup menus automatically set switch by moving the control</source>
-        <translation type="unfinished"></translation>
+        <translation>W menu ustawień modelu automatycznie wybierz źródło poprzez poruszenie nim</translation>
     </message>
     <message>
         <location filename="../firmwares/opentx/opentxinterface.cpp" line="1094"/>
@@ -6427,14 +6427,16 @@ Zespół OpenTX/Companion.</translation>
     <message>
         <location filename="../firmwares/opentx/open9xStockeeprom.cpp" line="92"/>
         <source>Simultaneous usage of expo and curves is no longer supported in OpenTX</source>
-        <translation type="unfinished"></translation>
+        <translation>Jednoczesne użycie expo i krzywych nie jest dłużej wspierane w OpenTX</translation>
     </message>
     <message>
         <location filename="../warnings.h" line="5"/>
         <source>Thank you for upgrading to OpenTX 2.0. This is a major upgrade that adds and modifies a lot of things, so please make sure that you read release notes carefully to learn about the changes, and thoroughly check each of your models for proper function.
 
 The OpenTX Team.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dziękujemy za zupgradowanie do OpenTX 2.0. Ten duży upgrade dodaje i zmienia wiele rzeczy, zatem prosimy upewnić się, że dokładnie przeczytałeś informacje o wydaniu i zapoznałeś się ze zmianami oraz sprawdziłes ustawienia wszystkich swoich modeli czy działają prawidłowo.
+
+Zespół OpenTX.</translation>
     </message>
 </context>
 <context>
@@ -6569,12 +6571,12 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
     <message>
         <location filename="../modeledit/setup.ui" line="156"/>
         <source>Timer 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Timer 2</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="172"/>
         <source>Timer 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Timer 1</translation>
     </message>
     <message>
         <location filename="../modeledit/setup.ui" line="190"/>
@@ -6970,7 +6972,7 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
     <message>
         <location filename="../modeledit/telemetry.ui" line="537"/>
         <source>CELS</source>
-        <translation type="unfinished"></translation>
+        <translation>Ogniwa</translation>
     </message>
     <message>
         <location filename="../modeledit/telemetry.ui" line="583"/>
@@ -7633,17 +7635,17 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
     <message>
         <location filename="../wizarddialog.cpp" line="70"/>
         <source>Most aircraft have a main wing and a tail with control surfaces. Flying wings and delta winged aircraft only have a single wing. The main control surface on a standard wing controls the roll of the aircraft. This surface is called an aileron.&lt;br&gt;The control surface of a delta wing controls both roll and pitch. This surface is called an elevon. </source>
-        <translation type="unfinished"></translation>
+        <translation>Większość samolotów posiada powierzchnie sterowe na skrzydłach i ogonie. Latające skrzydło oraz delta posada tylko sterowanie na skrzydłach. Główne powierzchnie sterowe starndardowych skrzydeł powodują obórt samolotu w osi podłużnej. Są to lotki.&lt;br&gt; Powierzchnie sterowe na skrzydle w delcie i latającym skrzydle działają jako lotki i ster wysokości. Są to sterolotki.</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="74"/>
         <source>Models use one or two channels to control the ailerons.&lt;br&gt;A so called Y-cable can be used to connect a single receiver channel to two separate aileron servos. If your servos are connected by a Y-cable you should select the single-servo option.&lt;br&gt;&lt;br&gt;Aileron - Spektrum: CH2, Futaba: CH1</source>
-        <translation type="unfinished"></translation>
+        <translation>Większość modelu używa jednego lub 2ch kanałów do sterowania lotkami.&lt;br&gt;&lt;br&gt;Przez tzw. Y-kabel mogą być kontrolowane 2 serwa na jednym kanale. Jeśli używasz Y-kabla wybierz opcję z jednym serwem.&lt;br&gt;&lt;br&gt; Lotki - Spektrum: Kan2, Futaba: Kan1</translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="85"/>
         <source>Models use one or two channels to control the elevons.&lt;br&gt;A so called Y-cable can be used to connect single a receiver channel to two separate elevon servos. If your servos are connected by a Y-cable you should select the single-servo option.</source>
-        <translation type="unfinished"></translation>
+        <translation>Model używa jednego lub dwóch kanałów do kontrolowania sterolotek.&lt;br&gt;Przez tzw. Y-kabel mogą być kontrolowane 2 serwa na jednym kanale. Jeśli używasz Y-kabla wybierz opcję z jednym serwem.</translation>
     </message>
     <message>
         <source>Most aircraft have a main wing and a tail with control surfaces. Flying wings and delta winged aircraft only have a single wing. The main control surface on a standard wing controlls the roll of the aircraft. This surface is called an aileron.&lt;br&gt;The control surface of a delta wing controls both roll and elevation. This surface is called an elevon. </source>
@@ -7773,12 +7775,12 @@ Wolne obroty będą na górze, trymer i ostrzeżenie o otwartym gazie również
     <message>
         <location filename="../apppreferencesdialog.ui" line="137"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kolejność kanałów&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Definiuje kolejność standardowych mikserów dla nowego modelu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="319"/>
         <source>Default Channel Order</source>
-        <translation type="unfinished">Bazowa kolejność kanałów</translation>
+        <translation>Bazowa kolejność kanałów</translation>
     </message>
     <message>
         <location filename="../apppreferencesdialog.ui" line="536"/>
@@ -8853,7 +8855,7 @@ m2560 dla platformy V4</translation>
     <message>
         <location filename="../burndialog.cpp" line="356"/>
         <source>Profile image %1 is invalid.</source>
-        <translation type="unfinished"></translation>
+        <translation>Obraz profilu %1 nieprawidłowy.</translation>
     </message>
     <message>
         <location filename="../burndialog.cpp" line="372"/>
@@ -9171,7 +9173,7 @@ m2560 dla platformy V4</translation>
     <message>
         <location filename="../comparedialog.cpp" line="974"/>
         <source>5 Point Curves</source>
-        <translation type="unfinished"></translation>
+        <translation>5-cio punktowe Krzywe</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="995"/>
@@ -9365,7 +9367,7 @@ m2560 dla platformy V4</translation>
     <message>
         <location filename="../comparedialog.cpp" line="1004"/>
         <source>9 Point Curves</source>
-        <translation type="unfinished"></translation>
+        <translation>9-cio punktowe Krzywe</translation>
     </message>
     <message>
         <location filename="../comparedialog.cpp" line="1077"/>
@@ -9534,7 +9536,7 @@ m2560 dla platformy V4</translation>
     <message>
         <location filename="../customizesplashdialog.cpp" line="228"/>
         <source>Cannot load profile image %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mogę załadować obrazu Profilu %1.</translation>
     </message>
     <message>
         <location filename="../customizesplashdialog.cpp" line="242"/>
@@ -10096,7 +10098,7 @@ Tlačítkem Zrušit přerušíte kalibraci</translation>
     <message>
         <location filename="../logsdialog.ui" line="111"/>
         <source>Reset</source>
-        <translation type="unfinished">Zresetuj</translation>
+        <translation>Zesetuj</translation>
     </message>
     <message>
         <location filename="../logsdialog.ui" line="135"/>
diff --git a/companion/src/wizarddata.cpp b/companion/src/wizarddata.cpp
index 091ce7895..28b028cd1 100644
--- a/companion/src/wizarddata.cpp
+++ b/companion/src/wizarddata.cpp
@@ -67,13 +67,13 @@ void WizMix::addMix(ModelData &model, Input input, int weight, int channel, int
     }
     else if (input==FLAPS_INPUT){
       // There ought to be some kind of constants for switches somewhere...
-      maxMixSwitch( "Flaps Up",   model.mixData[mixIndex++], channel+1, isTaranis ? 1 :-3 ,  weight); //SA-UP or ELE-UP
-      maxMixSwitch( "Flaps Down", model.mixData[mixIndex++], channel+1, isTaranis ? 3 : 3 , -weight); //SA-DOWN or ELE-DOWN
+      maxMixSwitch((char *)"Flaps Up",   model.mixData[mixIndex++], channel+1, isTaranis ? 1 :-3 ,  weight); //SA-UP or ELE-UP
+      maxMixSwitch((char *)"Flaps Down", model.mixData[mixIndex++], channel+1, isTaranis ? 3 : 3 , -weight); //SA-DOWN or ELE-DOWN
 
     }
     else if (input==AIRBRAKES_INPUT){ 
-      maxMixSwitch( "Airbrk Off", model.mixData[mixIndex++], channel+1, isTaranis ? 13 :-2 ,  -weight); //SE-UP or RUD-UP
-      maxMixSwitch( "Airbrk On",  model.mixData[mixIndex++], channel+1, isTaranis ? 15 : 2 , weight); //SE-DOWN or RUD-DOWN
+      maxMixSwitch((char *)"Airbrk Off", model.mixData[mixIndex++], channel+1, isTaranis ? 13 :-2 ,  -weight); //SE-UP or RUD-UP
+      maxMixSwitch((char *)"Airbrk On",  model.mixData[mixIndex++], channel+1, isTaranis ? 15 : 2 , weight); //SE-DOWN or RUD-DOWN
     }
   }
 }
diff --git a/companion/src/xmlinterface.cpp b/companion/src/xmlinterface.cpp
index b3514383d..0c6185d96 100644
--- a/companion/src/xmlinterface.cpp
+++ b/companion/src/xmlinterface.cpp
@@ -116,14 +116,16 @@ void saveGeneralSettings(GeneralSettings & settings, global_settings & gs)
 
 void saveModel(ModelData & m, model & xm)
 {
+  /* TODO
   model::timer_sequence & timer_sequence (xm.timer());
   for (int i=0; i<2; i++) {
-    TimerData & t = m.timers[i];
-    /* TODO if (t.mode) {
+     TimerData & t = m.timers[i];
+     if (t.mode) {
       timer xt(TimerSwitch::value(t.mode+TMR_NUM_OPTION), direction::value(t.dir), timer::value_type(t.val/3600, (t.val%3600)/60, t.val%60));
       timer_sequence.push_back(xt);
-    } */
+    } 
   }
+  */
   if (m.moduleData[0].protocol != PPM || m.moduleData[0].channelsCount != 8 || m.moduleData[0].ppmDelay != 300 || m.moduleData[0].ppmPulsePol != 0) {
     modulation mod;
     mod.type(modulation::type_type::value(m.moduleData[0].protocol));
diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index 55896cbf1..70aca2915 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -788,7 +788,7 @@ void AudioQueue::pause(uint16_t len)
 
 bool AudioQueue::isPlaying(uint8_t id)
 {
-  if (normalContext.fragment.id == id || backgroundContext.fragment.id == id)
+  if (normalContext.fragment.id == id || (isFunctionActive(FUNCTION_BACKGND_MUSIC) && backgroundContext.fragment.id == id))
     return true;
 
   uint8_t i = ridx;
diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index af715fef8..1454b12ce 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -342,7 +342,7 @@ int ConvertTelemetrySource_215_to_216(int source)
   if (source >= TELEM_A3)
     source += 2;
   // ASpd and dTE added + 5 reserve
-  if (source >= TELEM_ASPD)
+  if (source >= TELEM_ASPEED)
     source += 7;
   // A3 and A4 MIN added
   if (source >= TELEM_MIN_A3)
@@ -833,7 +833,9 @@ void ConvertModel_215_to_216(ModelData &model)
     memcpy(g_model.gvars[i].name, oldModel.gvar_names[i], LEN_GVAR_NAME);
   }
 
-  memcpy(&g_model.frsky, &oldModel.frsky, sizeof(oldModel.frsky));
+  memcpy(&g_model.frsky, &oldModel.frsky, 2*sizeof(FrSkyChannelData));
+  // gap for A3-A4
+  memcpy(((uint8_t *)&g_model.frsky) + 4*sizeof(FrSkyChannelData), ((uint8_t *)&oldModel.frsky) + 2*sizeof(FrSkyChannelData), sizeof(oldModel.frsky) - 2*sizeof(FrSkyChannelData));
   for (int i=0; i<3; i++) {
     if (g_model.frsky.screensType & (1<<i)) {
       // gauges
diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp
index 721925c1c..c311706ee 100644
--- a/radio/src/gui/view_main.cpp
+++ b/radio/src/gui/view_main.cpp
@@ -305,11 +305,6 @@ void displayTopBar()
     x -= 12;
   }
 
-  /* SD ICON, not really needed
-  if (sdMounted()) {
-    LCD_NOTIF_ICON(x, ICON_SD);
-  } */
-
   /* Audio volume */
   if (requiredSpeakerVolume == 0)
     LCD_ICON(BAR_VOLUME_X, BAR_Y, ICON_SPEAKER0);
@@ -717,26 +712,21 @@ void menuMainView(uint8_t event)
   }
   else {
     // Logical Switches
-    uint8_t sw = 0;
-    for (uint8_t line=0; line<4; line++) {
-      uint8_t y = LCD_H/2-7+line*8;
-      lcd_rect(LCD_W/2+7*FW-1, y-1, 6*8+1, 7);
-      for (uint8_t col=0; col<8; col++) {
-        uint8_t x = LCD_W/2+7*FW-1+col*(FW);
-        if (col > 0)
-          lcd_vline(x, y, 5);
-        if (getSwitch(SWSRC_SW1+sw)) {
-          lcd_plot(x+1, y);
-          lcd_plot(x+2, y+1);
-          lcd_plot(x+3, y+2);
-          lcd_plot(x+4, y+3);
-          lcd_plot(x+5, y+4);
-          lcd_plot(x+1, y+4);
-          lcd_plot(x+2, y+3);
-          lcd_plot(x+4, y+1);
-          lcd_plot(x+5, y);
-        }
-        sw++;
+    lcd_puts(TRIM_RH_X - TRIM_LEN/2 + 5, 6*FH-1, "LS 1-32");
+    for (uint8_t sw=0; sw<NUM_LOGICAL_SWITCH; sw++) {
+      div_t qr = div(sw, 10);
+      uint8_t y = 13 + 11 * qr.quot;
+      uint8_t x = TRIM_RH_X - TRIM_LEN + qr.rem*5 + (qr.rem >= 5 ? 3 : 0);
+      LogicalSwitchData * cs = cswAddress(sw);
+      if (cs->func == LS_FUNC_NONE) {
+        lcd_hline(x, y+6, 4);
+        lcd_hline(x, y+7, 4);
+      }
+      else if (getSwitch(SWSRC_SW1+sw)) {
+        lcd_filled_rect(x, y, 4, 8);
+      }
+      else {
+        lcd_rect(x, y, 4, 8);
       }
     }
   }
diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index 95926954a..bf5293ef0 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -1245,11 +1245,12 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
       putsTelemetryValue(x, y, val, UNIT_RAW, att|PREC2);
       break;
 
-    case TELEM_VSPD-1:
+    case TELEM_VSPEED-1:
       putsTelemetryValue(x, y, div10_and_round(val), UNIT_RAW, att|PREC1);
       break;
 
-    case TELEM_ASPD-1:
+    case TELEM_ASPEED-1:
+    case TELEM_MAX_ASPEED-1:
       putsTelemetryValue(x, y, val, UNIT_KTS, att);
       break;
 
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index cdb3fff0b..e95da27d9 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -280,7 +280,8 @@ enum uartModes {
 #define EXTRA_GENERAL_FIELDS \
   EXTRA_GENERAL_FIELDS_ARM \
   uint8_t  uart3Mode; \
-  uint8_t  potsType;
+  uint8_t  potsType; \
+  uint8_t  backlightColor;
 #elif defined(CPUARM)
   #define EXTRA_GENERAL_FIELDS EXTRA_GENERAL_FIELDS_ARM
 #elif defined(PXX)
@@ -1015,8 +1016,8 @@ enum TelemetrySource {
   TELEM_ACCy,
   TELEM_ACCz,
   TELEM_HDG,
-  TELEM_VSPD,
-  TELEM_ASPD,
+  TELEM_VSPEED,
+  TELEM_ASPEED,
   TELEM_DTE,
 #if defined(CPUARM)
   TELEM_RESERVE1,
@@ -1135,7 +1136,7 @@ enum FrskyVoltsSource {
 #if defined(CPUARM)
 #define MAX_FRSKY_SCREENS 3
 PACK(typedef struct t_FrSkyData {
-  FrSkyChannelData channels[2];
+  FrSkyChannelData channels[4];
   uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
   uint8_t voltsSource:7;
   uint8_t altitudeDisplayed:1;
@@ -1187,6 +1188,7 @@ PACK(typedef struct t_MavlinkData {
 #endif
 
 enum SwashType {
+  SWASH_TYPE_NONE,
   SWASH_TYPE_120,
   SWASH_TYPE_120X,
   SWASH_TYPE_140,
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 9678e8587..685c74ceb 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -983,9 +983,9 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
       if (ed->srcRaw == ovwrIdx)
         v = ovwrValue;
 #if defined(HELI)
-      else if (ed->srcRaw == MIXSRC_Ele && g_model.swashR.value)
+      else if (ed->srcRaw == MIXSRC_Ele)
         v = heliAnas[ELE_STICK];
-      else if (ed->srcRaw == MIXSRC_Ail && g_model.swashR.value)
+      else if (ed->srcRaw == MIXSRC_Ail)
         v = heliAnas[AIL_STICK];
 #endif
       else {
@@ -1035,6 +1035,13 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
           virtualInputsTrims[cur_chn] = ed->srcRaw - MIXSRC_Rud;
         else
           virtualInputsTrims[cur_chn] = -1;
+
+#if defined(HELI)
+        if (ed->srcRaw == MIXSRC_Ele)
+          heliAnas[ELE_STICK] = v;
+        else if (ed->srcRaw == MIXSRC_Ail)
+          heliAnas[AIL_STICK] = v;
+#endif
 #endif
 
         anas[cur_chn] = v;
@@ -1316,8 +1323,8 @@ getvalue_t getValue(uint8_t i)
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ACCy) return frskyData.hub.accelY;
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ACCz) return frskyData.hub.accelZ;
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_HDG) return frskyData.hub.gpsCourse_bp;
-  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_VSPD) return frskyData.hub.varioSpeed;
-  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ASPD) return frskyData.hub.airSpeed;
+  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_VSPEED) return frskyData.hub.varioSpeed;
+  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ASPEED) return frskyData.hub.airSpeed;
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_DTE) return frskyData.hub.dTE;
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A1) return frskyData.analog[0].min;
   else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A2) return frskyData.analog[1].min;
@@ -2071,7 +2078,7 @@ getvalue_t convert16bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
       result = value * 100;
       break;
 #endif
-    case TELEM_VSPD:
+    case TELEM_VSPEED:
       result = value * 10;
       break;
 
@@ -2134,7 +2141,7 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
     case TELEM_CONSUMPTION:
       result = value * 20;
       break;
-    case TELEM_VSPD:
+    case TELEM_VSPEED:
       result = ((getvalue_t)value - 125) * 10;
       break;
 #endif
@@ -3200,10 +3207,10 @@ void evalInputs(uint8_t mode)
 #if defined(HELI)
       if (d && (ch==ELE_STICK || ch==AIL_STICK)) {
         v = (int32_t(v) * calc100toRESX(g_model.swashR.value)) / int32_t(d);
-#if defined(PCBTARANIS)
-        heliAnas[ch] = v;
-#endif
       }
+#if defined(PCBTARANIS)
+      heliAnas[ch] = v;
+#endif
 #endif
 
 #if !defined(PCBTARANIS)
@@ -3313,11 +3320,12 @@ PLAY_FUNCTION(playValue, uint8_t idx)
       PLAY_NUMBER(div10_and_round(val), 1+UNIT_G, PREC1);
       break;
 
-    case MIXSRC_FIRST_TELEM+TELEM_VSPD-1:
+    case MIXSRC_FIRST_TELEM+TELEM_VSPEED-1:
       PLAY_NUMBER(div10_and_round(val), 1+UNIT_METERS_PER_SECOND, PREC1);
       break;
 
-    case MIXSRC_FIRST_TELEM+TELEM_ASPD-1:
+    case MIXSRC_FIRST_TELEM+TELEM_ASPEED-1:
+    case MIXSRC_FIRST_TELEM+TELEM_MAX_ASPEED-1:
       PLAY_NUMBER(val, 1+UNIT_KTS, 0);
       break;
 
diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp
index abe3bd6d4..6810cf7f2 100644
--- a/radio/src/simu.cpp
+++ b/radio/src/simu.cpp
@@ -179,7 +179,7 @@ long Open9xSim::onKeypress(FXObject*,FXSelector,void*v)
   return 0;
 }
 
-long Open9xSim::onTimeout(FXObject*,FXSelector,void*)
+long Open9xSim::onTimeout(FXObject*, FXSelector, void*)
 {
   if(hasFocus()) {
     static int keys1[]={
@@ -284,7 +284,7 @@ long Open9xSim::onTimeout(FXObject*,FXSelector,void*)
 
   per10ms();
   refreshDiplay();
-  getApp()->addTimeout(this,2,5);
+  getApp()->addTimeout(this, 2, 10);
   return 0;
 }
 
diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp
index 1eb7e6107..1fcfd0e82 100644
--- a/radio/src/translations/tts_cz.cpp
+++ b/radio/src/translations/tts_cz.cpp
@@ -82,7 +82,7 @@ enum CzechPrompts {
   CZ_PROMPT_ACCELy = CZ_PROMPT_LABELS_BASE+TELEM_ACCy,
   CZ_PROMPT_ACCELz = CZ_PROMPT_LABELS_BASE+TELEM_ACCz,
   CZ_PROMPT_HDG = CZ_PROMPT_LABELS_BASE+TELEM_HDG,
-  CZ_PROMPT_VARIO = CZ_PROMPT_LABELS_BASE+TELEM_VSPD,
+  CZ_PROMPT_VARIO = CZ_PROMPT_LABELS_BASE+TELEM_VSPEED,
  
 };
 
diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp
index 62ff70f31..067de6cca 100644
--- a/radio/src/translations/tts_de.cpp
+++ b/radio/src/translations/tts_de.cpp
@@ -83,7 +83,7 @@ enum GermanPrompts {
   DE_PROMPT_ACCELy = DE_PROMPT_LABELS_BASE+TELEM_ACCy,
   DE_PROMPT_ACCELz = DE_PROMPT_LABELS_BASE+TELEM_ACCz,
   DE_PROMPT_HDG = DE_PROMPT_LABELS_BASE+TELEM_HDG,
-  DE_PROMPT_VARIO = DE_PROMPT_LABELS_BASE+TELEM_VSPD,
+  DE_PROMPT_VARIO = DE_PROMPT_LABELS_BASE+TELEM_VSPEED,
 
 };
 
diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp
index db1e8ff2b..bc949c377 100644
--- a/radio/src/translations/tts_es.cpp
+++ b/radio/src/translations/tts_es.cpp
@@ -107,7 +107,7 @@ enum SpanishPrompts {
   ES_PROMPT_ACCELy = ES_PROMPT_LABELS_BASE+TELEM_ACCy,
   ES_PROMPT_ACCELz = ES_PROMPT_LABELS_BASE+TELEM_ACCz,
   ES_PROMPT_HDG = ES_PROMPT_LABELS_BASE+TELEM_HDG,
-  ES_PROMPT_VARIO = ES_PROMPT_LABELS_BASE+TELEM_VSPD,
+  ES_PROMPT_VARIO = ES_PROMPT_LABELS_BASE+TELEM_VSPEED,
 
 };
 
diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp
index 17258042c..4bcaa0723 100644
--- a/radio/src/translations/tts_fr.cpp
+++ b/radio/src/translations/tts_fr.cpp
@@ -86,7 +86,7 @@ enum FrenchPrompts {
   FR_PROMPT_ACCELy = FR_PROMPT_LABELS_BASE+TELEM_ACCy,
   FR_PROMPT_ACCELz = FR_PROMPT_LABELS_BASE+TELEM_ACCz,
   FR_PROMPT_HDG = FR_PROMPT_LABELS_BASE+TELEM_HDG,
-  FR_PROMPT_VARIO = FR_PROMPT_LABELS_BASE+TELEM_VSPD,
+  FR_PROMPT_VARIO = FR_PROMPT_LABELS_BASE+TELEM_VSPEED,
 
   FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9
 };
diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp
index b3d90e6b6..e729f4452 100644
--- a/radio/src/translations/tts_it.cpp
+++ b/radio/src/translations/tts_it.cpp
@@ -79,7 +79,7 @@ enum ItalianPrompts {
   IT_PROMPT_ACCELy = IT_PROMPT_LABELS_BASE+TELEM_ACCy,
   IT_PROMPT_ACCELz = IT_PROMPT_LABELS_BASE+TELEM_ACCz,
   IT_PROMPT_HDG = IT_PROMPT_LABELS_BASE+TELEM_HDG,
-  IT_PROMPT_VARIO = IT_PROMPT_LABELS_BASE+TELEM_VSPD,
+  IT_PROMPT_VARIO = IT_PROMPT_LABELS_BASE+TELEM_VSPEED,
 
 };
 
diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp
index da5f2ffe6..9b0bef745 100644
--- a/radio/src/translations/tts_pl.cpp
+++ b/radio/src/translations/tts_pl.cpp
@@ -83,7 +83,7 @@ enum PolishPrompts {
   PL_PROMPT_ACCELy = PL_PROMPT_LABELS_BASE+TELEM_ACCy,
   PL_PROMPT_ACCELz = PL_PROMPT_LABELS_BASE+TELEM_ACCz,
   PL_PROMPT_HDG = PL_PROMPT_LABELS_BASE+TELEM_HDG,
-  PL_PROMPT_VARIO = PL_PROMPT_LABELS_BASE+TELEM_VSPD,
+  PL_PROMPT_VARIO = PL_PROMPT_LABELS_BASE+TELEM_VSPEED,
  
 };
 
diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp
index f48f59917..cee09ac7b 100644
--- a/radio/src/translations/tts_pt.cpp
+++ b/radio/src/translations/tts_pt.cpp
@@ -102,7 +102,7 @@ enum PortuguesePrompts {
   PT_PROMPT_ACCELy = PT_PROMPT_LABELS_BASE+TELEM_ACCy,
   PT_PROMPT_ACCELz = PT_PROMPT_LABELS_BASE+TELEM_ACCz,
   PT_PROMPT_HDG = PT_PROMPT_LABELS_BASE+TELEM_HDG,
-  PT_PROMPT_VARIO = PT_PROMPT_LABELS_BASE+TELEM_VSPD,
+  PT_PROMPT_VARIO = PT_PROMPT_LABELS_BASE+TELEM_VSPEED,
 
 };
 
diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp
index 32d46dcb9..9dc3191c1 100644
--- a/radio/src/translations/tts_sk.cpp
+++ b/radio/src/translations/tts_sk.cpp
@@ -97,7 +97,7 @@ enum SlovakPrompts {
   SK_PROMPT_ACCELy = SK_PROMPT_LABELS_BASE+TELEM_ACCy,
   SK_PROMPT_ACCELz = SK_PROMPT_LABELS_BASE+TELEM_ACCz,
   SK_PROMPT_HDG = SK_PROMPT_LABELS_BASE+TELEM_HDG,
-  SK_PROMPT_VARIO = SK_PROMPT_LABELS_BASE+TELEM_VSPD,
+  SK_PROMPT_VARIO = SK_PROMPT_LABELS_BASE+TELEM_VSPEED,
  
 };
 
diff --git a/radio/util/tts.py b/radio/util/tts.py
index 17aca7b60..fa44b0b93 100644
--- a/radio/util/tts.py
+++ b/radio/util/tts.py
@@ -244,7 +244,7 @@ def ttsFr():
         systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+110+i)))
     for i, s in enumerate(["virgule", "et", "moins"]): 
         systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+119+i)))
-    for i, s in enumerate(["volts", u"ampères", u"mètres seconde", "", "km heure", u"mètres", u"degrés", "pourcents", u"milli ampères", u"milli ampères / heure", "watt", "db", "pieds", "knotts", "heure", "minute", "seconde", "tours par minute", "g"]):
+    for i, s in enumerate(["volts", u"ampères", u"mètres seconde", "", "kilomètre heure", u"mètres", u"degrés", "pourcents", u"milli ampères", u"milli ampères / heure", "watt", "db", "pieds", "miles par heure", "heure", "minute", "seconde", "tours par minute", "g"]):
         systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+125+i)))
     for i, s in enumerate(["timer", "", "tension", "tension", u"émission", u"réception", "altitude", "moteur",
                            "essence", u"température", u"température", "vitesse", "distance", "altitude", u"élément lipo",