diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp
index e2572613..eb69bf50 100644
--- a/examples/simple_room_server/main.cpp
+++ b/examples/simple_room_server/main.cpp
@@ -76,7 +76,7 @@
   #include <helpers/CustomSX1262Wrapper.h>
   #include <helpers/CustomSX1268Wrapper.h>
   static XiaoC3Board board;
-#elif defined(SEEED_XIAO_S3)
+#elif defined(SEEED_XIAO_S3) || defined(LILYGO_T3S3)
   #include <helpers/ESP32Board.h>
   #include <helpers/CustomSX1262Wrapper.h>
   static ESP32Board board;
diff --git a/platformio.ini b/platformio.ini
index 2b118561..fe008c58 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -130,7 +130,7 @@ build_flags =
 build_src_filter = ${esp32_base.build_src_filter}
 lib_deps =
   ${esp32_base.lib_deps}
-	adafruit/Adafruit SSD1306 @ ^2.5.13
+  adafruit/Adafruit SSD1306 @ ^2.5.13
 
 [env:Heltec_v3_repeater]
 extends = Heltec_lora32_v3
@@ -149,9 +149,6 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter}
 
 [env:Heltec_v3_room_server]
 extends = Heltec_lora32_v3
-build_src_filter = ${Heltec_lora32_v3.build_src_filter}
-  +<helpers/ui/*.cpp>
-  +<../examples/simple_room_server>
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
@@ -162,6 +159,9 @@ build_flags =
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_room_server>
 
 [env:Heltec_v3_terminal_chat]
 extends = Heltec_lora32_v3
@@ -522,7 +522,8 @@ build_flags =
 [LilyGo_T3S3_sx1262]
 extends = esp32_base
 board = t3_s3_v1_x
-build_flags = ${esp32_base.build_flags}
+build_flags =
+  ${esp32_base.build_flags}
   -D LILYGO_T3S3
   -D P_LORA_DIO_1=33
   -D P_LORA_NSS=7
@@ -533,6 +534,11 @@ build_flags = ${esp32_base.build_flags}
   -D P_LORA_MOSI=6
   -D P_LORA_TX_LED=37
   -D PIN_VBAT_READ=1
+  -D PIN_USER_BTN=0
+  -D PIN_BOARD_SDA=18
+  -D PIN_BOARD_SCL=17
+  -D P_LORA_TX_LED=37
+  -D PIN_OLED_RESET=21
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=130
@@ -540,20 +546,26 @@ build_flags = ${esp32_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_RX_BOOSTED_GAIN=1
+build_src_filter = ${esp32_base.build_src_filter}
+lib_deps =
+  ${esp32_base.lib_deps}
+  adafruit/Adafruit SSD1306 @ ^2.5.13
 
 ; === LilyGo T3S3 with SX1262 environments ===
 [env:LilyGo_T3S3_sx1262_Repeater]
 extends = LilyGo_T3S3_sx1262
-build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
-  +<../examples/simple_repeater/main.cpp>
 build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"T3S3-1262 Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
   -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_repeater>
 
 [env:LilyGo_T3S3_sx1262_terminal_chat]
 extends = LilyGo_T3S3_sx1262
@@ -569,10 +581,27 @@ lib_deps =
   ${LilyGo_T3S3_sx1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+[env:LilyGo_T3S3_sx1262_room_server]
+extends = LilyGo_T3S3_sx1262
+build_flags =
+  ${LilyGo_T3S3_sx1262.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D ADVERT_NAME='"T3S3-1262 Room"'
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_room_server>
+
 [env:LilyGo_T3S3_sx1262_companion_radio_usb]
 extends = LilyGo_T3S3_sx1262
 build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
@@ -580,7 +609,8 @@ build_flags =
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
-  +<../examples/companion_radio/main.cpp>
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
 lib_deps =
   ${LilyGo_T3S3_sx1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -589,6 +619,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1262
 build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
@@ -599,7 +630,8 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
   +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/main.cpp>
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
 lib_deps =
   ${LilyGo_T3S3_sx1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -979,7 +1011,7 @@ build_flags = ${nrf52840_base.build_flags}
 extends = faketec
 build_src_filter = ${faketec.build_src_filter} +<../examples/simple_repeater/main.cpp>
 build_flags =
-  ${faketec.build_flags} 
+  ${faketec.build_flags}
   -D ADVERT_NAME="\"Faketec Repeater\""
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
@@ -994,7 +1026,7 @@ lib_deps =
 extends = faketec
 build_src_filter = ${faketec.build_src_filter} +<../examples/simple_room_server/main.cpp>
 build_flags =
-  ${faketec.build_flags} 
+  ${faketec.build_flags}
   -D ADVERT_NAME="\"Test Room\""
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
@@ -1009,7 +1041,7 @@ lib_deps =
 [env:Faketec_terminal_chat]
 extends = faketec
 build_flags =
-  ${faketec.build_flags} 
+  ${faketec.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
@@ -1023,7 +1055,7 @@ lib_deps =
 [env:Faketec_companion_radio_usb]
 extends = faketec
 build_flags =
-  ${faketec.build_flags} 
+  ${faketec.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
@@ -1037,7 +1069,7 @@ lib_deps =
 [env:Faketec_companion_radio_ble]
 extends = faketec
 build_flags =
-  ${faketec.build_flags} 
+  ${faketec.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456