diff --git a/configs/defconfig.common b/configs/defconfig.common
index b1c69651..b14b93ad 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -1,20 +1,30 @@
 CONFIG_AUTOSTART_ARDUINO=y
 # CONFIG_WS2812_LED_ENABLE is not set
+
+#
+# ArduHALBootloader
+#
 CONFIG_ARDUHAL_ESP_LOG=y
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
-CONFIG_BT_ENABLED=y
-CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_BTC_TASK_STACK_SIZE=8192
-CONFIG_BT_BTU_TASK_STACK_SIZE=8192
-CONFIG_BLE_MESH=y
-CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_CXX_EXCEPTIONS=y
-CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
-CONFIG_COMPILER_WARN_WRITE_STRINGS=y
-CONFIG_ESP_HTTPS_SERVER_ENABLE=y
-CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y
+#end of ArduHALBootloader
+
+#
+# Bluetooth
+#
+# CONFIG_BT_ENABLED is not set
+# CONFIG_BT_NIMBLE_ENABLED is not set
+# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
+# CONFIG_BT_BTC_TASK_STACK_SIZE=8192 is not set
+# CONFIG_BT_BTU_TASK_STACK_SIZE=8192 is not set
+# CONFIG_BLE_MESH=y is not set
+# end of Bluetooth
+
+
+#
+# ESP System Settings
+#
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
@@ -22,6 +32,23 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_ESP_TASK_WDT_PANIC=y
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+# end of ESP System Settings
+
+
+#
+# Compiler Configuration
+#
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_CXX_EXCEPTIONS=y
+CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
+CONFIG_COMPILER_WARN_WRITE_STRINGS=y
+CONFIG_ESP_HTTPS_SERVER_ENABLE=y
+CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y
+# end of Compiler Configuration
+
+#
+# Wi-Fi
+#
 CONFIG_ESP_WIFI_FTM_ENABLE=y
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
 CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=8
@@ -30,14 +57,29 @@ CONFIG_ESP_WIFI_CSI_ENABLED=y
 CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
 # CONFIG_ESP_WIFI_IRAM_OPT is not set
 # CONFIG_ESP_WIFI_RX_IRAM_OPT is not set
-CONFIG_ETH_SPI_ETHERNET_DM9051=y
-CONFIG_ETH_SPI_ETHERNET_W5500=y
-CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL=y
+# end of Wi-Fi
+
+#
+# Ethernet
+#
+# CONFIG_ETH_ENABLED is not set
+# CONFIG_ETH_USE_SPI_ETHERNET is not set
+# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
+# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
+# CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set
+# end of Ethernet
+
+#
+# FatFS
+#
 CONFIG_FATFS_CODEPAGE_850=y
 CONFIG_FATFS_LFN_STACK=y
 # CONFIG_FATFS_API_ENCODING_ANSI_OEM is not set
 CONFIG_FATFS_API_ENCODING_UTF_8=y
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
+# end of FatFS
+
+
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
@@ -61,13 +103,37 @@ CONFIG_LWIP_DHCP_OPTIONS_LEN=128
 CONFIG_LWIP_SNTP_MAX_SERVERS=3
 CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000
 CONFIG_LWIP_DHCP_GET_NTP_SRV=y
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
+CONFIG_NEWLIB_NANO_FORMAT=y
+
+
+#
+# mbedTLS
+#
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_MBEDTLS_CAMELLIA_C=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
+CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
+CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
-CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
+# CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED is not set
+# CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED is not set
+# CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED is not set
+# CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED is not set
+# CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED is not set
+# CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED is not set
+# CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED is not set
+# CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED is not set
+# CONFIG_MBEDTLS_ECP_NIST_OPTIM is not set
+# end of mbedTLS
+
+#
+# SPI
+#
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
@@ -75,12 +141,111 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
 # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
-CONFIG_LWIP_IPV6_AUTOCONFIG=y
-CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK=y
-CONFIG_ESP_RMAKER_USER_ID_CHECK=y
-CONFIG_ESP_INSIGHTS_ENABLED=y
-CONFIG_ESP_INSIGHTS_COREDUMP_ENABLE=n
-CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS=y
+# end of SPI
+
+
+#
+# ESP Insights
+#
+# CONFIG_ESP_INSIGHTS_ENABLED is not set
+# CONFIG_ESP_INSIGHTS_TRANSPORT_MQTT is not set
+# CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS is not set
+# CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS_HOST is not set
+# CONFIG_ESP_INSIGHTS_CLOUD_POST_MIN_INTERVAL_SEC is not set
+# CONFIG_ESP_INSIGHTS_CLOUD_POST_MAX_INTERVAL_SEC is not set
+# end of ESP Insights
+
+
+#
+# ESP RainMaker Config
+#
+# CONFIG_ESP_RMAKER_NO_CLAIM is not set
+# CONFIG_ESP_RMAKER_SELF_CLAIM is not set
+# CONFIG_ESP_RMAKER_USE_NVS is not set
+# CONFIG_ESP_RMAKER_CLAIM_TYPE is not set
+# CONFIG_ESP_RMAKER_CLAIM_SERVICE_BASE_URL is not set
+# CONFIG_ESP_RMAKER_READ_MQTT_HOST_FROM_CONFIG is not set
+# CONFIG_ESP_RMAKER_READ_NODE_ID_FROM_CERT_CN is not set
+# CONFIG_ESP_RMAKER_MQTT_HOST is not set
+# CONFIG_ESP_RMAKER_MQTT_USE_BASIC_INGEST_TOPICS is not set
+# CONFIG_ESP_RMAKER_MQTT_ENABLE_BUDGETING is not set
+# CONFIG_ESP_RMAKER_MQTT_DEFAULT_BUDGET is not set
+# CONFIG_ESP_RMAKER_MQTT_MAX_BUDGET is not set
+# CONFIG_ESP_RMAKER_MQTT_BUDGET_REVIVE_PERIOD is not set
+# CONFIG_ESP_RMAKER_MQTT_BUDGET_REVIVE_COUNT is not set
+# CONFIG_ESP_RMAKER_MAX_PARAM_DATA_SIZE is not set
+# CONFIG_ESP_RMAKER_DISABLE_USER_MAPPING_PROV is not set
+# CONFIG_ESP_RMAKER_USER_ID_CHECK is not set
+# CONFIG_RMAKER_NAME_PARAM_CB is not set
+# CONFIG_ESP_RMAKER_LOCAL_CTRL_FEATURE_ENABLE is not set
+# CONFIG_ESP_RMAKER_LOCAL_CTRL_AUTO_ENABLE is not set
+# CONFIG_ESP_RMAKER_CONSOLE_UART_NUM_0 is not set
+# CONFIG_ESP_RMAKER_CONSOLE_UART_NUM_1 is not set
+# CONFIG_ESP_RMAKER_CONSOLE_UART_NUM is not set
+# CONFIG_ESP_RMAKER_USE_CERT_BUNDLE is not set
+
+#
+# ESP RainMaker OTA Config
+#
+# CONFIG_ESP_RMAKER_OTA_AUTOFETCH is not set
+# CONFIG_ESP_RMAKER_OTA_AUTOFETCH_PERIOD is not set
+# CONFIG_ESP_RMAKER_SKIP_COMMON_NAME_CHECK is not set
+# CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK is not set
+# CONFIG_ESP_RMAKER_SKIP_SECURE_VERSION_CHECK is not set
+# CONFIG_ESP_RMAKER_SKIP_PROJECT_NAME_CHECK is not set
+# CONFIG_ESP_RMAKER_OTA_HTTP_RX_BUFFER_SIZE is not set
+# CONFIG_ESP_RMAKER_OTA_ROLLBACK_WAIT_PERIOD is not set
+# CONFIG_ESP_RMAKER_OTA_DISABLE_AUTO_REBOOT is not set
+# CONFIG_ESP_RMAKER_OTA_TIME_SUPPORT is not set
+# end of ESP RainMaker OTA Config
+
+#
+# ESP RainMaker Scheduling
+#
+# CONFIG_ESP_RMAKER_SCHEDULING_MAX_SCHEDULES is not set
+# end of ESP RainMaker Scheduling
+
+#
+# ESP RainMaker Scenes
+#
+# CONFIG_ESP_RMAKER_SCENES_MAX_SCENES is not set
+# CONFIG_ESP_RMAKER_SCENES_DEACTIVATE_SUPPORT is not set
+# end of ESP RainMaker Scenes
+
+#
+# ESP RainMaker Command-Response
+#
+# CONFIG_ESP_RMAKER_CMD_RESP_ENABLE is not set
+# CONFIG_ESP_RMAKER_CMD_RESP_TEST_ENABLE is not set
+# end of ESP RainMaker Command-Response
+# end of ESP RainMaker Config
+
+#
+# ESP RainMaker Common
+#
+# CONFIG_ESP_RMAKER_LIB_ESP_MQTT is not set
+# CONFIG_ESP_RMAKER_LIB_AWS_IOT is not set
+# CONFIG_ESP_RMAKER_MQTT_GLUE_LIB is not set
+# CONFIG_ESP_RMAKER_MQTT_PORT_443 is not set
+# CONFIG_ESP_RMAKER_MQTT_PORT_8883 is not set
+# CONFIG_ESP_RMAKER_MQTT_PORT is not set
+# CONFIG_ESP_RMAKER_MQTT_PERSISTENT_SESSION is not set
+# CONFIG_ESP_RMAKER_MQTT_SEND_USERNAME is not set
+# CONFIG_ESP_RMAKER_MQTT_PRODUCT_NAME is not set
+# CONFIG_ESP_RMAKER_MQTT_PRODUCT_VERSION is not set
+# CONFIG_ESP_RMAKER_MQTT_PRODUCT_SKU is not set
+# CONFIG_ESP_RMAKER_MQTT_USE_CERT_BUNDLE is not set
+# CONFIG_ESP_RMAKER_MAX_MQTT_SUBSCRIPTIONS is not set
+# CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK is not set
+# CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_PRIORITY is not set
+# CONFIG_ESP_RMAKER_FACTORY_PARTITION_NAME is not set
+# CONFIG_ESP_RMAKER_FACTORY_NAMESPACE is not set
+# CONFIG_ESP_RMAKER_DEF_TIMEZONE is not set
+# CONFIG_ESP_RMAKER_SNTP_SERVER_NAME is not set
+# CONFIG_ESP_RMAKER_MAX_COMMANDS is not set10
+# end of ESP RainMaker Common
+# CONFIG_ESP_RMAKER_ENABLED is not set
+
 CONFIG_DIAG_LOG_DROP_WIFI_LOGS=y
 CONFIG_DIAG_ENABLE_METRICS=y
 CONFIG_DIAG_ENABLE_HEAP_METRICS=y
@@ -93,6 +258,25 @@ CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
 CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y
 CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
 CONFIG_ESP_COREDUMP_STACK_SIZE=1024
-CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
-CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
-CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
+
+# CONFIG_UNITY_ENABLE_FLOAT is not set
+# CONFIG_UNITY_ENABLE_DOUBLE is not set
+# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set
+# CONFIG_VFS_SUPPORT_SELECT is not set
+# CONFIG_VFS_SUPPORT_TERMIOS is not set
+# CONFIG_WIFI_PROV_MANAGER is not set
+# CONFIG_WPA_MBEDTLS_CRYPTO is not set
+
+#
+# Camera configuration
+#
+# CONFIG_OV7670_SUPPORT is not set
+# CONFIG_NT99141_SUPPORT is not set
+# CONFIG_OV2640_SUPPORT is not set
+# CONFIG_GC2145_SUPPORT is not set
+# CONFIG_GC032A_SUPPORT is not set
+# CONFIG_GC0308_SUPPORT is not set
+# CONFIG_BF3005_SUPPORT is not set
+# CONFIG_BF20A6_SUPPORT is not set
+# CONFIG_SC030IOT_SUPPORT is not set
+# end of Camera configuration