diff --git a/lib/lib_display/UDisplay/spi_register.h b/lib/lib_display/UDisplay/include/spi_register.h
similarity index 100%
rename from lib/lib_display/UDisplay/spi_register.h
rename to lib/lib_display/UDisplay/include/spi_register.h
diff --git a/lib/lib_display/UDisplay/uDisplay.h b/lib/lib_display/UDisplay/include/uDisplay.h
similarity index 99%
rename from lib/lib_display/UDisplay/uDisplay.h
rename to lib/lib_display/UDisplay/include/uDisplay.h
index cd7e2d55f..2035bac08 100644
--- a/lib/lib_display/UDisplay/uDisplay.h
+++ b/lib/lib_display/UDisplay/include/uDisplay.h
@@ -5,6 +5,7 @@
 #include <renderer.h>
 #include <Wire.h>
 #include <SPI.h>
+#include "uDisplay_config.h"
 
 #ifdef ESP32
 #if __has_include("soc/soc_caps.h")
diff --git a/lib/lib_display/UDisplay/uDisplay_DSI_panel.h b/lib/lib_display/UDisplay/include/uDisplay_DSI_panel.h
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_DSI_panel.h
rename to lib/lib_display/UDisplay/include/uDisplay_DSI_panel.h
diff --git a/lib/lib_display/UDisplay/uDisplay_EPD_panel.h b/lib/lib_display/UDisplay/include/uDisplay_EPD_panel.h
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_EPD_panel.h
rename to lib/lib_display/UDisplay/include/uDisplay_EPD_panel.h
diff --git a/lib/lib_display/UDisplay/uDisplay_I2C_panel.h b/lib/lib_display/UDisplay/include/uDisplay_I2C_panel.h
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_I2C_panel.h
rename to lib/lib_display/UDisplay/include/uDisplay_I2C_panel.h
diff --git a/lib/lib_display/UDisplay/uDisplay_I80_panel.h b/lib/lib_display/UDisplay/include/uDisplay_I80_panel.h
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_I80_panel.h
rename to lib/lib_display/UDisplay/include/uDisplay_I80_panel.h
diff --git a/lib/lib_display/UDisplay/uDisplay_RGB_panel.h b/lib/lib_display/UDisplay/include/uDisplay_RGB_panel.h
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_RGB_panel.h
rename to lib/lib_display/UDisplay/include/uDisplay_RGB_panel.h
diff --git a/lib/lib_display/UDisplay/uDisplay_SPI_controller.h b/lib/lib_display/UDisplay/include/uDisplay_SPI_controller.h
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_SPI_controller.h
rename to lib/lib_display/UDisplay/include/uDisplay_SPI_controller.h
diff --git a/lib/lib_display/UDisplay/uDisplay_SPI_panel.h b/lib/lib_display/UDisplay/include/uDisplay_SPI_panel.h
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_SPI_panel.h
rename to lib/lib_display/UDisplay/include/uDisplay_SPI_panel.h
diff --git a/lib/lib_display/UDisplay/uDisplay_config.h b/lib/lib_display/UDisplay/include/uDisplay_config.h
similarity index 86%
rename from lib/lib_display/UDisplay/uDisplay_config.h
rename to lib/lib_display/UDisplay/include/uDisplay_config.h
index e859862bf..d8210e387 100644
--- a/lib/lib_display/UDisplay/uDisplay_config.h
+++ b/lib/lib_display/UDisplay/include/uDisplay_config.h
@@ -1,7 +1,8 @@
 #ifndef UDISPLAY_CONFIG_H
 #define UDISPLAY_CONFIG_H
 
-// Logging system interface
+// Logging system interface - only declare if not building within Tasmota
+#ifndef _TASMOTA_H_
 enum LoggingLevels {
     LOG_LEVEL_NONE, 
     LOG_LEVEL_ERROR, 
@@ -10,12 +11,16 @@ enum LoggingLevels {
     LOG_LEVEL_DEBUG_MORE
 };
 
+// Function declarations - only if not building within Tasmota
 extern void AddLog(uint32_t loglevel, const char* formatP, ...);
-extern int32_t ESP_ResetInfoReason();
-extern float CharToFloat(const char *str);
-extern SPIClass *SpiBegin(uint32 bus);
-// extern int Cache_WriteBack_Addr(uint32_t addr, uint32_t size);
+extern uint32_t ESP_ResetInfoReason(void);
 extern bool UsePSRAM(void);
+extern float CharToFloat(const char *str);
+extern SPIClass *SpiBegin(uint32_t bus);
+#endif  // _TASMOTA_H_
+
+// Enable universal touch support
+#define USE_UNIVERSAL_TOUCH
 
 enum uColorType { uCOLOR_BW, uCOLOR_COLOR };
 
@@ -53,4 +58,4 @@ constexpr uint8_t EP_SEND_FRAME = 0x68;
 constexpr uint8_t EP_BREAK_RR_EQU = 0x69;
 constexpr uint8_t EP_BREAK_RR_NEQ = 0x6a;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/lib/lib_display/UDisplay/uDisplay_panel.h b/lib/lib_display/UDisplay/include/uDisplay_panel.h
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_panel.h
rename to lib/lib_display/UDisplay/include/uDisplay_panel.h
diff --git a/lib/lib_display/UDisplay/library.json b/lib/lib_display/UDisplay/library.json
index fec8baaa6..7691bdb45 100644
--- a/lib/lib_display/UDisplay/library.json
+++ b/lib/lib_display/UDisplay/library.json
@@ -1,17 +1,33 @@
 {
   "name": "universal display Library",
-  "version": "0.1",
-  "description": "This is a library a couple of displays.",
+  "version": "0.9.0",
+  "description": "General driver library for a couple of display types.",
   "license": "MIT",
   "homepage": "https://github.com/arendst/Tasmota",
-  "frameworks": "*",
-  "platforms": "*",
-  "authors":
+  "frameworks": "arduino",
+  "platforms": [
+        "espressif8266",
+        "espressif32"
+  ],
+  "authors": [
   {
     "name": "Gerhard Mutz",
     "maintainer": true
   },
+  {
+    "name": "Christian Baars",
+    "maintainer": true
+  }
+  ],
   "build": {
-    "flags": [ "-I$PROJECT_DIR/include" ]
+    "srcFilter": [
+        "+<*>",
+        "+<src/*>"
+    ],
+    "flags": [ 
+      "-I$PROJECT_DIR/include",
+      "-I$PROJECT_DIR/tasmota/include"
+    ],
+    "includeDir": "include"
   }
 }
\ No newline at end of file
diff --git a/lib/lib_display/UDisplay/library.properties b/lib/lib_display/UDisplay/library.properties
deleted file mode 100755
index c7dd23a3a..000000000
--- a/lib/lib_display/UDisplay/library.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-name=universal display Library
-version=0.1
-author=Gerhard Mutz
-maintainer=Gerhard Mutz
-sentence=This is a library a couple of displays.
-paragraph=This is a library a couple of displays.
-category=Display
-url=https://github.com/arendst/Tasmota
-architectures=*
diff --git a/lib/lib_display/UDisplay/uDisplay.cpp b/lib/lib_display/UDisplay/src/uDisplay.cpp
similarity index 99%
rename from lib/lib_display/UDisplay/uDisplay.cpp
rename to lib/lib_display/UDisplay/src/uDisplay.cpp
index dfe7287d7..a07018baa 100644
--- a/lib/lib_display/UDisplay/uDisplay.cpp
+++ b/lib/lib_display/UDisplay/src/uDisplay.cpp
@@ -1425,4 +1425,4 @@ void uDisplay::DisplayInit(int8_t p, int8_t size, int8_t rot, int8_t font) {
   }
 }
 
-#define WIRE_MAX 32
\ No newline at end of file
+#define WIRE_MAX 32
diff --git a/lib/lib_display/UDisplay/uDisplay_DSI_panel.cpp b/lib/lib_display/UDisplay/src/uDisplay_DSI_panel.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_DSI_panel.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_DSI_panel.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_EPD_panel.cpp b/lib/lib_display/UDisplay/src/uDisplay_EPD_panel.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_EPD_panel.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_EPD_panel.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_I2C_panel.cpp b/lib/lib_display/UDisplay/src/uDisplay_I2C_panel.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_I2C_panel.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_I2C_panel.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_I80_panel.cpp b/lib/lib_display/UDisplay/src/uDisplay_I80_panel.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_I80_panel.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_I80_panel.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_RGB_panel.cpp b/lib/lib_display/UDisplay/src/uDisplay_RGB_panel.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_RGB_panel.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_RGB_panel.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_SPI_controller.cpp b/lib/lib_display/UDisplay/src/uDisplay_SPI_controller.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_SPI_controller.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_SPI_controller.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_SPI_panel.cpp b/lib/lib_display/UDisplay/src/uDisplay_SPI_panel.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_SPI_panel.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_SPI_panel.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_colors.cpp b/lib/lib_display/UDisplay/src/uDisplay_colors.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_colors.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_colors.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_control.cpp b/lib/lib_display/UDisplay/src/uDisplay_control.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_control.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_control.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_graphics.cpp b/lib/lib_display/UDisplay/src/uDisplay_graphics.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_graphics.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_graphics.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_timing.cpp b/lib/lib_display/UDisplay/src/uDisplay_timing.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_timing.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_timing.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_touch.cpp b/lib/lib_display/UDisplay/src/uDisplay_touch.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_touch.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_touch.cpp
diff --git a/lib/lib_display/UDisplay/uDisplay_utils.cpp b/lib/lib_display/UDisplay/src/uDisplay_utils.cpp
similarity index 100%
rename from lib/lib_display/UDisplay/uDisplay_utils.cpp
rename to lib/lib_display/UDisplay/src/uDisplay_utils.cpp
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 96600225f..351b627e2 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -542,4 +542,3 @@ build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=uk_UA
 [env:tasmota32-VN]
 extends                 = env:tasmota32_base
 build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=vi_VN -DFIRMWARE_TASMOTA32 -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-VN.bin"'
-