diff --git a/lib/lib_basic/LinkedList-1.2.3/LICENSE.txt b/lib/default/LinkedList-1.2.3/LICENSE.txt
similarity index 100%
rename from lib/lib_basic/LinkedList-1.2.3/LICENSE.txt
rename to lib/default/LinkedList-1.2.3/LICENSE.txt
diff --git a/lib/lib_basic/LinkedList-1.2.3/LinkedList.h b/lib/default/LinkedList-1.2.3/LinkedList.h
similarity index 100%
rename from lib/lib_basic/LinkedList-1.2.3/LinkedList.h
rename to lib/default/LinkedList-1.2.3/LinkedList.h
diff --git a/lib/lib_basic/LinkedList-1.2.3/README.md b/lib/default/LinkedList-1.2.3/README.md
similarity index 100%
rename from lib/lib_basic/LinkedList-1.2.3/README.md
rename to lib/default/LinkedList-1.2.3/README.md
diff --git a/lib/lib_basic/LinkedList-1.2.3/examples/ClassList/ClassList.pde b/lib/default/LinkedList-1.2.3/examples/ClassList/ClassList.pde
similarity index 100%
rename from lib/lib_basic/LinkedList-1.2.3/examples/ClassList/ClassList.pde
rename to lib/default/LinkedList-1.2.3/examples/ClassList/ClassList.pde
diff --git a/lib/lib_basic/LinkedList-1.2.3/examples/SimpleIntegerList/SimpleIntegerList.pde b/lib/default/LinkedList-1.2.3/examples/SimpleIntegerList/SimpleIntegerList.pde
similarity index 100%
rename from lib/lib_basic/LinkedList-1.2.3/examples/SimpleIntegerList/SimpleIntegerList.pde
rename to lib/default/LinkedList-1.2.3/examples/SimpleIntegerList/SimpleIntegerList.pde
diff --git a/lib/lib_basic/LinkedList-1.2.3/keywords.txt b/lib/default/LinkedList-1.2.3/keywords.txt
similarity index 100%
rename from lib/lib_basic/LinkedList-1.2.3/keywords.txt
rename to lib/default/LinkedList-1.2.3/keywords.txt
diff --git a/lib/lib_basic/LinkedList-1.2.3/library.json b/lib/default/LinkedList-1.2.3/library.json
similarity index 100%
rename from lib/lib_basic/LinkedList-1.2.3/library.json
rename to lib/default/LinkedList-1.2.3/library.json
diff --git a/lib/lib_basic/LinkedList-1.2.3/library.properties b/lib/default/LinkedList-1.2.3/library.properties
similarity index 100%
rename from lib/lib_basic/LinkedList-1.2.3/library.properties
rename to lib/default/LinkedList-1.2.3/library.properties
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 400e1f3cf..bbac82a7c 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -59,7 +59,7 @@ build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
 extends                 = env:tasmota32_base
 board                   = esp32-cam
 build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_WEBCAM
-lib_extra_dirs          = lib/libesp32, lib/lib_basic
+lib_extra_dirs          = lib/libesp32
 
 [env:tasmota32-odroidgo]
 extends                 = env:tasmota32_base
diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index 383621de6..04f9e47b7 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -34,10 +34,24 @@
 
 #define USE_WEBCAM
 #define ENABLE_RTSPSERVER
-#define USE_SDCARD
 #define USE_SPI
+#define USE_SDCARD
+
+#undef USE_I2C
+#undef USE_HOME_ASSISTANT
+#undef USE_COUNTER
+#undef USE_IR_REMOTE
+#undef USE_AC_ZERO_CROSS_DIMMER
+#undef USE_PWM_DIMMER
+#undef USE_TUYA_MCU
+#undef USE_EMULATION_HUE
+#undef USE_EMULATION_WEMO
+#undef USE_ARILUX_RF
+#undef USE_DS18x20
+#undef USE_WS2812
+#undef USE_ENERGY_SENSOR
 #undef USE_BERRY                                 // Disable Berry scripting language
-#undef  USE_MI_ESP32                             // (ESP32 only) Disable support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
+#undef USE_MI_ESP32                             // (ESP32 only) Disable support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
 #endif  // FIRMWARE_WEBCAM
 
 /*********************************************************************************************\