diff --git a/flight/OpenPilot/UAVObjects/inc/systemsettings.h b/flight/OpenPilot/UAVObjects/inc/systemsettings.h
index 294da8eac..7b2b31ffd 100644
--- a/flight/OpenPilot/UAVObjects/inc/systemsettings.h
+++ b/flight/OpenPilot/UAVObjects/inc/systemsettings.h
@@ -78,7 +78,7 @@ typedef struct {
 // Field information
 // Field AirframeType information
 /* Enumeration options for field AirframeType */
-typedef enum { SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWING=0, SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWINGELEVON=1, SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWINGVTAIL=2, SYSTEMSETTINGS_AIRFRAMETYPE_VTOL=3, SYSTEMSETTINGS_AIRFRAMETYPE_HELICP=4, SYSTEMSETTINGS_AIRFRAMETYPE_QUADX=5, SYSTEMSETTINGS_AIRFRAMETYPE_QUADP=6, SYSTEMSETTINGS_AIRFRAMETYPE_HEXA=7, SYSTEMSETTINGS_AIRFRAMETYPE_OCTO=8, SYSTEMSETTINGS_AIRFRAMETYPE_CUSTOM=9 } SystemSettingsAirframeTypeOptions;
+typedef enum { SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWING=0, SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWINGELEVON=1, SYSTEMSETTINGS_AIRFRAMETYPE_FIXEDWINGVTAIL=2, SYSTEMSETTINGS_AIRFRAMETYPE_VTOL=3, SYSTEMSETTINGS_AIRFRAMETYPE_HELICP=4, SYSTEMSETTINGS_AIRFRAMETYPE_QUADX=5, SYSTEMSETTINGS_AIRFRAMETYPE_QUADP=6, SYSTEMSETTINGS_AIRFRAMETYPE_HEXA=7, SYSTEMSETTINGS_AIRFRAMETYPE_OCTO=8, SYSTEMSETTINGS_AIRFRAMETYPE_CUSTOM=9, SYSTEMSETTINGS_AIRFRAMETYPE_HEXAX=10, SYSTEMSETTINGS_AIRFRAMETYPE_OCTOV=11, SYSTEMSETTINGS_AIRFRAMETYPE_OCTOCOAXP=12, SYSTEMSETTINGS_AIRFRAMETYPE_OCTOCOAXX=13, SYSTEMSETTINGS_AIRFRAMETYPE_HEXACOAX=14, SYSTEMSETTINGS_AIRFRAMETYPE_TRI=15 } SystemSettingsAirframeTypeOptions;
 
 
 // Generic interface functions
diff --git a/ground/src/plugins/uavobjects/systemsettings.cpp b/ground/src/plugins/uavobjects/systemsettings.cpp
index 46adfe3e5..6e01c3ed7 100644
--- a/ground/src/plugins/uavobjects/systemsettings.cpp
+++ b/ground/src/plugins/uavobjects/systemsettings.cpp
@@ -55,6 +55,12 @@ SystemSettings::SystemSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
     AirframeTypeEnumOptions.append("Hexa");
     AirframeTypeEnumOptions.append("Octo");
     AirframeTypeEnumOptions.append("Custom");
+    AirframeTypeEnumOptions.append("HexaX");
+    AirframeTypeEnumOptions.append("OctoV");
+    AirframeTypeEnumOptions.append("OctoCoaxP");
+    AirframeTypeEnumOptions.append("OctoCoaxX");
+    AirframeTypeEnumOptions.append("HexaCoax");
+    AirframeTypeEnumOptions.append("Tri");
     fields.append( new UAVObjectField(QString("AirframeType"), QString(""), UAVObjectField::ENUM, AirframeTypeElemNames, AirframeTypeEnumOptions) );
 
     // Initialize object
diff --git a/ground/src/plugins/uavobjects/systemsettings.h b/ground/src/plugins/uavobjects/systemsettings.h
index 6b20e6ee6..0ae44dfcd 100644
--- a/ground/src/plugins/uavobjects/systemsettings.h
+++ b/ground/src/plugins/uavobjects/systemsettings.h
@@ -50,7 +50,7 @@ public:
     // Field information
     // Field AirframeType information
     /* Enumeration options for field AirframeType */
-    typedef enum { AIRFRAMETYPE_FIXEDWING=0, AIRFRAMETYPE_FIXEDWINGELEVON=1, AIRFRAMETYPE_FIXEDWINGVTAIL=2, AIRFRAMETYPE_VTOL=3, AIRFRAMETYPE_HELICP=4, AIRFRAMETYPE_QUADX=5, AIRFRAMETYPE_QUADP=6, AIRFRAMETYPE_HEXA=7, AIRFRAMETYPE_OCTO=8, AIRFRAMETYPE_CUSTOM=9 } AirframeTypeOptions;
+    typedef enum { AIRFRAMETYPE_FIXEDWING=0, AIRFRAMETYPE_FIXEDWINGELEVON=1, AIRFRAMETYPE_FIXEDWINGVTAIL=2, AIRFRAMETYPE_VTOL=3, AIRFRAMETYPE_HELICP=4, AIRFRAMETYPE_QUADX=5, AIRFRAMETYPE_QUADP=6, AIRFRAMETYPE_HEXA=7, AIRFRAMETYPE_OCTO=8, AIRFRAMETYPE_CUSTOM=9, AIRFRAMETYPE_HEXAX=10, AIRFRAMETYPE_OCTOV=11, AIRFRAMETYPE_OCTOCOAXP=12, AIRFRAMETYPE_OCTOCOAXX=13, AIRFRAMETYPE_HEXACOAX=14, AIRFRAMETYPE_TRI=15 } AirframeTypeOptions;
 
   
     // Constants
diff --git a/ground/src/plugins/uavobjects/systemsettings.py b/ground/src/plugins/uavobjects/systemsettings.py
index 430bb7be3..7d42c1c53 100644
--- a/ground/src/plugins/uavobjects/systemsettings.py
+++ b/ground/src/plugins/uavobjects/systemsettings.py
@@ -55,6 +55,12 @@ _fields = [ \
 			'7' : 'Hexa',
 			'8' : 'Octo',
 			'9' : 'Custom',
+			'10' : 'HexaX',
+			'11' : 'OctoV',
+			'12' : 'OctoCoaxP',
+			'13' : 'OctoCoaxX',
+			'14' : 'HexaCoax',
+			'15' : 'Tri',
 		}
 	),
 ]
diff --git a/ground/src/shared/uavobjectdefinition/systemsettings.xml b/ground/src/shared/uavobjectdefinition/systemsettings.xml
index 6b9c8f62a..165229c7c 100644
--- a/ground/src/shared/uavobjectdefinition/systemsettings.xml
+++ b/ground/src/shared/uavobjectdefinition/systemsettings.xml
@@ -1,7 +1,7 @@
 <xml>
     <object name="SystemSettings" singleinstance="true" settings="true">
         <description>Select airframe type.  Currently used by @ref ActuatorModule to choose mixing from @ref ActuatorDesired to @ref ActuatorCommand</description>
-        <field name="AirframeType" units="" type="enum" elements="1" options="FixedWing,FixedWingElevon,FixedWingVtail,VTOL,HeliCP,QuadX,QuadP,Hexa,Octo,Custom" defaultvalue="FixedWing"/>
+        <field name="AirframeType" units="" type="enum" elements="1" options="FixedWing,FixedWingElevon,FixedWingVtail,VTOL,HeliCP,QuadX,QuadP,Hexa,Octo,Custom,HexaX,OctoV,OctoCoaxP,OctoCoaxX,HexaCoax,Tri" defaultvalue="FixedWing"/>
         <access gcs="readwrite" flight="readwrite"/>
         <telemetrygcs acked="true" updatemode="onchange" period="0"/>
         <telemetryflight acked="true" updatemode="onchange" period="0"/>