diff --git a/src/main/config/config.c b/src/main/config/config.c
index 284c59097b..5bcd1e923b 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -268,8 +268,13 @@ void resetSensorAlignment(sensorAlignmentConfig_t *sensorAlignmentConfig)
 
 void resetEscAndServoConfig(escAndServoConfig_t *escAndServoConfig)
 {
+#ifdef BRUSHED_MOTORS
+    escAndServoConfig->minthrottle = 1000;
+    escAndServoConfig->maxthrottle = 2000;
+#else
     escAndServoConfig->minthrottle = 1150;
     escAndServoConfig->maxthrottle = 1850;
+#endif
     escAndServoConfig->mincommand = 1000;
     escAndServoConfig->servoCenterPulse = 1500;
     escAndServoConfig->escDesyncProtection = 0;
@@ -415,8 +420,6 @@ uint16_t getCurrentMinthrottle(void)
 // Default settings
 static void resetConf(void)
 {
-    int i;
-
     // Clear all configuration
     memset(&masterConfig, 0, sizeof(master_t));
     setProfile(0);
@@ -477,7 +480,11 @@ static void resetConf(void)
 
     resetTelemetryConfig(&masterConfig.telemetryConfig);
 
+#ifdef SERIALRX_PROVIDER
+    masterConfig.rxConfig.serialrx_provider = SERIALRX_PROVIDER;
+#else
     masterConfig.rxConfig.serialrx_provider = 0;
+#endif
     masterConfig.rxConfig.sbus_inversion = 1;
     masterConfig.rxConfig.spektrum_sat_bind = 0;
     masterConfig.rxConfig.spektrum_sat_bind_autoreset = 1;
@@ -487,7 +494,7 @@ static void resetConf(void)
     masterConfig.rxConfig.rx_min_usec = 885;          // any of first 4 channels below this value will trigger rx loss detection
     masterConfig.rxConfig.rx_max_usec = 2115;         // any of first 4 channels above this value will trigger rx loss detection
 
-    for (i = 0; i < MAX_SUPPORTED_RC_CHANNEL_COUNT; i++) {
+    for (int i = 0; i < MAX_SUPPORTED_RC_CHANNEL_COUNT; i++) {
         rxFailsafeChannelConfiguration_t *channelFailsafeConfiguration = &masterConfig.rxConfig.failsafe_channel_configurations[i];
         channelFailsafeConfiguration->mode = (i < NON_AUX_CHANNEL_COUNT) ? RX_FAILSAFE_MODE_AUTO : RX_FAILSAFE_MODE_HOLD;
         channelFailsafeConfiguration->step = (i == THROTTLE) ? CHANNEL_VALUE_TO_RXFAIL_STEP(masterConfig.rxConfig.rx_min_usec) : CHANNEL_VALUE_TO_RXFAIL_STEP(masterConfig.rxConfig.midrc);
@@ -549,8 +556,7 @@ static void resetConf(void)
 
     resetPidProfile(&currentProfile->pidProfile);
     
-    uint8_t rI;
-    for (rI = 0; rI<MAX_RATEPROFILES; rI++) {
+    for (int rI = 0; rI<MAX_RATEPROFILES; rI++) {
         resetControlRateConfig(&masterConfig.profile[0].controlRateProfile[rI]);
     }
     resetRollAndPitchTrims(&masterConfig.accelerometerTrims);
@@ -581,7 +587,7 @@ static void resetConf(void)
 
 #ifdef USE_SERVOS
     // servos
-    for (i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
+    for (int i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
         masterConfig.servoConf[i].min = DEFAULT_SERVO_MIN;
         masterConfig.servoConf[i].max = DEFAULT_SERVO_MAX;
         masterConfig.servoConf[i].middle = DEFAULT_SERVO_MIDDLE;
@@ -600,8 +606,9 @@ static void resetConf(void)
 #endif
 
     // custom mixer. clear by defaults.
-    for (i = 0; i < MAX_SUPPORTED_MOTORS; i++)
+    for (int i = 0; i < MAX_SUPPORTED_MOTORS; i++) {
         masterConfig.customMotorMixer[i].throttle = 0.0f;
+    }
 
 #ifdef LED_STRIP
     applyDefaultColors(masterConfig.colors, CONFIGURABLE_COLOR_COUNT);
@@ -650,7 +657,7 @@ static void resetConf(void)
 #if defined(TARGET_CONFIG)
     targetConfiguration(&masterConfig);
 #endif
-    
+
 #if defined(ALIENFLIGHT) 
     featureClear(FEATURE_ONESHOT125);
 #ifdef ALIENFLIGHTF1
@@ -661,11 +668,8 @@ static void resetConf(void)
 #ifdef ALIENFLIGHTF3
     masterConfig.mag_hardware = MAG_NONE;            // disabled by default
 #endif
-    masterConfig.rxConfig.serialrx_provider = SERIALRX_SPEKTRUM2048;
     masterConfig.rxConfig.spektrum_sat_bind = 5;
     masterConfig.rxConfig.spektrum_sat_bind_autoreset = 1;
-    masterConfig.escAndServoConfig.minthrottle = 1000;
-    masterConfig.escAndServoConfig.maxthrottle = 2000;
     masterConfig.motor_pwm_rate = 32000;
     masterConfig.failsafeConfig.failsafe_delay = 2;
     masterConfig.failsafeConfig.failsafe_off_delay = 0;
@@ -690,7 +694,7 @@ static void resetConf(void)
 #endif
 
     // copy first profile into remaining profile
-    for (i = 1; i < MAX_PROFILE_COUNT; i++) {
+    for (int i = 1; i < MAX_PROFILE_COUNT; i++) {
         memcpy(&masterConfig.profile[i], currentProfile, sizeof(profile_t));
     }
 
@@ -802,7 +806,7 @@ void activateConfig(void)
 void validateAndFixConfig(void)
 {
     if (!(featureConfigured(FEATURE_RX_PARALLEL_PWM) || featureConfigured(FEATURE_RX_PPM) || featureConfigured(FEATURE_RX_SERIAL) || featureConfigured(FEATURE_RX_MSP))) {
-        featureSet(FEATURE_RX_PARALLEL_PWM); // Consider changing the default to PPM
+        featureSet(DEFAULT_RX_FEATURE);
     }
 
     if (featureConfigured(FEATURE_RX_PPM)) {
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index ccef02d34d..a5d1b042f3 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -130,8 +130,9 @@
 #define BINDPLUG_PIN   PB12
 
 #define BRUSHED_MOTORS
-#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
-#define DEFAULT_FEATURES FEATURE_MOTOR_STOP
+#define DEFAULT_FEATURES        FEATURE_MOTOR_STOP
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
+#define SERIALRX_PROVIDER       SERIALRX_SPEKTRUM2048
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index 3bc3e20d29..d5122a486c 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -173,8 +173,9 @@
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
 #define BRUSHED_MOTORS
-#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
-#define DEFAULT_FEATURES (FEATURE_MOTOR_STOP | FEATURE_BLACKBOX)
+#define DEFAULT_FEATURES        (FEATURE_MOTOR_STOP | FEATURE_BLACKBOX)
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
+#define SERIALRX_PROVIDER       SERIALRX_SPEKTRUM2048
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index f849070b7d..9075271c1c 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -175,8 +175,8 @@
 #define SONAR_ECHO_PIN      PB1
 #define SONAR_TRIGGER_PIN   PB0
 
-#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
-#define DEFAULT_FEATURES FEATURE_BLACKBOX
+#define DEFAULT_FEATURES        FEATURE_BLACKBOX
+#define DEFAULT_RX_FEATURE      FEATURE_RX_PPM
 
 #define SPEKTRUM_BIND
 // USART3,
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index a6586c95cd..397206c9bc 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -19,10 +19,7 @@
 
 #define TARGET_BOARD_IDENTIFIER "FYF4" //Call it a revo for now so it connects to RFC for testing.
 #define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8)
-#define CONFIG_SERIALRX_PROVIDER SERIALRX_SBUS
 #define CONFIG_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
-#define CONFIG_FEATURE_RX_SERIAL
-#define CONFIG_FEATURE_ONESHOT125
 #define CONFIG_MSP_PORT 2
 #define CONFIG_RX_SERIAL_PORT 1
 
@@ -148,7 +145,9 @@
 #define RSSI_ADC_GPIO_PIN           PC2
 #define CURRENT_METER_ADC_PIN       PC3
 
-#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
+#define DEFAULT_FEATURES        (FEATURE_VBAT | FEATURE_BLACKBOX | FEATURE_ONESHOT125)
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
+#define SERIALRX_PROVIDER       SERIALRX_SBUS
 
 #define TARGET_IO_PORTA 0xffff
 #define TARGET_IO_PORTB 0xffff
diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h
index 538dc653b8..9095ef7013 100644
--- a/src/main/target/KISSFC/target.h
+++ b/src/main/target/KISSFC/target.h
@@ -79,8 +79,9 @@
 //#define CURRENT_METER_ADC_PIN       PA5
 //#define RSSI_ADC_PIN                PB2
 
-#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
-#define DEFAULT_FEATURES FEATURE_VBAT
+#define DEFAULT_FEATURES        FEATURE_VBAT
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
+#define SERIALRX_PROVIDER       SERIALRX_SBUS;
 
 #define SPEKTRUM_BIND
 #define BIND_PIN   PB4
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 95f531faf5..df73f8e4f2 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -167,22 +167,24 @@
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
-// alternative defaults for AlienFlight F1 target
 #ifdef ALIENFLIGHTF1
+// alternative defaults for AlienFlight F1 target
 #undef TARGET_BOARD_IDENTIFIER
 #define TARGET_BOARD_IDENTIFIER "AFF1" // AlienFlight F1.
-#undef BOARD_HAS_VOLTAGE_DIVIDER
-
-// alternative defaults for AlienFlight F1 target
 #define ALIENFLIGHT
 
+#undef BOARD_HAS_VOLTAGE_DIVIDER
+#undef USE_SERIAL_4WAY_BLHELI_INTERFACE
+
 #define BRUSHED_MOTORS
-#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP)
+#define DEFAULT_FEATURES        FEATURE_MOTOR_STOP
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
+#define SERIALRX_PROVIDER       SERIALRX_SPEKTRUM2048
 
 #define HARDWARE_BIND_PLUG
 // Hardware bind plug at PB5 (Pin 41)
-#define BINDPLUG_PIN   PB5
-#endif
+#define BINDPLUG_PIN            PB5
+#endif // ALIENFLIGHTF1
 
 // IO - assuming all IOs on 48pin package
 #define TARGET_IO_PORTA 0xffff
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index a4f44762dc..7b2a365a55 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -138,8 +138,8 @@
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 
-#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
-#define DEFAULT_FEATURES FEATURE_BLACKBOX
+#define DEFAULT_RX_FEATURE      FEATURE_RX_PPM
+#define DEFAULT_FEATURES        FEATURE_BLACKBOX
 
 #define SPEKTRUM_BIND
 // USART3,