diff --git a/flight/CopterControl/System/pios_board.c b/flight/CopterControl/System/pios_board.c
index e80d4e51a..d89342787 100644
--- a/flight/CopterControl/System/pios_board.c
+++ b/flight/CopterControl/System/pios_board.c
@@ -1365,7 +1365,7 @@ void PIOS_Board_Init(void) {
 #endif	/* PIOS_INCLUDE_PWM */
 		break;
 	case HWSETTINGS_CC_RCVRPORT_PPM:
-	case HWSETTINGS_CC_RCVRPORT_PPMSERVO:
+	case HWSETTINGS_CC_RCVRPORT_PPMOUTPUTS:
 #if defined(PIOS_INCLUDE_PPM)
 		{
 			uint32_t pios_ppm_id;
@@ -1401,8 +1401,8 @@ void PIOS_Board_Init(void) {
 		case HWSETTINGS_CC_RCVRPORT_PPM:
 			PIOS_Servo_Init(&pios_servo_cfg);
 			break;
-		case HWSETTINGS_CC_RCVRPORT_PPMSERVO:
-		case HWSETTINGS_CC_RCVRPORT_SERVO:
+		case HWSETTINGS_CC_RCVRPORT_PPMOUTPUTS:
+		case HWSETTINGS_CC_RCVRPORT_OUTPUTS:
 			PIOS_Servo_Init(&pios_servo_rcvr_cfg);
 			break;
 	}
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml b/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
index 0a455e46b..444e1c47f 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
+++ b/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
@@ -989,13 +989,36 @@
       </default>
     </ImportExportGadget>
     <LineardialGadget>
+      <AHRS__PCT__20CPU>
+        <configInfo>
+          <locked>false</locked>
+          <version>0.0.0</version>
+        </configInfo>
+        <data>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
+          <decimalPlaces>0</decimalPlaces>
+          <factor>1</factor>
+          <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
+          <greenMax>50</greenMax>
+          <greenMin>0</greenMin>
+          <maxValue>100</maxValue>
+          <minValue>0</minValue>
+          <redMax>100</redMax>
+          <redMin>80</redMin>
+          <sourceDataObject>AhrsStatus</sourceDataObject>
+          <sourceObjectField>CPULoad</sourceObjectField>
+          <useOpenGLFlag>false</useOpenGLFlag>
+          <yellowMax>80</yellowMax>
+          <yellowMin>50</yellowMin>
+        </data>
+      </AHRS__PCT__20CPU>
       <Accel__PCT__20Horizontal__PCT__20X>
         <configInfo>
           <locked>false</locked>
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,8,-1,5,50,0,0,0,0,0</font>
@@ -1018,7 +1041,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,6,-1,5,50,0,0,0,0,0</font>
@@ -1041,7 +1064,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,8,-1,5,50,0,0,0,0,0</font>
@@ -1179,7 +1202,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>0</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1202,7 +1225,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1225,7 +1248,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1248,7 +1271,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1271,7 +1294,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1294,7 +1317,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1317,7 +1340,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
           <decimalPlaces>0</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1340,7 +1363,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-horizontal.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-horizontal.svg</dFile>
           <decimalPlaces>0</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1363,7 +1386,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1386,7 +1409,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
@@ -1409,7 +1432,7 @@
           <version>0.0.0</version>
         </configInfo>
         <data>
-          <dFile>%%DATAPATH%%dials/default/lineardial-vertical.svg</dFile>
+          <dFile>%%DATAPATH%%dials/deluxe/lineardial-vertical.svg</dFile>
           <decimalPlaces>2</decimalPlaces>
           <factor>1</factor>
           <font>Andale Mono,12,-1,5,75,0,0,0,0,0</font>
diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml
index 8641ace26..186437401 100644
--- a/shared/uavobjectdefinition/hwsettings.xml
+++ b/shared/uavobjectdefinition/hwsettings.xml
@@ -1,7 +1,7 @@
 <xml>
 	<object name="HwSettings" singleinstance="true" settings="true">
 		<description>Selection of optional hardware configurations.</description>
-		<field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PWM,PPM,PPM+Servo,Servo" defaultvalue="PWM"/>
+		<field name="CC_RcvrPort" units="function" type="enum" elements="1" options="Disabled,PWM,PPM,PPM+Outputs,Outputs" defaultvalue="PWM"/>
 		<field name="CC_MainPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,S.Bus,DSM2,DSMX (10bit),DSMX (11bit),ComAux" defaultvalue="Disabled"/>
 		<field name="CC_FlexiPort" units="function" type="enum" elements="1" options="Disabled,Telemetry,GPS,I2C,DSM2,DSMX (10bit),DSMX (11bit),ComAux" defaultvalue="Disabled"/>