diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp
index 53bfa9598..714f66038 100644
--- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp
+++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp
@@ -193,36 +193,36 @@ void ConfigCustomWidget::registerWidgets(ConfigTaskWidget &parent)
 
 void ConfigCustomWidget::resetActuators(GUIConfigDataUnion *configData)
 {
-    configData->custom.Motor1    = 0;
-    configData->custom.Motor2    = 0;
-    configData->custom.Motor3    = 0;
-    configData->custom.Motor4    = 0;
-    configData->custom.Motor5    = 0;
-    configData->custom.Motor6    = 0;
-    configData->custom.Motor7    = 0;
-    configData->custom.Motor8    = 0;
-    configData->custom.RevMotor1 = 0;
-    configData->custom.RevMotor2 = 0;
-    configData->custom.RevMotor3 = 0;
-    configData->custom.RevMotor4 = 0;
-    configData->custom.RevMotor5 = 0;
-    configData->custom.RevMotor6 = 0;
-    configData->custom.RevMotor7 = 0;
-    configData->custom.RevMotor8 = 0;
-    configData->custom.Servo1    = 0;
-    configData->custom.Servo2    = 0;
-    configData->custom.Servo3    = 0;
-    configData->custom.Servo4    = 0;
-    configData->custom.Servo5    = 0;
-    configData->custom.Servo6    = 0;
-    configData->custom.Servo7    = 0;
-    configData->custom.Servo8    = 0;
-    configData->custom.Accessory0  = 0;
-    configData->custom.Accessory1  = 0;
-    configData->custom.Accessory2  = 0;
-    configData->custom.Accessory3  = 0;
-    configData->custom.Accessory4  = 0;
-    configData->custom.Accessory5  = 0;
+    configData->custom.Motor1     = 0;
+    configData->custom.Motor2     = 0;
+    configData->custom.Motor3     = 0;
+    configData->custom.Motor4     = 0;
+    configData->custom.Motor5     = 0;
+    configData->custom.Motor6     = 0;
+    configData->custom.Motor7     = 0;
+    configData->custom.Motor8     = 0;
+    configData->custom.RevMotor1  = 0;
+    configData->custom.RevMotor2  = 0;
+    configData->custom.RevMotor3  = 0;
+    configData->custom.RevMotor4  = 0;
+    configData->custom.RevMotor5  = 0;
+    configData->custom.RevMotor6  = 0;
+    configData->custom.RevMotor7  = 0;
+    configData->custom.RevMotor8  = 0;
+    configData->custom.Servo1     = 0;
+    configData->custom.Servo2     = 0;
+    configData->custom.Servo3     = 0;
+    configData->custom.Servo4     = 0;
+    configData->custom.Servo5     = 0;
+    configData->custom.Servo6     = 0;
+    configData->custom.Servo7     = 0;
+    configData->custom.Servo8     = 0;
+    configData->custom.Accessory0 = 0;
+    configData->custom.Accessory1 = 0;
+    configData->custom.Accessory2 = 0;
+    configData->custom.Accessory3 = 0;
+    configData->custom.Accessory4 = 0;
+    configData->custom.Accessory5 = 0;
 }
 
 /**
diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
index 351cfc6dd..78a2b6b9d 100644
--- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
+++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
@@ -892,7 +892,7 @@ void ConfigMultiRotorWidget::setupQuadMotor(int channel, double pitch, double ro
 void ConfigMultiRotorWidget::setupRcOutputs(QList<QString> rcOutputList)
 {
     QList<QComboBox *> rcList;
-    rcList << m_aircraft->rcOutputChannelBox1 << m_aircraft->rcOutputChannelBox2 
+    rcList << m_aircraft->rcOutputChannelBox1 << m_aircraft->rcOutputChannelBox2
            << m_aircraft->rcOutputChannelBox3 << m_aircraft->rcOutputChannelBox4;
 
     GUIConfigDataUnion configData = getConfigData();
diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h b/ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h
index 49900dc49..f4a9765ac 100644
--- a/ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h
+++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.h
@@ -107,37 +107,37 @@ typedef struct {
 } __attribute__((packed))  groundGUISettingsStruct;
 
 typedef struct {
-    uint    Motor1 : 4;
-    uint    Motor2 : 4;
-    uint    Motor3 : 4;
-    uint    Motor4 : 4;
-    uint    Motor5 : 4;
-    uint    Motor6 : 4;
-    uint    Motor7 : 4;
-    uint    Motor8 : 4;  // 32 bits
-    uint    Servo1 : 4;
-    uint    Servo2 : 4;
-    uint    Servo3 : 4;
-    uint    Servo4 : 4;
-    uint    Servo5 : 4;
-    uint    Servo6 : 4;
-    uint    Servo7 : 4;
-    uint    Servo8 : 4;  // 64 bits
-    uint    RevMotor1 : 4;
-    uint    RevMotor2 : 4;
-    uint    RevMotor3 : 4;
-    uint    RevMotor4 : 4;
-    uint    RevMotor5 : 4;
-    uint    RevMotor6 : 4;
-    uint    RevMotor7 : 4;
-    uint    RevMotor8 : 4;  // 96 bits
-    uint    Accessory0 : 4;
-    uint    Accessory1 : 4;
-    uint    Accessory2 : 4;
-    uint    Accessory3 : 4;
-    uint    Accessory4 : 4;
-    uint    Accessory5 : 4;
-    uint    padding : 8; // 128 bits
+    uint Motor1 : 4;
+    uint Motor2 : 4;
+    uint Motor3 : 4;
+    uint Motor4 : 4;
+    uint Motor5 : 4;
+    uint Motor6 : 4;
+    uint Motor7 : 4;
+    uint Motor8 : 4; // 32 bits
+    uint Servo1 : 4;
+    uint Servo2 : 4;
+    uint Servo3 : 4;
+    uint Servo4 : 4;
+    uint Servo5 : 4;
+    uint Servo6 : 4;
+    uint Servo7 : 4;
+    uint Servo8 : 4; // 64 bits
+    uint RevMotor1 : 4;
+    uint RevMotor2 : 4;
+    uint RevMotor3 : 4;
+    uint RevMotor4 : 4;
+    uint RevMotor5 : 4;
+    uint RevMotor6 : 4;
+    uint RevMotor7 : 4;
+    uint RevMotor8 : 4; // 96 bits
+    uint Accessory0 : 4;
+    uint Accessory1 : 4;
+    uint Accessory2 : 4;
+    uint Accessory3 : 4;
+    uint Accessory4 : 4;
+    uint Accessory5 : 4;
+    uint padding : 8; // 128 bits
 } __attribute__((packed))  customGUISettingsStruct;
 
 
diff --git a/ground/gcs/src/plugins/config/configinputwidget.h b/ground/gcs/src/plugins/config/configinputwidget.h
index 46d0350e5..097ebd96f 100644
--- a/ground/gcs/src/plugins/config/configinputwidget.h
+++ b/ground/gcs/src/plugins/config/configinputwidget.h
@@ -62,7 +62,7 @@ public:
     ~ConfigInputWidget();
     enum wizardSteps { wizardWelcome, wizardChooseMode, wizardChooseType, wizardIdentifySticks, wizardIdentifyCenter, wizardIdentifyLimits, wizardIdentifyInverted, wizardFinish, wizardNone };
     enum txMode { mode1, mode2, mode3, mode4 };
-    enum txMovements { moveLeftVerticalStick, moveRightVerticalStick, moveLeftHorizontalStick, moveRightHorizontalStick, moveAccess0, moveAccess1, moveAccess2, moveAccess3,moveFlightMode, centerAll, moveAll, nothing };
+    enum txMovements { moveLeftVerticalStick, moveRightVerticalStick, moveLeftHorizontalStick, moveRightHorizontalStick, moveAccess0, moveAccess1, moveAccess2, moveAccess3, moveFlightMode, centerAll, moveAll, nothing };
     enum txMovementType { vertical, horizontal, jump, mix };
     enum txType { acro, heli, ground };
     void startInputWizard()