diff --git a/sdkconfig.defaults.c5 b/sdkconfig.defaults.c5
deleted file mode 100644
index dec667f..0000000
--- a/sdkconfig.defaults.c5
+++ /dev/null
@@ -1,36 +0,0 @@
-# ESP32-C5 - 8MB Flash
-# --- Hardware & Partitions ---
-CONFIG_IDF_TARGET="esp32c5"
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_c5.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_c5.csv"
-
-# --- Wi-Fi & CSI ---
-CONFIG_ESP_WIFI_CSI_ENABLED=n
-# WiFi RX buffer configuration
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-CONFIG_ESP_WIFI_RX_BA_WIN=16
-CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-# --- System Stability ---
-# Optimize for size to leave more room for CSV logs
-CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-
-# Increase stack sizes to prevent overflows during heavy CSI traffic
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=6144
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
-CONFIG_FREERTOS_ISR_STACKSIZE=2048
-
-# 1000Hz (1ms) is standard high-performance. 10kHz is usually overkill.
-CONFIG_FREERTOS_HZ=1000
-
-# --- Console ---
-# Increase console buffer for pasting large config blocks
-CONFIG_CONSOLE_UART_RX_BUF_SIZE=1024
-
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_c5.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_c5.csv"
diff --git a/sdkconfig.defaults.esp32c5 b/sdkconfig.defaults.esp32c5
new file mode 100644
index 0000000..32d6077
--- /dev/null
+++ b/sdkconfig.defaults.esp32c5
@@ -0,0 +1,9 @@
+CONFIG_IDF_TARGET="esp32c5"
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_c5.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions_c5.csv"
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+CONFIG_ESP_WIFI_RX_BA_WIN=16
+CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
diff --git a/sdkconfig.defaults.c5csi b/sdkconfig.defaults.esp32c5csi
similarity index 79%
rename from sdkconfig.defaults.c5csi
rename to sdkconfig.defaults.esp32c5csi
index 7dddcae..28f08c4 100644
--- a/sdkconfig.defaults.c5csi
+++ b/sdkconfig.defaults.esp32c5csi
@@ -2,13 +2,9 @@ CONFIG_IDF_TARGET="esp32c5"
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_c5.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions_c5.csv"
-
-# Enable CSI (Overrides Base)
 CONFIG_ESP_WIFI_CSI_ENABLED=y
-
-# Wi-Fi Tuning (C5 CSI)
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
 CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
 CONFIG_ESP_WIFI_RX_BA_WIN=16
 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
\ No newline at end of file
+CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
diff --git a/sdkconfig.defaults.esp32s3 b/sdkconfig.defaults.esp32s3
new file mode 100644
index 0000000..5c0f717
--- /dev/null
+++ b/sdkconfig.defaults.esp32s3
@@ -0,0 +1,8 @@
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_s3.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions_s3.csv"
+CONFIG_COMPILER_OPTIMIZATION_PERF=y
+CONFIG_ESP_WIFI_RX_BA_WIN=32
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
diff --git a/sdkconfig.defaults.s3csi b/sdkconfig.defaults.esp32s3csi
similarity index 68%
rename from sdkconfig.defaults.s3csi
rename to sdkconfig.defaults.esp32s3csi
index a4074bd..3ab1486 100644
--- a/sdkconfig.defaults.s3csi
+++ b/sdkconfig.defaults.esp32s3csi
@@ -2,14 +2,8 @@ CONFIG_IDF_TARGET="esp32s3"
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_s3.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions_s3.csv"
-
-# Enable CSI (Overrides Base)
 CONFIG_ESP_WIFI_CSI_ENABLED=y
-
-# Optimize for Perf on S3
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
-
-# Wi-Fi Tuning (Heavy buffers for CSI)
 CONFIG_ESP_WIFI_RX_BA_WIN=64
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=24
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=128
\ No newline at end of file
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=128
diff --git a/sdkconfig.defaults.s3 b/sdkconfig.defaults.s3
deleted file mode 100644
index 5d3b84b..0000000
--- a/sdkconfig.defaults.s3
+++ /dev/null
@@ -1,24 +0,0 @@
-# ESP32-S3 - 16MB Flash
-CONFIG_IDF_TARGET="esp32s3"
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_s3.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_s3.csv"
-
-# --- Wi-Fi & CSI ---
-CONFIG_ESP_WIFI_CSI_ENABLED=y
-# optimization: increased for throughput
-CONFIG_ESP_WIFI_RX_BA_WIN=64
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=24
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=128
-
-# --- System ---
-# optimization: Optimize for Speed (-O2)
-CONFIG_COMPILER_OPTIMIZATION_PERF=y
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=6144
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
-CONFIG_FREERTOS_ISR_STACKSIZE=2048
-CONFIG_FREERTOS_HZ=1000
-
-# --- Console ---
-CONFIG_CONSOLE_UART_RX_BUF_SIZE=1024