diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino
index 2f29992..fecf1b9 100644
--- a/Multiprotocol/Multi_Protos.ino
+++ b/Multiprotocol/Multi_Protos.ino
@@ -78,7 +78,7 @@ const char STR_SCANNER[]	="Scanner";
 const char STR_FRSKY_RX[]	="FrSkyRX";
 const char STR_AFHDS2A_RX[]	="FS2A_RX";
 const char STR_HOTT[]		="HoTT";
-const char STR_FX[]		="FX";
+const char STR_FX[]			="FX";
 const char STR_BAYANG_RX[]	="BayanRX";
 const char STR_PELIKAN[]	="Pelikan";
 const char STR_XK[]			="XK";
@@ -173,7 +173,7 @@ const char STR_SUBTYPE_KYOSHO[] =     "\x04""FHSS""Hype";
 const char STR_SUBTYPE_KYOSHO2[] =    "\x05""KT-17";
 const char STR_SUBTYPE_FUTABA[] =     "\x05""SFHSS";
 const char STR_SUBTYPE_JJRC345[] =    "\x08""JJRC345\0""SkyTmblr";
-const char STR_SUBTYPE_MOULKG[] =     "\x06""Analog""Digit\0";
+const char STR_SUBTYPE_MOULDKG[] =    "\x06""Analog""Digit\0";
 const char STR_SUBTYPE_KF606[] =      "\x06""KF606\0""MIG320""ZCZ50\0";
 const char STR_SUBTYPE_E129[] =       "\x04""E129""C186";
 const char STR_SUBTYPE_FX[] =         "\x04""816\0""620\0""9630";
@@ -397,7 +397,7 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_MLINK,      STR_MLINK,     NO_SUBTYPE,            0, OPTION_NONE,    1, 0, SW_CYRF,   MLINK_init,      MLINK_callback      },
 	#endif
 	#if defined(MOULDKG_NRF24L01_INO)
-		{PROTO_MOULDKG,    STR_MOULDKG,   STR_SUBTYPE_MOULKG,    2, OPTION_OPTION,  0, 0, SW_NRF,    MOULDKG_init,    MOULDKG_callback    },
+		{PROTO_MOULDKG,    STR_MOULDKG,   STR_SUBTYPE_MOULDKG,   2, OPTION_OPTION,  0, 0, SW_NRF,    MOULDKG_init,    MOULDKG_callback    },
 	#endif
 	#if defined(MT99XX_CCNRF_INO)
 		{PROTO_MT99XX,     STR_MT99XX,    STR_SUBTYPE_MT99,      8, OPTION_NONE,    0, 0, SW_NRF,    MT99XX_init,     MT99XX_callback     },
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 35d902e..16366cb 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -89,6 +89,7 @@ enum PROTOCOLS
 	PROTO_FX		= 58,	// =>NRF24L01
 	PROTO_BAYANG_RX	= 59,	// =>NRF24L01
 	PROTO_PELIKAN	= 60,	// =>A7105
+
 	PROTO_XK		= 62,	// =>NRF24L01
 	PROTO_XN297DUMP	= 63,	// =>NRF24L01
 	PROTO_FRSKYX2	= 64,	// =>CC2500
diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h
index 5748434..48b5725 100644
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -333,7 +333,6 @@
 	#undef	SGF22_NRF24L01_INO
 	#undef	SHENQI_NRF24L01_INO
 	#undef	SYMAX_NRF24L01_INO
-	#undef	TIGER_NRF24L01_INO
 	#undef	V2X2_NRF24L01_INO
 	#undef	V761_NRF24L01_INO
 	#undef	XERALL_NRF24L01_INO
@@ -369,6 +368,72 @@
 	#undef FRSKYR9_SX1276_INO
 #endif
 
+#ifdef MULTI_AIR
+	#undef	JOYSWAY_A7105_INO
+	//#undef	KYOSHO_A7105_INO
+	//#undef	PELIKAN_A7105_INO
+	#undef	LOSI_CYRF6936_INO		//Need DSM to be enabled
+	#undef	TRAXXAS_CYRF6936_INO
+	#undef	KYOSHO2_NRF24L01_INO
+	#undef	MOULDKG_NRF24L01_INO
+	#undef	SHENQI_NRF24L01_INO
+#endif
+
+#ifdef MULTI_SURFACE
+	#undef	BUGS_A7105_INO
+	#undef	HEIGHT_A7105_INO
+	#undef	HUBSAN_A7105_INO
+	#undef	E010R5_CYRF6936_INO
+	#undef	E01X_CYRF6936_INO
+	#undef	E129_CYRF6936_INO
+	#undef	J6PRO_CYRF6936_INO
+	#undef	SCORPIO_CYRF6936_INO
+	#undef	E016HV2_CC2500_INO
+	#undef	ESKY150V2_CC2500_INO
+	#undef	IKEAANSLUTA_CC2500_INO  // This is mostly a "for-fun" kind of a thing, not needed for most users
+	#undef	SKYARTEC_CC2500_INO
+	#undef	REDPINE_CC2500_INO
+	#undef	BAYANG_NRF24L01_INO
+	#undef	BAYANG_RX_NRF24L01_INO
+	#undef	BUGSMINI_NRF24L01_INO
+	#undef	CABELL_NRF24L01_INO
+	#undef	CFLIE_NRF24L01_INO
+	#undef	CG023_NRF24L01_INO
+	#undef	CX10_NRF24L01_INO
+	#undef	DM002_NRF24L01_INO
+	#undef	E016H_NRF24L01_INO
+	#undef	ESKY_NRF24L01_INO
+	#undef	ESKY150_NRF24L01_INO
+	#undef	FQ777_NRF24L01_INO
+	#undef	FX_NRF24L01_INO
+	#undef	FY326_NRF24L01_INO
+	#undef	GW008_NRF24L01_INO
+	#undef	HONTAI_NRF24L01_INO
+	#undef	H8_3D_NRF24L01_INO
+	#undef	JJRC345_NRF24L01_INO
+	#undef	KN_NRF24L01_INO
+	#undef	LOLI_NRF24L01_INO
+	#undef	NCC1701_NRF24L01_INO
+	#undef	POTENSIC_NRF24L01_INO
+	#undef	PROPEL_NRF24L01_INO
+	#undef	REALACC_NRF24L01_INO
+	#undef	SGF22_NRF24L01_INO
+	#undef	SYMAX_NRF24L01_INO
+	#undef	V761_NRF24L01_INO
+	#undef	XERALL_NRF24L01_INO
+	#undef	YD717_NRF24L01_INO
+	#undef	ZSX_NRF24L01_INO
+	#undef	GD00X_CCNRF_INO
+	#undef	KF606_CCNRF_INO
+	#undef	MJXQ_CCNRF_INO
+	#undef	MT99XX_CCNRF_INO
+	#undef	OMP_CCNRF_INO
+	#undef	Q303_CCNRF_INO
+	#undef	Q90C_CCNRF_INO
+	#undef	SLT_CCNRF_INO
+	#undef	V911S_CCNRF_INO
+#endif
+
 //OpenTX 2.3.x issue
 #if defined (FRSKYD_CC2500_INO) || defined(FRSKYV_CC2500_INO) || defined(FRSKYX_CC2500_INO)
 	#define	FRSKYX_CC2500_INO
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index e6394bc..4280888 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -188,7 +188,7 @@
 #define	DSM_CYRF6936_INO
 #define	DSM_RX_CYRF6936_INO
 #define	E010R5_CYRF6936_INO
-//#define	E01X_CYRF6936_INO
+#define	E01X_CYRF6936_INO
 #define	E129_CYRF6936_INO
 #define	J6PRO_CYRF6936_INO
 #define	LOSI_CYRF6936_INO		//Need DSM to be enabled
@@ -222,7 +222,7 @@
 #define	BAYANG_RX_NRF24L01_INO
 #define	BUGSMINI_NRF24L01_INO
 #define	CABELL_NRF24L01_INO
-//#define	CFLIE_NRF24L01_INO
+#define	CFLIE_NRF24L01_INO
 #define	CG023_NRF24L01_INO
 #define	CX10_NRF24L01_INO		//Include Q2X2 protocol
 #define	DM002_NRF24L01_INO
@@ -240,7 +240,7 @@
 #define	KN_NRF24L01_INO
 #define	KYOSHO2_NRF24L01_INO
 #define	LOLI_NRF24L01_INO
-//#define	MOULDKG_NRF24L01_INO
+#define	MOULDKG_NRF24L01_INO
 #define	NCC1701_NRF24L01_INO
 #define	POTENSIC_NRF24L01_INO
 #define	PROPEL_NRF24L01_INO