diff --git a/companion/src/appdata.cpp b/companion/src/appdata.cpp
index 395dd68be..28b795244 100644
--- a/companion/src/appdata.cpp
+++ b/companion/src/appdata.cpp
@@ -1,6 +1,6 @@
 /*
  * Author - Kjell Kernen
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -346,7 +346,7 @@ Profile::Profile()
     index = -1;
 }
 
-// The default copy operator can not be used since the index variable would be destroyed 
+// The default copy operator can not be used since the index variable would be destroyed
 Profile& Profile::operator=(const Profile& rhs)
 {
     name         ( rhs.name()          );
@@ -577,39 +577,39 @@ AppData::AppData()
     for (int i=0; i<MAX_JOYSTICKS; i++)
         joystick[i].init( i );
 
-    // Copy existing 2.0.16 settings if present   
+    // Copy existing 2.0.16 settings if present
     QSettings settings(COMPANY, PRODUCT);
     if (profile[0].name().isEmpty())
     {
-        QSettings settings20("OpenTX", "Companion 2.0"); 
+        QSettings settings20("OpenTX", "Companion 2.0");
 
         QStringList keys = settings20.allKeys();
         for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
         {
             settings.setValue(*i, settings20.value(*i));
         }
-        
+
         //Reload profiles
         for (int i=0; i<MAX_PROFILES; i++)
             profile[i].init( i );
     }
-    
-    // Else copy existing <2.0.16 settings if present   
+
+    // Else copy existing <2.0.16 settings if present
     if (profile[0].name().isEmpty())
     {
-        QSettings pre2016settings("OpenTX", "OpenTX Companion"); 
+        QSettings pre2016settings("OpenTX", "OpenTX Companion");
 
         QStringList keys = pre2016settings.allKeys();
         for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
         {
             settings.setValue(*i, pre2016settings.value(*i));
         }
-        
+
         //Reload profiles
         for (int i=0; i<MAX_PROFILES; i++)
             profile[i].init( i );
-    }    
-    
+    }
+
     // Else import settings from companion9x if present
     if (profile[0].name().isEmpty())
     {
@@ -657,7 +657,7 @@ AppData::AppData()
         settings.remove("patchImage");
         settings.remove("rename_firmware_files");
         settings.remove("sdPath");
-        settings.remove("SplashFileName"); 
+        settings.remove("SplashFileName");
         settings.remove("startup_check_companion9x");
         settings.remove("wizardEnable");
 
diff --git a/companion/src/appdata.h b/companion/src/appdata.h
index 25f76210e..4883ad834 100644
--- a/companion/src/appdata.h
+++ b/companion/src/appdata.h
@@ -1,6 +1,6 @@
 /*
  * Author - Kjell Kernen
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -12,7 +12,7 @@
  *
  */
 
-// All temporary and permanent global variables are defined here to make 
+// All temporary and permanent global variables are defined here to make
 // initialization and storage safe and visible.
 // Do not access variables in QSettings directly, it is not type safe!
 
@@ -53,7 +53,7 @@ class CompStoreObj
     void getset( QString &string, const QString tag, const QString def, const QString group1="", const QString group2="" );
     void getset( bool &truth, const QString tag, const bool def, const QString group1="", const QString group2="" );
     void getset( int &number, const QString tag, const int def, const QString group1="", const QString group2="" );
-}; 
+};
 
 class FwRevision: protected CompStoreObj
 {
@@ -269,7 +269,7 @@ class AppData: protected CompStoreObj
     QString avrdudeLocation();
     QString dfuArguments();
     QString dfuLocation();
-    QString lastFw();  
+    QString lastFw();
     QString locale();
     QString mcu();
     QString programmer();
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index e26d88581..65e1b71bf 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -1,6 +1,6 @@
 /*
  * Author - Bertrand Songis <bsongis@gmail.com>
- * 
+ *
  * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -325,9 +325,9 @@ class RawSource {
     }
 
     QString toString(const ModelData * model = NULL);
-    
+
     RawSourceRange getRange(const ModelData * model, const GeneralSettings & settings, unsigned int flags=0) const;
-    
+
     bool operator == ( const RawSource & other) {
       return (this->type == other.type) && (this->index == other.index);
     }
@@ -1171,16 +1171,16 @@ class GeneralSettings {
       unsigned int index;
       unsigned int position;
     };
-    
+
     static SwitchInfo switchInfoFromSwitchPositionTaranis(unsigned int index);
     bool switchPositionAllowedTaranis(int index) const;
     bool switchSourceAllowedTaranis(int index) const;
 };
 
 class RadioData {
-  public:   
+  public:
     GeneralSettings generalSettings;
-    ModelData models[C9X_MAX_MODELS];    
+    ModelData models[C9X_MAX_MODELS];
 };
 
 enum Capability {
@@ -1305,15 +1305,15 @@ class EEPROMInterface
     virtual bool load(RadioData &radioData, const uint8_t *eeprom, int size) = 0;
 
     virtual bool loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index) = 0;
-    
+
     virtual bool loadxml(RadioData &radioData, QDomDocument &doc) = 0;
 
     virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0) = 0;
 
     virtual int getSize(ModelData &) = 0;
-    
+
     virtual int getSize(GeneralSettings &) = 0;
-    
+
     virtual int isAvailable(Protocol proto, int port=0) = 0;
 
     virtual const int getEEpromSize() = 0;
diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp
index ddd982e1a..b3cb6dc26 100644
--- a/companion/src/generaledit/generalsetup.cpp
+++ b/companion/src/generaledit/generalsetup.cpp
@@ -3,8 +3,8 @@
 #include <QMessageBox>
 
 GeneralSetupPanel::GeneralSetupPanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware):
-  GeneralPanel(parent, generalSettings, firmware),
-  ui(new Ui::GeneralSetup)
+GeneralPanel(parent, generalSettings, firmware),
+ui(new Ui::GeneralSetup)
 {
   ui->setupUi(this);
 
@@ -358,8 +358,8 @@ void GeneralSetupPanel::on_faimode_CB_stateChanged(int)
 {
   if (ui->faimode_CB->isChecked()) {
     int ret = QMessageBox::question(this, "Companion",
-                   tr("If you enable FAI, you loose the vario, the play functions, the telemetry screen.\nThis function cannot be disabled by the radio.\nAre you sure ?") ,
-                   QMessageBox::Yes | QMessageBox::No);
+     tr("If you enable FAI, you loose the vario, the play functions, the telemetry screen.\nThis function cannot be disabled by the radio.\nAre you sure ?") ,
+     QMessageBox::Yes | QMessageBox::No);
     if (ret==QMessageBox::Yes) {
       generalSettings.fai = true;
     }
@@ -375,58 +375,58 @@ void GeneralSetupPanel::on_faimode_CB_stateChanged(int)
 
 void GeneralSetupPanel::on_speakerPitchSB_editingFinished()
 {
-    generalSettings.speakerPitch = ui->speakerPitchSB->value();
-    emit modified();
+  generalSettings.speakerPitch = ui->speakerPitchSB->value();
+  emit modified();
 }
 
 void GeneralSetupPanel::on_hapticStrength_valueChanged()
 {
-    generalSettings.hapticStrength = ui->hapticStrength->value();
-    emit modified();
+  generalSettings.hapticStrength = ui->hapticStrength->value();
+  emit modified();
 }
 
 void GeneralSetupPanel::on_soundModeCB_currentIndexChanged(int index)
 {
-    generalSettings.speakerMode = index;
-    emit modified();
+  generalSettings.speakerMode = index;
+  emit modified();
 }
 
 
 void GeneralSetupPanel::on_splashScreenChkB_stateChanged(int )
 {
-    generalSettings.splashMode = ui->splashScreenChkB->isChecked() ? 0 : 1;
-    emit modified();
+  generalSettings.splashMode = ui->splashScreenChkB->isChecked() ? 0 : 1;
+  emit modified();
 }
 
 void GeneralSetupPanel::on_splashScreenDuration_currentIndexChanged(int index)
 {
-    generalSettings.splashDuration = 3-index;
-    emit modified();
+  generalSettings.splashDuration = 3-index;
+  emit modified();
 }
 
 
 void GeneralSetupPanel::on_beepVolume_SL_valueChanged()
 {
-    generalSettings.beepVolume=ui->beepVolume_SL->value();
-    emit modified();
+  generalSettings.beepVolume=ui->beepVolume_SL->value();
+  emit modified();
 }
 
 void GeneralSetupPanel::on_wavVolume_SL_valueChanged()
 {
-    generalSettings.wavVolume=ui->wavVolume_SL->value();
-    emit modified();
+  generalSettings.wavVolume=ui->wavVolume_SL->value();
+  emit modified();
 }
 
 void GeneralSetupPanel::on_varioVolume_SL_valueChanged()
 {
-    generalSettings.varioVolume=ui->varioVolume_SL->value();
-    emit modified();
+  generalSettings.varioVolume=ui->varioVolume_SL->value();
+  emit modified();
 }
 
 void GeneralSetupPanel::on_bgVolume_SL_valueChanged()
 {
-    generalSettings.backgroundVolume=ui->bgVolume_SL->value();
-    emit modified();
+  generalSettings.backgroundVolume=ui->bgVolume_SL->value();
+  emit modified();
 }
 
 void GeneralSetupPanel::on_varioP0_SB_editingFinished()