diff --git a/platformio.ini b/platformio.ini
index 33061b6..d639c85 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,24 +11,27 @@
 [platformio]
 default_envs = esp32
 
-[common_env_data]
-platform = espressif32@3.5
+[common]
+debug_flags = -D DEBUG=1 -D WLED_DEBUG -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
+build_flags =
+	-D MQTT_MAX_PACKET_SIZE=1024
+	-D SECURE_CLIENT=SECURE_CLIENT_BEARSSL
+	-D BEARSSL_SSL_BASIC
+	-D CONFIG_BT_NIMBLE_PINNED_TO_CORE=1
+	-D CONFIG_ASYNC_TCP_USE_WDT=0
+platform = espressif32@3.2
 framework = arduino
-lib_deps_external =
+lib_deps =
 	haimoz/SoftFilters@^0.1.0
 	marvinroger/AsyncMqttClient@^0.9.0
 	bblanchon/ArduinoJson@^6.17.3
 	https://github.com/ESPresense/ESP-WiFiSettings.git
-	h2zero/NimBLE-Arduino@^1.3.7
+	https://github.com/h2zero/NimBLE-Arduino.git#1.3.3
+	https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
 	bbx10/DNSServer@^1.1.0
-build_flags =
-	-D CONFIG_BT_NIMBLE_ROLE_BROADCASTER_DISABLED
-	-D CONFIG_NEWLIB_NANO_FORMAT
-	-D CONFIG_BT_NIMBLE_MAX_BONDS=0
-	-D CONFIG_BT_NIMBLE_PINNED_TO_CORE=1
 
 [common_sensors]
-lib_deps_external =
+lib_deps =
 	adafruit/Adafruit Unified Sensor @ ^1.1.4
 	beegee-tokyo/DHT sensor library for ESPx @ ^1.18
 	starmbi/hp_BH1750 @ ^1.0.0
@@ -36,50 +39,55 @@ lib_deps_external =
 	adafruit/Adafruit TSL2561@^1.1.0
 
 [env:esp32]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = esp32dev
-lib_deps = ${common_env_data.lib_deps_external}
+lib_deps = ${common.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 upload_speed = 1500000
 monitor_filters = esp32_exception_decoder
 build_flags =
 	-D FIRMWARE='"esp32"'
+	${common.build_flags}
 
-[env:esp32-debug]
+[env:esp32-wrover-debug]
 build_type=debug
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = esp-wrover-kit
 debug_tool = esp-prog
 upload_protocol = esp-prog
-lib_deps = ${common_env_data.lib_deps_external}
+lib_deps = ${common.lib_deps}
 board_build.partitions = partitions_singleapp.csv
-monitor_speed = 1500000
-upload_speed = 1500000
+monitor_port = /dev/cu.usbserial-*1
+monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
 build_flags =
+	-D VERBOSE
 	-D FAST_MONITOR
-	-D FIRMWARE='"esp32-debug"'
+	-D FIRMWARE='"esp32-wrover-debug"'
+	${common.build_flags}
+	${common.debug_flags}
 
 [env:adafruit-huzzah32]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = esp32dev
-lib_deps = ${common_env_data.lib_deps_external}
+lib_deps = ${common.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
 build_flags =
 	-D FIRMWARE='"adafruit-huzzah32"'
 	-D HUZZAH32
+	${common.build_flags}
 
 [env:esp32-verbose]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = esp32dev
-lib_deps = ${common_env_data.lib_deps_external}
+lib_deps = ${common.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 upload_speed = 1500000
@@ -88,28 +96,30 @@ build_flags =
 	-D CORE_DEBUG_LEVEL=2
 	-D FIRMWARE='"esp32-verbose"'
 	-D VERBOSE
+	${common.build_flags}
 
 [env:m5stickc]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = m5stick-c
 lib_deps =
 	m5stack/M5StickC@^0.2.0
-	${common_env_data.lib_deps_external}
+	${common.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
 build_flags =
 	-D M5STICK
 	-D FIRMWARE='"m5stickc"'
+	${common.build_flags}
 
 [env:m5stickc-plus]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = m5stick-c
 lib_deps =
 	m5stack/M5StickCPlus@^0.0.2
-	${common_env_data.lib_deps_external}
+	${common.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -117,15 +127,16 @@ build_flags =
 	-D M5STICK
 	-D PLUS
 	-D FIRMWARE='"m5stickc-plus"'
+	${common.build_flags}
 
 [env:m5atom-matrix]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = m5stack-atom
 lib_deps =
 	fastled/FastLED@^3.4.0
 	m5stack/m5atom@^0.0.5
-	${common_env_data.lib_deps_external}
+	${common.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -133,40 +144,43 @@ build_flags =
 	-D M5ATOM
 	-D MATRIX
 	-D FIRMWARE='"m5atom-matrix"'
+	${common.build_flags}
 
 [env:macchina-a0]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = esp32dev
-lib_deps = ${common_env_data.lib_deps_external}
+lib_deps = ${common.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 build_flags =
 	-D MACCHINA_A0
 	-D FIRMWARE='"macchina-a0"'
+	${common.build_flags}
 
 [env:esp32-sensors]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = esp32dev
 lib_deps =
-	${common_env_data.lib_deps_external}
-	${common_sensors.lib_deps_external}
+	${common.lib_deps}
+	${common_sensors.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 upload_speed = 115200
 monitor_filters = esp32_exception_decoder
 build_flags =
 	-D FIRMWARE='"esp32-sensors"'
-    -D SENSORS
+	-D SENSORS
+	${common.build_flags}
 
 [env:adafruit-huzzah32-sensors]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = esp32dev
 lib_deps =
-	${common_env_data.lib_deps_external}
-	${common_sensors.lib_deps_external}
+	${common.lib_deps}
+	${common_sensors.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -174,14 +188,15 @@ build_flags =
 	-D FIRMWARE='"adafruit-huzzah32-sensors"'
 	-D HUZZAH32
 	-D SENSORS
+	${common.build_flags}
 
 [env:esp32-verbose-sensors]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = esp32dev
 lib_deps =
-	${common_env_data.lib_deps_external}
-	${common_sensors.lib_deps_external}
+	${common.lib_deps}
+	${common_sensors.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 upload_speed = 1500000
@@ -190,15 +205,17 @@ build_flags =
 	-D CORE_DEBUG_LEVEL=2
 	-D FIRMWARE='"esp32-verbose-sensors"'
 	-D VERBOSE
+	-D SENSORS
+	${common.build_flags}
 
 [env:m5stickc-sensors]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = m5stick-c
 lib_deps =
 	m5stack/M5StickC@^0.2.0
-	${common_env_data.lib_deps_external}
-	${common_sensors.lib_deps_external}
+	${common.lib_deps}
+	${common_sensors.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -206,15 +223,16 @@ build_flags =
 	-D M5STICK
 	-D FIRMWARE='"m5stickc-sensors"'
 	-D SENSORS
+	${common.build_flags}
 
 [env:m5stickc-plus-sensors]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = m5stick-c
 lib_deps =
 	m5stack/M5StickCPlus@^0.0.2
-	${common_env_data.lib_deps_external}
-	${common_sensors.lib_deps_external}
+	${common.lib_deps}
+	${common_sensors.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -222,17 +240,18 @@ build_flags =
 	-D M5STICK
 	-D PLUS
 	-D FIRMWARE='"m5stickc-plus-sensors"'
-    -D SENSORS
+	-D SENSORS
+	${common.build_flags}
 
 [env:m5atom-matrix-sensors]
-platform = ${common_env_data.platform}
-framework = ${common_env_data.framework}
+platform = ${common.platform}
+framework = ${common.framework}
 board = m5stack-atom
 lib_deps =
 	fastled/FastLED@^3.4.0
 	m5stack/m5atom@^0.0.5
-	${common_env_data.lib_deps_external}
-	${common_sensors.lib_deps_external}
+	${common.lib_deps}
+	${common_sensors.lib_deps}
 board_build.partitions = partitions_singleapp.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -240,4 +259,5 @@ build_flags =
 	-D M5ATOM
 	-D MATRIX
 	-D FIRMWARE='"m5atom-matrix-sensors"'
-    -D SENSORS
+	-D SENSORS
+	${common.build_flags}
diff --git a/src/main.cpp b/src/main.cpp
index 7151a18..8140a58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -505,6 +505,8 @@ void setup()
 
 #ifdef VERBOSE
     esp_log_level_set("*", ESP_LOG_DEBUG);
+#else
+    esp_log_level_set("*", ESP_LOG_ERROR);
 #endif
 
     spiffsInit();