diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index 8ff6624144..ee3647d239 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -19,9 +19,9 @@
 
 #define USBD_PRODUCT_STRING "OmnibusF7"
 
-#define LED0   PE0
+#define LED0                    PE0
 
-#define BEEPER   PD15
+#define BEEPER                  PD15
 #define BEEPER_INVERTED
 
 #define ACC
@@ -32,8 +32,6 @@
 #define USE_ACC_SPI_MPU6500
 #define USE_GYRO_MPU6500
 #define USE_GYRO_SPI_MPU6500
-//#define ACC_MPU6500_ALIGN       CW0_DEG
-//#define GYRO_MPU6500_ALIGN      CW0_DEG
 #define MPU6500_CS_PIN          SPI1_NSS_PIN
 #define MPU6500_SPI_INSTANCE    SPI1
 //#define MPU_INT_EXTI            PE8
@@ -43,8 +41,6 @@
 #define USE_ACC_SPI_MPU6000
 #define USE_GYRO_MPU6000
 #define USE_GYRO_SPI_MPU6000
-//#define ACC_MPU6000_ALIGN       CW0_DEG
-//#define GYRO_MPU6000_ALIGN      CW0_DEG
 #define MPU6000_CS_PIN          SPI3_NSS_PIN
 #define MPU6000_SPI_INSTANCE    SPI3
 //#define MPU_INT_EXTI            PD0
@@ -60,11 +56,11 @@
 #define USABLE_TIMER_CHANNEL_COUNT 16
 
 #define USE_VCP
-#define VBUS_SENSING_PIN PC4
+#define VBUS_SENSING_PIN        PC4
 
 #define USE_UART1
-#define UART1_RX_PIN PA10
-#define UART1_TX_PIN PA9
+#define UART1_RX_PIN            PA10
+#define UART1_TX_PIN            PA9
 
 //#define AVOID_UART2_FOR_PWM_PPM
 //#define USE_UART2
@@ -72,15 +68,15 @@
 //#define UART2_RX_PIN PA3
 
 // Assigned to shared output I2C2
-//#define USE_UART3
-//#define UART3_RX_PIN PB10
-//#define UART3_TX_PIN PB11
+#define USE_UART3
+#define UART3_RX_PIN            PB11
+#define UART3_TX_PIN            PB10
 
 #define USE_UART6
-#define UART6_RX_PIN PC7
-#define UART6_TX_PIN PC6
+#define UART6_RX_PIN            PC7
+#define UART6_TX_PIN            PC6
 
-#define SERIAL_PORT_COUNT 3 //VCP, USART1, USART6
+#define SERIAL_PORT_COUNT 4
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1
@@ -137,8 +133,8 @@
 #define SDCARD_DMA_CHANNEL                  DMA_CHANNEL_4
 
 #define USE_I2C
-//#define USE_I2C2
-//#define I2C_DEVICE (I2CDEV_2)
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE (I2CDEV_2)
 
 #define BARO
 #define USE_BARO_BMP280
@@ -152,9 +148,9 @@
 #define BOARD_HAS_VOLTAGE_SENSOR
 
 #define USE_ADC
-#define CURRENT_METER_ADC_PIN       PC2
-#define VBAT_ADC_PIN                PC3
-#define RSSI_ADC_GPIO_PIN           PC5
+#define CURRENT_METER_ADC_PIN   PC2
+#define VBAT_ADC_PIN            PC3
+#define RSSI_ADC_GPIO_PIN       PC5
 
 #define LED_STRIP