diff --git a/firmware/config/stm32f1egt/efifeatures.h b/firmware/config/stm32f1egt/efifeatures.h
index 44936d9398..1848771499 100644
--- a/firmware/config/stm32f1egt/efifeatures.h
+++ b/firmware/config/stm32f1egt/efifeatures.h
@@ -12,6 +12,8 @@
 
 #define DL_OUTPUT_BUFFER 128
 
+#define EFI_USB_SERIAL TRUE
+
 #define hal_lld_get_counter_value()         DWT_CYCCNT
 
 #define EFI_USE_UART_FOR_CONSOLE TRUE
diff --git a/firmware/config/stm32f1egt/halconf.h b/firmware/config/stm32f1egt/halconf.h
index 027657ea17..f41266a11a 100644
--- a/firmware/config/stm32f1egt/halconf.h
+++ b/firmware/config/stm32f1egt/halconf.h
@@ -132,7 +132,7 @@
  * @brief   Enables the SERIAL over USB subsystem.
  */
 #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB          FALSE
+#define HAL_USE_SERIAL_USB          TRUE
 #endif
 
 /**
@@ -153,7 +153,7 @@
  * @brief   Enables the USB subsystem.
  */
 #if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                 FALSE
+#define HAL_USE_USB                 TRUE
 #endif
 
 /*===========================================================================*/
diff --git a/firmware/config/stm32f1egt/mcuconf.h b/firmware/config/stm32f1egt/mcuconf.h
index 66a9c4e1e9..0dc788ea08 100644
--- a/firmware/config/stm32f1egt/mcuconf.h
+++ b/firmware/config/stm32f1egt/mcuconf.h
@@ -192,7 +192,7 @@
 /*
  * USB driver system settings.
  */
-#define STM32_USB_USE_USB1                  FALSE
+#define STM32_USB_USE_USB1                  TRUE
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13
 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14
diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk
index b7cce99396..5c87f1f1ac 100644
--- a/firmware/hw_layer/hw_layer.mk
+++ b/firmware/hw_layer/hw_layer.mk
@@ -1,32 +1,32 @@
+HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/serial_over_usb/usbcfg.c \
+	$(PROJECT_DIR)/hw_layer/serial_over_usb/usbconsole.c
 
-HW_LAYER_EMS = $(PROJECT_DIR)/hw_layer/pin_repository.c \
+HW_LAYER_EGT_CPP = $(PROJECT_DIR)/hw_layer/can_hw.cpp \
+	$(PROJECT_DIR)/hw_layer/max31855.cpp
+
+HW_LAYER_EMS = $(HW_LAYER_EGT) \
+	$(PROJECT_DIR)/hw_layer/pin_repository.c \
 	$(PROJECT_DIR)/hw_layer/mcp3208.c \
 	$(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.c \
 	$(PROJECT_DIR)/hw_layer/microsecond_timer.c \
-	$(PROJECT_DIR)/hw_layer/serial_over_usb/usbcfg.c \
-	$(PROJECT_DIR)/hw_layer/serial_over_usb/usbconsole.c \
 	$(PROJECT_DIR)/hw_layer/flash.c \
 	$(PROJECT_DIR)/hw_layer/rtc_helper.c \
 	$(PROJECT_DIR)/hw_layer/mmc_card.c \
 	$(PROJECT_DIR)/hw_layer/neo6m.c \
 	$(PROJECT_DIR)/hw_layer/wave_analyzer_hw.c
 
-HW_LAYER_EMS_CPP = $(PROJECT_DIR)/hw_layer/hardware.cpp \
-	$(PROJECT_DIR)/hw_layer/can_hw.cpp \
+HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
+	$(PROJECT_DIR)/hw_layer/hardware.cpp \
  	$(PROJECT_DIR)/hw_layer/adc_inputs.cpp \
 	$(PROJECT_DIR)/hw_layer/board_test.cpp \
 	$(PROJECT_DIR)/hw_layer/pwm_generator.cpp \
 	$(PROJECT_DIR)/hw_layer/trigger_input.cpp \
 	$(PROJECT_DIR)/hw_layer/HIP9011.cpp \
 	$(PROJECT_DIR)/hw_layer/vehicle_speed.cpp \
-	$(PROJECT_DIR)/hw_layer/max31855.cpp \
 	$(PROJECT_DIR)/hw_layer/joystick.cpp \
 	$(PROJECT_DIR)/hw_layer/stepper.cpp \
 	$(PROJECT_DIR)/hw_layer/servo.cpp \
 	$(PROJECT_DIR)/hw_layer/io_pins.cpp \
 	$(PROJECT_DIR)/hw_layer/gpio_helper.cpp \
 	$(PROJECT_DIR)/hw_layer/stm32f4/mpu_util.cpp
-
-HW_LAYER_EGT_CPP = $(PROJECT_DIR)/hw_layer/can_hw.cpp \
-	$(PROJECT_DIR)/hw_layer/max31855.cpp
 	
\ No newline at end of file
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 19abe338bd..febe180b2c 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -264,5 +264,5 @@ int getRusEfiVersion(void) {
 		return 1; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE == 0)
 		return 1; // this is here to make the compiler happy about the unused array
-	return 20150105;
+	return 20150107;
 }