diff --git a/src/main/drivers/io.h b/src/main/drivers/io.h
index 2326db028..5d3766ec3 100644
--- a/src/main/drivers/io.h
+++ b/src/main/drivers/io.h
@@ -58,7 +58,7 @@
 #define IOCFG_AF_PP_UP       IO_CONFIG(GPIO_MODE_AF_PP,     GPIO_SPEED_FREQ_LOW,  GPIO_PULLUP)
 #define IOCFG_AF_OD          IO_CONFIG(GPIO_MODE_AF_OD,     GPIO_SPEED_FREQ_LOW,  GPIO_NOPULL)
 #define IOCFG_IPD            IO_CONFIG(GPIO_MODE_INPUT,     GPIO_SPEED_FREQ_LOW,  GPIO_PULLDOWN)
-#define IOCFG_IPU            IO_CONFIG(GPIO_MODE_INPUT,  	GPIO_SPEED_FREQ_LOW,  GPIO_PULLUP)
+#define IOCFG_IPU            IO_CONFIG(GPIO_MODE_INPUT,     GPIO_SPEED_FREQ_LOW,  GPIO_PULLUP)
 #define IOCFG_IN_FLOATING    IO_CONFIG(GPIO_MODE_INPUT,     GPIO_SPEED_FREQ_LOW,  GPIO_NOPULL)
 #define IOCFG_IPU_25         IO_CONFIG(GPIO_MODE_INPUT,     GPIO_SPEED_FREQ_HIGH, GPIO_PULLUP)
 
diff --git a/src/main/drivers/max7456.c b/src/main/drivers/max7456.c
index 10cc07141..1c9edcbd2 100755
--- a/src/main/drivers/max7456.c
+++ b/src/main/drivers/max7456.c
@@ -279,10 +279,10 @@ void max7456Init(uint8_t video_system)
 //just fill with spaces with some tricks
 void max7456ClearScreen(void)
 {
-	uint16_t x;
-	uint32_t *p = (uint32_t*)&screenBuffer[0];
-	for (x = 0; x < VIDEO_BUFFER_CHARS_PAL/4; x++)
-		p[x] = 0x20202020;
+    uint16_t x;
+    uint32_t *p = (uint32_t*)&screenBuffer[0];
+    for (x = 0; x < VIDEO_BUFFER_CHARS_PAL/4; x++)
+        p[x] = 0x20202020;
 }
 
 uint8_t* max7456GetScreenBuffer(void) {
@@ -291,15 +291,15 @@ uint8_t* max7456GetScreenBuffer(void) {
 
 void max7456WriteChar(uint8_t x, uint8_t y, uint8_t c)
 {
-	screenBuffer[y*30+x] = c;
+    screenBuffer[y*30+x] = c;
 }
 
 void max7456Write(uint8_t x, uint8_t y, const char *buff)
 {
-	uint8_t i = 0;
-	for (i = 0; *(buff+i); i++)
-		if (x+i < 30) //do not write over screen
-			screenBuffer[y*30+x+i] = *(buff+i);
+    uint8_t i = 0;
+    for (i = 0; *(buff+i); i++)
+        if (x+i < 30) //do not write over screen
+            screenBuffer[y*30+x+i] = *(buff+i);
 }
 
 #ifdef MAX7456_DMA_CHANNEL_TX
diff --git a/src/main/drivers/system_stm32f7xx.c b/src/main/drivers/system_stm32f7xx.c
index a2acf4b5a..c8833dbf3 100644
--- a/src/main/drivers/system_stm32f7xx.c
+++ b/src/main/drivers/system_stm32f7xx.c
@@ -151,9 +151,9 @@ bool isMPUSoftReset(void)
 
 void systemInit(void)
 {
-	checkForBootLoaderRequest();
+    checkForBootLoaderRequest();
 
-	//SystemClock_Config();
+    //SystemClock_Config();
 
     // Configure NVIC preempt/priority groups
     //NVIC_PriorityGroupConfig(NVIC_PRIORITY_GROUPING);
diff --git a/src/main/fc/mw.c b/src/main/fc/mw.c
index 23baaea67..9a77edd6e 100644
--- a/src/main/fc/mw.c
+++ b/src/main/fc/mw.c
@@ -545,8 +545,8 @@ void processRx(uint32_t currentTime)
     if (ARMING_FLAG(ARMED)
         && feature(FEATURE_MOTOR_STOP)
         && !STATE(FIXED_WING)
-		&& !feature(FEATURE_3D)
-		&& !isAirmodeActive()
+        && !feature(FEATURE_3D)
+        && !isAirmodeActive()
     ) {
         if (isUsingSticksForArming()) {
             if (throttleStatus == THROTTLE_LOW) {
diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c
index e023eed8a..650df485a 100755
--- a/src/main/flight/mixer.c
+++ b/src/main/flight/mixer.c
@@ -256,8 +256,8 @@ void initEscEndpoints(void) {
         disarmMotorOutput = DSHOT_DISARM_COMMAND;
         minMotorOutputNormal = DSHOT_MIN_THROTTLE + motorConfig->digitalIdleOffset;
         maxMotorOutputNormal = DSHOT_MAX_THROTTLE;
-	    deadbandMotor3dHigh = DSHOT_3D_MIN_NEGATIVE; // TODO - Not working yet !! Mixer requires some throttle rescaling changes
-	    deadbandMotor3dLow = DSHOT_3D_MAX_POSITIVE;  // TODO - Not working yet !! Mixer requires some throttle rescaling changes
+        deadbandMotor3dHigh = DSHOT_3D_MIN_NEGATIVE; // TODO - Not working yet !! Mixer requires some throttle rescaling changes
+        deadbandMotor3dLow = DSHOT_3D_MAX_POSITIVE;  // TODO - Not working yet !! Mixer requires some throttle rescaling changes
     } else
 #endif
     {
@@ -376,9 +376,9 @@ void mixerResetDisarmedMotors(void)
 
 void writeMotors(void)
 {
-	for (uint8_t i = 0; i < motorCount; i++) {
+    for (uint8_t i = 0; i < motorCount; i++) {
         pwmWriteMotor(i, motor[i]);
-	}
+    }
 
     if (syncMotorOutputWithPidLoop) {
         pwmCompleteMotorUpdate(motorCount);
diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c
index 9bef7f9cf..18d96e9f1 100644
--- a/src/main/io/ledstrip.c
+++ b/src/main/io/ledstrip.c
@@ -1123,6 +1123,6 @@ static void ledStripDisable(void)
 {
     setStripColor(&HSV(BLACK));
     
-	ws2811UpdateStrip();
+    ws2811UpdateStrip();
 }
 #endif
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index 69a120a06..db6e953bb 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -22,7 +22,7 @@
 
 #define USBD_PRODUCT_STRING "Sparky 2.0"
 #ifdef OPBL
-	#define USBD_SERIALNUMBER_STRING "0x8020000"
+    #define USBD_SERIALNUMBER_STRING "0x8020000"
 #endif
 
 #define LED0                    PB5
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index 07d6236f2..b1d7dc599 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -29,7 +29,7 @@
 #define BEEPER                  PC9
 
 #define INVERTER                PB15
-#define INVERTER_USART 	        USART6
+#define INVERTER_USART          USART6
 
 
 // MPU6500 interrupt
@@ -97,7 +97,7 @@
 #define SPI1_NSS_PIN            PA4
 #define SPI1_SCK_PIN            PA5
 #define SPI1_MISO_PIN           PA6
-#define SPI1_MOSI_PIN 	        PA7
+#define SPI1_MOSI_PIN             PA7
 
 /*
 #define USE_SPI_DEVICE_2 //Free