diff --git a/lib/device-ui b/lib/device-ui
index 9f1fdf506..8ac671a87 160000
--- a/lib/device-ui
+++ b/lib/device-ui
@@ -1 +1 @@
-Subproject commit 9f1fdf5069cbba37323e97651fa7b97f29d89ac5
+Subproject commit 8ac671a871e991680a68ddc3f96527a8d227ddc6
diff --git a/src/main.cpp b/src/main.cpp
index dcb84d03a..f411427fc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -152,6 +152,8 @@ std::pair<uint8_t, TwoWire *> nodeTelemetrySensorsMap[_meshtastic_TelemetrySenso
 
 Router *router = NULL; // Users of router don't care what sort of subclass implements that API
 
+const char *firmware_version = optstr(APP_VERSION_SHORT);
+
 const char *getDeviceName()
 {
     uint8_t dmac[6];
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 9d970b726..883fafb00 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -33,4 +33,5 @@ build_src_filter = ${portduino_base.build_src_filter}
   -<graphics/TFTDisplay.cpp>
   +<../lib/device-ui/generated/ui_320x240>
   +<../lib/device-ui/resources>
+  +<../lib/device-ui/source>
   +<mesh/sharedMem/>
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
index c1157e78f..b1a5c0da9 100644
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -22,8 +22,9 @@ build_flags = ${esp32_base.build_flags} -fno-omit-frame-pointer
 ;	-D USE_DOUBLE_BUFFER
 	-I lib/device-ui/generated/ui_320x240
 	-I variants/t-deck
-build_src_filter = ${esp32_base.build_src_filter} +<mesh/sharedMem/>
+build_src_filter = ${esp32_base.build_src_filter}
   +<../lib/device-ui/generated/ui_320x240>
+  +<../lib/device-ui/source>
 lib_deps =
   ${esp32_base.lib_deps}
 	lovyan03/LovyanGFX@^1.1.12