diff --git a/include/esp32x_fixes.h b/include/esp32x_fixes.h
index 62a9c2824..a9f963d42 100644
--- a/include/esp32x_fixes.h
+++ b/include/esp32x_fixes.h
@@ -58,6 +58,11 @@
 #define FSPI_HOST   SPI2_HOST
 #define HSPI_HOST   SPI3_HOST
 #define VSPI_HOST   SPI3_HOST
+#ifndef REG_SPI_BASE
+#define REG_SPI_BASE(i)     (DR_REG_SPI1_BASE + (((i)>1) ? (((i)* 0x1000) + 0x20000) : (((~(i)) & 1)* 0x1000 )))
+// SPI_MOSI_DLEN_REG is not defined anymore in esp32s3, instead use SPI_MS_DLEN_REG
+#define SPI_MOSI_DLEN_REG(x) SPI_MS_DLEN_REG(x)
+#endif // REG_SPI_BASE
 
 #elif CONFIG_IDF_TARGET_ESP32C3
 #define SPI_HOST    SPI1_HOST
diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index c9eb7feee..fa10f2818 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -59,11 +59,19 @@ extends                 = env:tasmota32_base
 platform                = https://github.com/Jason2866/platform-espressif32.git#IDF44/ESP32-S3
 platform_packages       = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/621/framework-arduinoespressif32-v4.4_dev-a829191c37.tar.gz
 board                   = esp32s3
-build_flags             = ${env:tasmota32_base.build_flags}
+build_flags             = ${env:tasmota32_base.build_flags} -D FIRMWARE_TASMOTA32
 lib_extra_dirs          =
                           lib/lib_basic
                           lib/lib_ssl
+                          lib/lib_i2c
+                          lib/lib_rf
+                          lib/lib_div
+                          lib/lib_display
+                          lib/lib_audio
                           lib/libesp32
+                          lib/libesp32_lvgl
+                          lib/libesp32_div
+                          lib/libesp32_eink
 lib_ignore              =
                           TTGO TWatch Library
                           NimBLE-Arduino