diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 87b558cf0..06ea92d6b 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,24 +1,44 @@
-name: ESP32 Arduino Libs CI
+name: ESP32-solo1 Arduino new builder
 
 on:
-  push:
-    branches:
-    - master
-  pull_request:
+  workflow_dispatch:  # Manually start a workflow
+#  push:
+#    branches: master
+#    paths-ignore:
+#    - '.github/**' # Ignore changes towards the .github directory
 
 jobs:
-
   build-libs:
     name: Build Arduino Libs
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8.10'
+        architecture: 'x64' 
     - name: Install dependencies
       run: bash ./tools/prepare-ci.sh
     - name: Build Arduino Libs
       run: bash ./build.sh
-    - name: Upload archive
-      uses: actions/upload-artifact@v1
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
       with:
-        name: artifacts
+        name: esp32-arduino
         path: dist
+    - name: Download new builded framework
+      uses: actions/download-artifact@v2
+      with:
+        name: esp32-arduino
+        path: ./esp32-arduino
+    - name: Display files from folder esp32-arduino 
+      run: ls esp32-arduino/*
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      #if: startsWith(github.ref, 'refs/tags/')
+      with:
+        tag_name: ${{ github.run_number }}
+        prerelease: true
+        files: esp32-arduino/framework*
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3928bf105..b0ec7be65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,6 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-if(IDF_TARGET STREQUAL "esp32")
-    set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components)
-endif()
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(arduino-lib-builder)
 
diff --git a/build.sh b/build.sh
index fccb8eec2..523c4f035 100755
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then
     exit 1
 fi
 
-TARGET="all"
+TARGET="esp32"
 BUILD_TYPE="all"
 SKIP_ENV=0
 COPY_OUT=0
@@ -158,7 +158,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
 done
 
 # archive the build
-if [ "$TARGET" = "all" ] && [ "$BUILD_TYPE" = "all" ]; then
+if [ "$BUILD_TYPE" = "all" ]; then
     ./tools/archive-build.sh
     if [ $? -ne 0 ]; then exit 1; fi
 fi
diff --git a/configs/builds.json b/configs/builds.json
index 8d20b2b1e..951844bdb 100644
--- a/configs/builds.json
+++ b/configs/builds.json
@@ -34,11 +34,16 @@
 	"targets":[
 		{
 			"target": "esp32s3",
-			"idf_libs":["qio","80m"],
+			"idf_libs":["dio","80m"],
 			"bootloaders":[
 				["qio","120m"],
 				["qio","80m"],
+				["qout","120m"],
+				["qout","80m"],
+				["dio","120m"],
 				["dio","80m"],
+				["dout","120m"],
+				["dout","80m"],
 				["opi_flash","opi_ram","80m"]
 			],
 			"mem_variants":[
@@ -48,7 +53,7 @@
 		},
 		{
 			"target": "esp32s2",
-			"idf_libs":["qio","80m"],
+			"idf_libs":["dio","80m"],
 			"bootloaders":[
 				["qio","80m"],
 				["qout","80m"],
@@ -63,7 +68,7 @@
 		},
 		{
 			"target": "esp32c3",
-			"idf_libs":["qio","80m"],
+			"idf_libs":["dio","80m"],
 			"bootloaders":[
 				["qio","80m"],
 				["qout","80m"],
@@ -92,4 +97,4 @@
 			"mem_variants":[]
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index 605ef41d2..447b45021 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -1,8 +1,9 @@
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
+CONFIG_DISABLE_HAL_LOCKS=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_ARDUHAL_ESP_LOG=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_CXX_EXCEPTIONS=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
 CONFIG_COMPILER_WARN_WRITE_STRINGS=y
 CONFIG_BT_ENABLED=y
@@ -17,41 +18,42 @@ CONFIG_BT_STACK_NO_LOG=y
 CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
 CONFIG_ESP32_SPIRAM_SUPPORT=y
-# CONFIG_SPIRAM_BOOT_INIT is not set
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
-CONFIG_ESP32_ULP_COPROC_ENABLED=y
 CONFIG_ESP32_XTAL_FREQ_AUTO=y
 CONFIG_ETH_SPI_ETHERNET_DM9051=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
 CONFIG_HTTPD_WS_SUPPORT=y
-CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
-CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
 CONFIG_ESP_TASK_WDT_PANIC=y
-# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
-# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
 CONFIG_FATFS_CODEPAGE_850=y
 CONFIG_FATFS_LFN_STACK=y
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_FMB_TIMER_PORT_ENABLED=y
+CONFIG_FREERTOS_UNICORE=y
 CONFIG_FREERTOS_HZ=1000
 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
 CONFIG_FREERTOS_FPU_IN_ISR=y
+CONFIG_HAL_ASSERTION_DISABLE=y
 CONFIG_HEAP_POISONING_LIGHT=y
-CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 # CONFIG_LOG_COLORS is not set
+CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
 CONFIG_LWIP_MAX_SOCKETS=16
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
+CONFIG_LWIP_SO_RCVBUF=y
+CONFIG_LWIP_IP_FORWARD=y
+CONFIG_LWIP_IPV4_NAPT=y
 # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
 CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
 CONFIG_LWIP_DHCP_OPTIONS_LEN=128
@@ -60,15 +62,19 @@ CONFIG_LWIP_TCP_MSS=1436
 CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
-CONFIG_LWIP_SNTP_MAX_SERVERS=3
-CONFIG_LWIP_DHCP_GET_NTP_SRV=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 # CONFIG_MBEDTLS_HARDWARE_SHA is not set
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+CONFIG_NEWLIB_NANO_FORMAT=y
+# CONFIG_OPENSSL_ERROR_STACK is not set
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
+CONFIG_ULP_COPROC_ENABLED=y
+# CONFIG_VFS_SUPPORT_SELECT is not set
+# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
+# CONFIG_VFS_SUPPORT_TERMIOS is not set
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index c15bbcb1d..f1d3105b9 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -1,15 +1,39 @@
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
-CONFIG_ARDUINO_RUN_CORE0=y
-CONFIG_ARDUINO_EVENT_RUN_CORE0=y
+CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
+CONFIG_DISABLE_HAL_LOCKS=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
+CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
 CONFIG_BT_ENABLED=y
+CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE=y
 CONFIG_BT_BLE_BLUFI_ENABLE=y
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_ESP32C3_REV_MIN_0=y
 CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=576
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
 CONFIG_HTTPD_WS_SUPPORT=y
 CONFIG_ESP_HTTPS_SERVER_ENABLE=y
-CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
 # CONFIG_ESP32_WIFI_IRAM_OPT is not set
 # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
 CONFIG_ESP_WIFI_FTM_ENABLE=y
@@ -17,12 +41,20 @@ CONFIG_FATFS_LFN_HEAP=y
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
-CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_HAL_ASSERTION_DISABLE=y
+CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 # CONFIG_LOG_COLORS is not set
+CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
 CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_RCVBUF=y
+CONFIG_LWIP_IP_FORWARD=y
+CONFIG_LWIP_IPV4_NAPT=y
 CONFIG_LWIP_DHCP_OPTIONS_LEN=128
-CONFIG_LWIP_SNTP_MAX_SERVERS=3
-CONFIG_LWIP_DHCP_GET_NTP_SRV=y
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_MBEDTLS_CAMELLIA_C=y
+CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
+# CONFIG_VFS_SUPPORT_SELECT is not set
+# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
+# CONFIG_VFS_SUPPORT_TERMIOS is not set
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index 28ca6c4cc..7696300cd 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -1,36 +1,31 @@
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
+CONFIG_DISABLE_HAL_LOCKS=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_ARDUINO_RUN_CORE0=y
-CONFIG_ARDUINO_EVENT_RUN_CORE0=y
-CONFIG_ARDUHAL_ESP_LOG=y
 CONFIG_TINYUSB_MSC_BUFSIZE=4096
 CONFIG_TINYUSB_DESC_DFU_RT_STRING="Espressif DFU Device"
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_CXX_EXCEPTIONS=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
 CONFIG_COMPILER_WARN_WRITE_STRINGS=y
 # CONFIG_SPI_MASTER_ISR_IN_IRAM is not set
 # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
 CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
-# CONFIG_SPIRAM_BOOT_INIT is not set
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
 CONFIG_ESP32S2_KEEP_USB_ALIVE=y
-CONFIG_ETH_SPI_ETHERNET_DM9051=y
-CONFIG_ETH_SPI_ETHERNET_W5500=y
 CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
 CONFIG_HTTPD_WS_SUPPORT=y
 CONFIG_ESP_HTTPS_SERVER_ENABLE=y
-CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
 CONFIG_ESP_TASK_WDT_PANIC=y
-# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
@@ -38,7 +33,6 @@ CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CSI_ENABLED=y
 # CONFIG_ESP32_WIFI_IRAM_OPT is not set
 # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
-# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
 CONFIG_ESP_WIFI_FTM_ENABLE=y
 CONFIG_FATFS_CODEPAGE_850=y
 CONFIG_FATFS_LFN_STACK=y
@@ -48,11 +42,15 @@ CONFIG_FREERTOS_HZ=1000
 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
+CONFIG_HAL_ASSERTION_DISABLE=y
 CONFIG_HEAP_POISONING_LIGHT=y
-CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 # CONFIG_LOG_COLORS is not set
+CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
 CONFIG_LWIP_MAX_SOCKETS=16
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
+CONFIG_LWIP_SO_RCVBUF=y
+CONFIG_LWIP_IP_FORWARD=y
+CONFIG_LWIP_IPV4_NAPT=y
 # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
 CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
 CONFIG_LWIP_DHCP_OPTIONS_LEN=128
@@ -61,16 +59,17 @@ CONFIG_LWIP_TCP_MSS=1436
 CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
-CONFIG_LWIP_SNTP_MAX_SERVERS=3
-CONFIG_LWIP_DHCP_GET_NTP_SRV=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
-# CONFIG_MBEDTLS_HARDWARE_MPI is not set
-# CONFIG_MBEDTLS_HARDWARE_SHA is not set
+CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
+# CONFIG_VFS_SUPPORT_SELECT is not set
+# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
+# CONFIG_VFS_SUPPORT_TERMIOS is not set
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 899713f7b..1b5939cfc 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -1,36 +1,55 @@
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
+CONFIG_DISABLE_HAL_LOCKS=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_ARDUHAL_ESP_LOG=y
 CONFIG_TINYUSB_MSC_BUFSIZE=4096
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_CXX_EXCEPTIONS=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
 CONFIG_COMPILER_WARN_WRITE_STRINGS=y
 CONFIG_BT_ENABLED=y
-CONFIG_BLE_MESH=y
-# CONFIG_SPI_MASTER_ISR_IN_IRAM is not set
-# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
+CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE=y
+CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE=y
+CONFIG_BLE_MESH_TRACE_LEVEL_NONE=y
+CONFIG_BLE_MESH_NET_BUF_TRACE_LEVEL_NONE=y
 CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32S3_SPIRAM_SUPPORT=y
-# CONFIG_SPIRAM_BOOT_INIT is not set
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
 CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=576
-CONFIG_ETH_SPI_ETHERNET_DM9051=y
-CONFIG_ETH_SPI_ETHERNET_W5500=y
 CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
 CONFIG_HTTPD_WS_SUPPORT=y
 CONFIG_ESP_HTTPS_SERVER_ENABLE=y
 CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
-CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
 CONFIG_ESP_TASK_WDT_PANIC=y
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
@@ -39,7 +58,6 @@ CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CSI_ENABLED=y
 # CONFIG_ESP32_WIFI_IRAM_OPT is not set
 # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
-# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
 CONFIG_ESP_WIFI_FTM_ENABLE=y
 CONFIG_FATFS_CODEPAGE_850=y
 CONFIG_FATFS_LFN_STACK=y
@@ -49,11 +67,15 @@ CONFIG_FREERTOS_HZ=1000
 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
+CONFIG_HAL_ASSERTION_DISABLE=y
 CONFIG_HEAP_POISONING_LIGHT=y
-CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 # CONFIG_LOG_COLORS is not set
+CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
 CONFIG_LWIP_MAX_SOCKETS=16
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
+CONFIG_LWIP_SO_RCVBUF=y
+CONFIG_LWIP_IP_FORWARD=y
+CONFIG_LWIP_IPV4_NAPT=y
 # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
 CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
 CONFIG_LWIP_DHCP_OPTIONS_LEN=128
@@ -62,16 +84,18 @@ CONFIG_LWIP_TCP_MSS=1436
 CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
-CONFIG_LWIP_SNTP_MAX_SERVERS=3
-CONFIG_LWIP_DHCP_GET_NTP_SRV=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
-# CONFIG_MBEDTLS_HARDWARE_MPI is not set
-# CONFIG_MBEDTLS_HARDWARE_SHA is not set
+CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+CONFIG_NEWLIB_NANO_FORMAT=y
+# CONFIG_OPENSSL_ERROR_STACK is not set
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
+# CONFIG_VFS_SUPPORT_SELECT is not set
+# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
+# CONFIG_VFS_SUPPORT_TERMIOS is not set
diff --git a/core_version.h b/core_version.h
new file mode 100644
index 000000000..05d0e338a
--- /dev/null
+++ b/core_version.h
@@ -0,0 +1,4 @@
+#define ARDUINO_ESP32_GIT_VER 0xd45984b5
+#define ARDUINO_ESP32_GIT_DESC 2.0.2.3
+#define ARDUINO_ESP32_RELEASE_2_0_2_3
+#define ARDUINO_ESP32_RELEASE "2_0_2_3"
diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index d6682ff97..8268e27bd 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -4,13 +4,31 @@ IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
 IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD)
 
 idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT"
-archive_path="dist/arduino-esp32-libs-$idf_version_string.tar.gz"
-build_archive_path="dist/arduino-esp32-build-$idf_version_string.tar.gz"
+archive_path="dist/arduino-esp32-libs-solo1-$idf_version_string.tar.gz"
+build_archive_path="dist/arduino-esp32-build-solo1-$idf_version_string.tar.gz"
+pio_archive_path="dist/framework-arduinoespressif32-solo1-$idf_version_string.tar.gz"
 
 mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
-if [ -d "out" ]; then
-	cd out && tar zcf "../$archive_path" * && cd ..
-fi
-if [ -d "build" ]; then
-	cd build && tar zcf "../$build_archive_path" * && cd ..
-fi
+
+cd out
+echo "Show files from folder out"
+ls
+echo "Show Arduino directory"
+ls ../components/arduino
+echo "Creating framework-arduinoespressif32"
+cp -rf ../components/arduino arduino-esp32
+rm -rf arduino-esp32/docs
+rm -rf arduino-esp32/package
+rm -rf arduino-esp32/tools/sdk
+rm -rf arduino-esp32/tools/esptool.py
+rm -rf arduino-esp32/tools/gen_esp32part.py
+rm -rf arduino-esp32/tools/platformio-build-*.py
+rm -rf arduino-esp32/platform.txt
+cp -f platform.txt arduino-esp32/
+cp -Rf tools/sdk arduino-esp32/tools/
+cp -f tools/esptool.py arduino-esp32/tools/
+cp -f tools/gen_esp32part.py arduino-esp32/tools/
+cp -f tools/platformio-build-*.py arduino-esp32/tools/
+cp ../core_version.h arduino-esp32/cores/esp32/core_version.h
+mv arduino-esp32/ framework-arduinoespressif32/
+tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/
diff --git a/tools/config.sh b/tools/config.sh
index 2c4e626ad..7e73de854 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -3,7 +3,7 @@
 IDF_COMPS="$IDF_PATH/components"
 
 if [ -z $IDF_BRANCH ]; then
-	IDF_BRANCH="release/v4.4"
+	IDF_BRANCH="v4.4_dev"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
@@ -24,11 +24,14 @@ fi
 IDF_TOOLCHAIN="xtensa-$IDF_TARGET-elf"
 
 # Owner of the target ESP32 Arduino repository
-AR_USER="espressif"
+AR_USER="tasmota"
 
 # The full name of the repository
 AR_REPO="$AR_USER/arduino-esp32"
 
+# Arduino branch to use
+AR_BRANCH="esp32-s3-support"
+
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then
 	AR_REPO_URL="https://$GITHUB_TOKEN@github.com/$AR_REPO.git"
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index a0e58899f..bc332f454 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -11,20 +11,22 @@ fi
 # CLONE ESP-IDF
 #
 
-IDF_REPO_URL="https://github.com/espressif/esp-idf.git"
+IDF_REPO_URL="https://github.com/tasmota/esp-idf.git"
 if [ -z "$IDF_PATH" ]; then
 	echo "ESP-IDF is not installed! Installing local copy"
 	idf_was_installed="1"
 	if ! [ -d esp-idf ]; then
+                echo "git clone $IDF_REPO_URL -b $IDF_BRANCH"
 		git clone $IDF_REPO_URL -b $IDF_BRANCH
 	fi
 	export IDF_PATH="$AR_ROOT/esp-idf"
 fi
 
-if [ "$IDF_COMMIT" ]; then
-    git -C "$IDF_PATH" checkout "$IDF_COMMIT"
-    commit_predefined="1"
-fi
+# Next lines redirects ALWAYS to espressif git since this sha1 only exists there!!!
+#if [ "$IDF_COMMIT" ]; then
+#    git -C "$IDF_PATH" checkout "$IDF_COMMIT"
+#    commit_predefined="1"
+#fi
 
 export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
 export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD)
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 4a8edbd88..67c83e5bc 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -2,9 +2,7 @@
 
 source ./tools/config.sh
 
-CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git"
-FACE_REPO_URL="https://github.com/espressif/esp-dl.git"
-RMAKER_REPO_URL="https://github.com/espressif/esp-rainmaker.git"
+CAMERA_REPO_URL="https://github.com/tasmota/esp32-camera.git"
 DSP_REPO_URL="https://github.com/espressif/esp-dsp.git"
 LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git"
 TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git"
@@ -50,18 +48,6 @@ if [ -f "$AR_COMPS/esp32-camera/idf_component.yml" ]; then
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
-#
-# CLONE/UPDATE ESP-FACE
-#
-
-if [ ! -d "$AR_COMPS/esp-face" ]; then
-	git clone $FACE_REPO_URL "$AR_COMPS/esp-face"
-else
-	git -C "$AR_COMPS/esp-face" fetch && \
-	git -C "$AR_COMPS/esp-face" pull --ff-only
-fi
-if [ $? -ne 0 ]; then exit 1; fi
-
 #
 # CLONE/UPDATE ESP-LITTLEFS
 #
@@ -76,16 +62,6 @@ else
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
-#
-# CLONE/UPDATE ESP-RAINMAKER
-#
-
-if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then
-    git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker"
-    git -C "$AR_COMPS/esp-rainmaker" checkout f1b82c71c4536ab816d17df016d8afe106bd60e3
-fi
-if [ $? -ne 0 ]; then exit 1; fi
-
 #
 # CLONE/UPDATE ESP-DSP
 #