diff --git a/build-scripts/ESP32-A1S-sdkconfig.defaults b/build-scripts/ESP32-A1S-sdkconfig.defaults
index 6084e57f..c0ce8cda 100644
--- a/build-scripts/ESP32-A1S-sdkconfig.defaults
+++ b/build-scripts/ESP32-A1S-sdkconfig.defaults
@@ -2,9 +2,34 @@
 # Automatically generated file. DO NOT EDIT.
 # Espressif IoT Development Framework (ESP-IDF) Project Configuration
 #
+
+# ESP32-A1S defaults (with AC101 codec)
+CONFIG_A1S=y
+CONFIG_I2S_NUM=0
+CONFIG_I2C_LOCKED=y
+CONFIG_DISPLAY_CONFIG=""
+CONFIG_I2C_CONFIG=""
+CONFIG_SPI_CONFIG=""
+CONFIG_SET_GPIO=""
+CONFIG_ROTARY_ENCODER=""
+CONFIG_LED_GREEN_GPIO=-1
+CONFIG_LED_GREEN_GPIO_LEVEL=1
+CONFIG_LED_RED_GPIO=-1
+CONFIG_LED_RED_GPIO_LEVEL=1
+CONFIG_JACK_GPIO=-1
+CONFIG_JACK_GPIO_LEVEL=0
+CONFIG_SPKFAULT_GPIO=-1
+CONFIG_SPKFAULT_GPIO_LEVEL=0
+CONFIG_BAT_CHANNEL=-1
+CONFIG_BAT_SCALE="0"
+CONFIG_SPDIF_NUM=0
+CONFIG_SPDIF_BCK_IO=27
+CONFIG_SPDIF_WS_IO=26
+CONFIG_SPDIF_DO_IO=-1
 CONFIG_DAC_CONFIG="model=AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32"
 CONFIG_MUTE_GPIO=-1
 CONFIG_MUTE_GPIO_LEVEL=-1
+
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
@@ -78,16 +103,7 @@ CONFIG_LOGGING_SLIMPROTO="info"
 CONFIG_LOGGING_STREAM="info"
 CONFIG_LOGGING_DECODE="info"
 CONFIG_LOGGING_OUTPUT="info"
-CONFIG_I2C_LOCKED=y
-# CONFIG_SQUEEZEAMP is not set
-CONFIG_A1S=y
 # CONFIG_BASIC_I2C_BT is not set
-CONFIG_I2S_NUM=0
-CONFIG_I2S_BCK_IO=27
-CONFIG_I2S_WS_IO=26
-CONFIG_I2S_DO_IO=25
-CONFIG_I2S_DI_IO=35
-CONFIG_SDIF_NUM=0
 CONFIG_A2DP_SINK_NAME="SMSL BT4.2"
 CONFIG_A2DP_DEV_NAME="Squeezelite"
 CONFIG_A2DP_CONTROL_DELAY_MS=500
@@ -98,16 +114,6 @@ CONFIG_BT_SINK_PIN=1234
 CONFIG_AIRPLAY_SINK=y
 CONFIG_AIRPLAY_NAME="ESP32-AirPlay"
 CONFIG_AIRPLAY_PORT="5000"
-CONFIG_DISPLAY_CONFIG=""
-CONFIG_I2C_CONFIG=""
-CONFIG_SPI_CONFIG=""
-CONFIG_SET_GPIO=""
-CONFIG_ROTARY_ENCODER=""
-CONFIG_LED_GREEN_GPIO=-1
-CONFIG_LED_RED_GPIO=-1
-CONFIG_JACK_GPIO=-1
-CONFIG_SPKFAULT_GPIO=-1
-CONFIG_BAT_CHANNEL=-1
 CONFIG_WIFI_MANAGER_TASK_PRIORITY=5
 CONFIG_WIFI_MANAGER_MAX_RETRY=2
 CONFIG_DEFAULT_AP_SSID="squeezelite"
diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults
index b774ac99..b84368a2 100644
--- a/build-scripts/I2S-4MFlash-sdkconfig.defaults
+++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults
@@ -2,12 +2,39 @@
 # Automatically generated file. DO NOT EDIT.
 # Espressif IoT Development Framework (ESP-IDF) Project Configuration
 #
-CONFIG_MUTE_GPIO=-1
-CONFIG_MUTE_GPIO_LEVEL=-1
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
+# SqueezeESP32
+CONFIG_BASIC_I2C_BT=y
+CONFIG_DISPLAY_CONFIG=""
+CONFIG_I2C_CONFIG=""
+CONFIG_SPI_CONFIG=""
+CONFIG_SET_GPIO=""
+CONFIG_ROTARY_ENCODER=""
+CONFIG_LED_GREEN_GPIO=-1
+CONFIG_LED_GREEN_GPIO_LEVEL=1
+CONFIG_LED_RED_GPIO=-1
+CONFIG_LED_RED_GPIO_LEVEL=1
+CONFIG_JACK_GPIO=-1
+CONFIG_JACK_GPIO_LEVEL=0
+CONFIG_SPKFAULT_GPIO=-1
+CONFIG_SPKFAULT_GPIO_LEVEL=0
+CONFIG_BAT_CHANNEL=-1
+CONFIG_BAT_SCALE="0"
+CONFIG_I2S_NUM=0
+CONFIG_I2S_BCK_IO=33
+CONFIG_I2S_WS_IO=25
+CONFIG_I2S_DO_IO=32
+CONFIG_I2S_DI_IO=-1
+CONFIG_SPDIF_NUM=0
+CONFIG_SPDIF_BCK_IO=-1
+CONFIG_SPDIF_WS_IO=-1
+CONFIG_SPDIF_DO_IO=-1
+CONFIG_MUTE_GPIO=-1
+CONFIG_MUTE_GPIO_LEVEL=-1
+
 #
 # SDK tool configuration
 #
@@ -76,18 +103,6 @@ CONFIG_LOGGING_SLIMPROTO="info"
 CONFIG_LOGGING_STREAM="info"
 CONFIG_LOGGING_DECODE="info"
 CONFIG_LOGGING_OUTPUT="info"
-# CONFIG_SQUEEZEAMP is not set
-# CONFIG_A1S is not set
-CONFIG_BASIC_I2C_BT=y
-CONFIG_I2S_NUM=0
-CONFIG_I2S_BCK_IO=33
-CONFIG_I2S_WS_IO=25
-CONFIG_I2S_DO_IO=32
-CONFIG_I2S_DI_IO=-1
-CONFIG_SDIF_NUM=0
-CONFIG_SPDIF_BCK_IO=-1
-CONFIG_SPDIF_WS_IO=-1
-CONFIG_SPDIF_DO_IO=-1
 CONFIG_A2DP_SINK_NAME="SMSL BT4.2"
 CONFIG_A2DP_DEV_NAME="Squeezelite"
 CONFIG_A2DP_CONTROL_DELAY_MS=500
@@ -98,16 +113,6 @@ CONFIG_BT_SINK_PIN=1234
 CONFIG_AIRPLAY_SINK=y
 CONFIG_AIRPLAY_NAME="ESP32-AirPlay"
 CONFIG_AIRPLAY_PORT="5000"
-CONFIG_DISPLAY_CONFIG=""
-CONFIG_I2C_CONFIG=""
-CONFIG_SPI_CONFIG=""
-CONFIG_SET_GPIO=""
-CONFIG_ROTARY_ENCODER=""
-CONFIG_LED_GREEN_GPIO=-1
-CONFIG_LED_RED_GPIO=-1
-CONFIG_JACK_GPIO=-1
-CONFIG_SPKFAULT_GPIO=-1
-CONFIG_BAT_CHANNEL=-1
 CONFIG_WIFI_MANAGER_TASK_PRIORITY=5
 CONFIG_WIFI_MANAGER_MAX_RETRY=2
 CONFIG_DEFAULT_AP_SSID="squeezelite"
diff --git a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults
index 7d8fece2..25932937 100644
--- a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults
+++ b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults
@@ -6,6 +6,33 @@ CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
+# SqueezeAMP defaults
+CONFIG_SQUEEZEAMP=y
+CONFIG_JACK_LOCKED=y
+CONFIG_BAT_LOCKED=y
+CONFIG_I2C_LOCKED=y
+CONFIG_LED_LOCKED=y
+CONFIG_DISPLAY_CONFIG=""
+CONFIG_I2C_CONFIG=""
+CONFIG_SPI_CONFIG=""
+CONFIG_SET_GPIO=""
+CONFIG_ROTARY_ENCODER=""
+CONFIG_LED_GREEN_GPIO=12
+CONFIG_LED_GREEN_GPIO_LEVEL=0
+CONFIG_LED_RED_GPIO=13
+CONFIG_LED_RED_GPIO_LEVEL=0
+CONFIG_JACK_GPIO=34
+CONFIG_JACK_GPIO_LEVEL=0
+CONFIG_SPKFAULT_GPIO=2
+CONFIG_SPKFAULT_GPIO_LEVEL=0
+CONFIG_BAT_CHANNEL=7
+CONFIG_BAT_SCALE="20.24"
+CONFIG_I2S_NUM=0
+CONFIG_SPDIF_NUM=0
+CONFIG_SPDIF_CONFIG="bck=33,ws=25,do=15"
+CONFIG_DAC_CONFIG="model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14:0"
+CONFIG_MUTE_GPIO_LEVEL=-1
+
 #
 # SDK tool configuration
 #
@@ -75,24 +102,7 @@ CONFIG_LOGGING_SLIMPROTO="info"
 CONFIG_LOGGING_STREAM="info"
 CONFIG_LOGGING_DECODE="info"
 CONFIG_LOGGING_OUTPUT="info"
-CONFIG_JACK_LOCKED=y
-CONFIG_BAT_LOCKED=y
-CONFIG_I2C_LOCKED=y
-CONFIG_SPDIF_LOCKED=y
-CONFIG_LED_LOCKED=y
-CONFIG_SPKFAULT_LOCKED=y
-CONFIG_SQUEEZEAMP=y
-# CONFIG_A1S is not set
 # CONFIG_BASIC_I2C_BT is not set
-CONFIG_I2S_NUM=0
-CONFIG_I2S_BCK_IO=33
-CONFIG_I2S_WS_IO=25
-CONFIG_I2S_DO_IO=32
-CONFIG_I2S_DI_IO=-1
-CONFIG_SDIF_NUM=0
-CONFIG_SPDIF_BCK_IO=33
-CONFIG_SPDIF_WS_IO=25
-CONFIG_SPDIF_DO_IO=15
 CONFIG_A2DP_SINK_NAME="SMSL BT4.2"
 CONFIG_A2DP_DEV_NAME="Squeezelite"
 CONFIG_A2DP_CONTROL_DELAY_MS=500
@@ -103,24 +113,6 @@ CONFIG_BT_SINK_PIN=1234
 CONFIG_AIRPLAY_SINK=y
 CONFIG_AIRPLAY_NAME="ESP32-AirPlay"
 CONFIG_AIRPLAY_PORT="5000"
-CONFIG_DISPLAY_CONFIG=""
-CONFIG_I2C_CONFIG=""
-CONFIG_SPI_CONFIG=""
-CONFIG_SET_GPIO=""
-CONFIG_ROTARY_ENCODER=""
-CONFIG_LED_GREEN_GPIO=12
-CONFIG_LED_GREEN_GPIO_LEVEL=0
-CONFIG_LED_RED_GPIO=13
-CONFIG_LED_RED_GPIO_LEVEL=0
-CONFIG_JACK_GPIO=34
-CONFIG_JACK_GPIO_LEVEL=0
-CONFIG_SPKFAULT_GPIO=2
-CONFIG_SPKFAULT_GPIO_LEVEL=0
-CONFIG_BAT_CHANNEL=7
-CONFIG_BAT_SCALE="20.24"
-CONFIG_SPDIF_CONFIG="bck=33,ws=25,do=15"
-CONFIG_DAC_CONFIG="model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14:0"
-CONFIG_MUTE_GPIO_LEVEL=-1
 CONFIG_WIFI_MANAGER_TASK_PRIORITY=5
 CONFIG_WIFI_MANAGER_MAX_RETRY=2
 CONFIG_DEFAULT_AP_SSID="squeezelite"
diff --git a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults
index 031308b7..be214cdc 100644
--- a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults
+++ b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults
@@ -6,6 +6,33 @@ CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
+# SqueezeAMP defaults
+CONFIG_SQUEEZEAMP=y
+CONFIG_JACK_LOCKED=y
+CONFIG_BAT_LOCKED=y
+CONFIG_I2C_LOCKED=y
+CONFIG_LED_LOCKED=y
+CONFIG_DISPLAY_CONFIG=""
+CONFIG_I2C_CONFIG=""
+CONFIG_SPI_CONFIG=""
+CONFIG_SET_GPIO=""
+CONFIG_ROTARY_ENCODER=""
+CONFIG_LED_GREEN_GPIO=12
+CONFIG_LED_GREEN_GPIO_LEVEL=0
+CONFIG_LED_RED_GPIO=13
+CONFIG_LED_RED_GPIO_LEVEL=0
+CONFIG_JACK_GPIO=34
+CONFIG_JACK_GPIO_LEVEL=0
+CONFIG_SPKFAULT_GPIO=2
+CONFIG_SPKFAULT_GPIO_LEVEL=0
+CONFIG_BAT_CHANNEL=7
+CONFIG_BAT_SCALE="20.24"
+CONFIG_I2S_NUM=0
+CONFIG_SPDIF_NUM=0
+CONFIG_SPDIF_CONFIG="bck=33,ws=25,do=15"
+CONFIG_DAC_CONFIG="model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14"
+CONFIG_MUTE_GPIO_LEVEL=-1
+
 #
 # SDK tool configuration
 #
@@ -74,24 +101,6 @@ CONFIG_LOGGING_SLIMPROTO="info"
 CONFIG_LOGGING_STREAM="info"
 CONFIG_LOGGING_DECODE="info"
 CONFIG_LOGGING_OUTPUT="info"
-CONFIG_JACK_LOCKED=y
-CONFIG_BAT_LOCKED=y
-CONFIG_I2C_LOCKED=y
-CONFIG_SPDIF_LOCKED=y
-CONFIG_LED_LOCKED=y
-CONFIG_SPKFAULT_LOCKED=y
-CONFIG_SQUEEZEAMP=y
-# CONFIG_A1S is not set
-# CONFIG_BASIC_I2C_BT is not set
-CONFIG_I2S_NUM=0
-CONFIG_I2S_BCK_IO=33
-CONFIG_I2S_WS_IO=25
-CONFIG_I2S_DO_IO=32
-CONFIG_I2S_DI_IO=-1
-CONFIG_SDIF_NUM=0
-CONFIG_SPDIF_BCK_IO=33
-CONFIG_SPDIF_WS_IO=25
-CONFIG_SPDIF_DO_IO=15
 CONFIG_A2DP_SINK_NAME="SMSL BT4.2"
 CONFIG_A2DP_DEV_NAME="Squeezelite"
 CONFIG_A2DP_CONTROL_DELAY_MS=500
@@ -102,24 +111,6 @@ CONFIG_BT_SINK_PIN=1234
 CONFIG_AIRPLAY_SINK=y
 CONFIG_AIRPLAY_NAME="ESP32-AirPlay"
 CONFIG_AIRPLAY_PORT="5000"
-CONFIG_DISPLAY_CONFIG=""
-CONFIG_I2C_CONFIG=""
-CONFIG_SPI_CONFIG=""
-CONFIG_SET_GPIO=""
-CONFIG_ROTARY_ENCODER=""
-CONFIG_LED_GREEN_GPIO=12
-CONFIG_LED_GREEN_GPIO_LEVEL=0
-CONFIG_LED_RED_GPIO=13
-CONFIG_LED_RED_GPIO_LEVEL=0
-CONFIG_JACK_GPIO=34
-CONFIG_JACK_GPIO_LEVEL=0
-CONFIG_SPKFAULT_GPIO=2
-CONFIG_SPKFAULT_GPIO_LEVEL=0
-CONFIG_BAT_CHANNEL=7
-CONFIG_BAT_SCALE="20.24"
-CONFIG_SPDIF_CONFIG="bck=33,ws=25,do=15"
-CONFIG_DAC_CONFIG="model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14"
-CONFIG_MUTE_GPIO_LEVEL=-1
 CONFIG_WIFI_MANAGER_TASK_PRIORITY=5
 CONFIG_WIFI_MANAGER_MAX_RETRY=2
 CONFIG_DEFAULT_AP_SSID="squeezelite"