diff --git a/variants/t114/platformio.ini b/variants/t114/platformio.ini
index d347688a..48dac6d4 100644
--- a/variants/t114/platformio.ini
+++ b/variants/t114/platformio.ini
@@ -15,6 +15,7 @@ board = heltec_t114
 board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52840_t114.build_flags}
   -I variants/t114
+  -I src/helpers/ui
   -DHELTEC_T114
   -D P_LORA_TX_LED=35
   -D RADIO_CLASS=CustomSX1262
@@ -22,13 +23,19 @@ build_flags = ${nrf52840_t114.build_flags}
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
+  -D ST7789
+  -D DISPLAY_CLASS=ST7789Display
 build_src_filter = ${nrf52840_t114.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/nrf52/T114Board.cpp>
   +<../variants/t114>
+  +<helpers/ui/ST7789Display.cpp>
+  +<helpers/ui/OLEDDisplay.cpp>
+  +<helpers/ui/OLEDDisplayFonts.cpp>
 lib_deps =
   ${nrf52840_t114.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
+  adafruit/Adafruit GFX Library @ ^1.12.1
 debug_tool = jlink
 upload_protocol = nrfutil
 
@@ -64,9 +71,6 @@ build_flags =
 extends = Heltec_t114
 build_flags =
   ${Heltec_t114.build_flags}
-  -I src/helpers/ui
-  -D ST7789
-  -D DISPLAY_CLASS=ST7789Display
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
@@ -75,14 +79,9 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_t114.build_src_filter}
-  +<helpers/nrf52/T114Board.cpp>
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio>
-  +<helpers/ui/ST7789Display.cpp>
-  +<helpers/ui/OLEDDisplay.cpp>
-  +<helpers/ui/OLEDDisplayFonts.cpp>
 lib_deps =
-  adafruit/Adafruit GFX Library @ ^1.12.1
   ${Heltec_t114.lib_deps}
   densaugeo/base64 @ ~1.4.0