diff --git a/examples/simple_repeater/wifimqtt.cpp b/examples/simple_repeater/wifimqtt.cpp
index 0b8906f9..96827b46 100644
--- a/examples/simple_repeater/wifimqtt.cpp
+++ b/examples/simple_repeater/wifimqtt.cpp
@@ -281,7 +281,6 @@ bool WiFiMQTT::connectWiFi() {
       }
       time_t now = time(nullptr);
       if (now > 1700000000) {
-        extern AutoDiscoverRTCClock rtc_clock;
         rtc_clock.setCurrentTime((uint32_t)now);
         Serial.printf(" OK (%lu)\n", (unsigned long)now);
       } else {
diff --git a/platformio.ini b/platformio.ini
index eff84dab..4e3954ca 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -57,7 +57,7 @@ build_src_filter =
 extends = arduino_base
 platform = platformio/espressif32@6.11.0
 monitor_filters = esp32_exception_decoder, clock_sync
-extra_scripts = merge-bin.py
+extra_scripts = post:merge_firmware.py
 build_flags = ${arduino_base.build_flags}
   -D ESP32_PLATFORM
 ;  -D ESP32_CPU_FREQ=80          ; change it to your need
diff --git a/variants/lilygo_t5s3_epaper_pro/platformio.ini b/variants/lilygo_t5s3_epaper_pro/platformio.ini
index 28cb7497..fafcc81e 100644
--- a/variants/lilygo_t5s3_epaper_pro/platformio.ini
+++ b/variants/lilygo_t5s3_epaper_pro/platformio.ini
@@ -185,6 +185,7 @@ build_src_filter = ${LilyGo_T5S3_EPaper_Pro.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${LilyGo_T5S3_EPaper_Pro.build_flags}
+  -I examples/companion_radio/ui-new
   -D FIRMWARE_VERSION='"Meck T5S3 WiFi Rptr v0.1"'
   -D FIRMWARE_BUILD_DATE='"5 Apr 2026"'
   -D DISPLAY_CLASS=FastEPDDisplay
diff --git a/variants/lilygo_tdeck_pro/platformio.ini b/variants/lilygo_tdeck_pro/platformio.ini
index fbbb4ac8..8d577162 100644
--- a/variants/lilygo_tdeck_pro/platformio.ini
+++ b/variants/lilygo_tdeck_pro/platformio.ini
@@ -334,6 +334,7 @@ extends = LilyGo_TDeck_Pro
 build_flags =
   ${LilyGo_TDeck_Pro.build_flags}
   -I examples/simple_repeater
+  -I examples/companion_radio/ui-new
   -D ADMIN_PASSWORD='"admin"'
   -D HAS_4G_MODEM=1
   -D DISABLE_WIFI_OTA=1
@@ -393,6 +394,7 @@ build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${LilyGo_TDeck_Pro.build_flags}
+  -I examples/companion_radio/ui-new
   -D FIRMWARE_VERSION='"Meck WiFi Rptr v0.3"'
   -D FIRMWARE_BUILD_DATE='"5 April 2026"'
   -D MAX_NEIGHBOURS=50