diff --git a/platformio.ini b/platformio.ini
index db3b64c2..3c3f9ef4 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -890,10 +890,6 @@ build_flags =
   -D SR_DMTYPE=4 -D MCLK_PIN=0 -D I2S_SDPIN=25 -D I2S_WSPIN=15 -D I2S_CKPIN=14   ; for audio Line-In shield
   -D SR_SQUELCH=2 -D SR_GAIN=40 -D SR_FREQ_PROF=1                                ; CS5343 Line-In specific
 
-[Board_ESP32_16MB] ; ESP32 with 16MB Flash
-board = esp32_16MB 
-board_build.partitions = tools/WLED_ESP32_16MB.csv
-
 [Debug_Flags]
 build_flags = 
   -D WLED_DEBUG ; lots of generic debug messages
@@ -931,9 +927,11 @@ build_flags = ${esp32_4MB_XL_base.build_flags}
 ; Flash: [==========]  95.3% (used 1499037 bytes from 1572864 bytes)
 
 [env:esp32_16MB_M]
-extends = esp32_4MB_M_base, Board_ESP32_16MB
+extends = esp32_4MB_M_base
 build_flags = ${esp32_4MB_M_base.build_flags}
   -D WLED_RELEASE_NAME=esp32_16MB_M
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
   ; RAM:   [==        ]  24.4% (used 79916 bytes from 327680 bytes)
   ; Flash: [=======   ]  67.0% (used 1405701 bytes from 2097152 bytes)
 ;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
@@ -951,7 +949,7 @@ monitor_filters = esp32_exception_decoder
 ; Flash: [========= ]  94.5% (used 1487113 bytes from 1572864 bytes)
 
 [env:esp32_16MB_M_debug]
-extends = esp32_4MB_M_base, Board_ESP32_16MB
+extends = esp32_4MB_M_base
 build_unflags = ${common.build_unflags} 
   -D CORE_DEBUG_LEVEL=0
 build_flags = ${esp32_4MB_M_base.build_flags} 
@@ -959,13 +957,17 @@ build_flags = ${esp32_4MB_M_base.build_flags}
   -D CORE_DEBUG_LEVEL=2   ;; 2=warning
   -D WLED_RELEASE_NAME=esp32_16MB_M_debug
 monitor_filters = esp32_exception_decoder
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 ; RAM:   [==        ]  24.5% (used 80292 bytes from 327680 bytes)
 ; Flash: [=======   ]  70.9% (used 1487129 bytes from 2097152 bytes)
 
 [env:esp32_16MB_XL]
-extends = esp32_4MB_XL_base, Board_ESP32_16MB
+extends = esp32_4MB_XL_base
 build_flags = ${esp32_4MB_XL_base.build_flags}
   -D WLED_RELEASE_NAME=esp32_16MB_XL
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
   ; RAM:   [==        ]  24.4% (used 79916 bytes from 327680 bytes)
   ; Flash: [=======   ]  67.0% (used 1405701 bytes from 2097152 bytes)
 ;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
@@ -1172,7 +1174,7 @@ board_build.partitions = tools/WLED_ESP32_16MB.csv
   ; Flash: [=======   ]  72.9% (used 1528253 bytes from 2097152 bytes)
 
 [env:esp32_16MB_V4_M_debug]
-extends = esp32_4MB_V4_M_base, Board_ESP32_16MB
+extends = esp32_4MB_V4_M_base
 build_unflags = ${common.build_unflags}
   -D CORE_DEBUG_LEVEL=0
 build_flags = ${esp32_4MB_V4_M_base.build_flags}
@@ -1181,6 +1183,8 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
   -D WLED_RELEASE_NAME=esp32_16MB_V4_M_debug
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 monitor_filters = esp32_exception_decoder
 ; RAM:   [===       ]  25.0% (used 82008 bytes from 327680 bytes)
 ; Flash: [========  ]  78.1% (used 1638193 bytes from 2097152 bytes) WLEDMM: Earlier 76.9
@@ -1409,43 +1413,53 @@ build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags} ${Shield_LineIn.build
 extends = wemos_shield_esp32_4MB_M_base
 build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_M
-board = ${Board_ESP32_16MB.board}
-board_build.partitions = ${Board_ESP32_16MB.board_build.partitions}
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 ; RAM:   [==        ]  24.4% (used 79820 bytes from 327680 bytes)
 ; Flash: [=======   ]  66.4% (used 1393421 bytes from 2097152 bytes)
 
 [env:wemos_shield_esp32_16MB_ICS4343x_M]
-extends = wemos_shield_esp32_4MB_M_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_M_base
 build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags} ${Shield_ICS4343x.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_ICS4343x_M
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 ; RAM:   [==        ]  24.4% (used 79820 bytes from 327680 bytes)
 ; Flash: [========= ]  88.6% (used 1393421 bytes from 1572864 bytes)
 
 [env:wemos_shield_esp32_16MB_ICS4343x_XL]
-extends = wemos_shield_esp32_4MB_XL_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_XL_base
 build_flags = ${wemos_shield_esp32_4MB_XL_base.build_flags} ${Shield_ICS4343x.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_ICS4343x_XL
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 ; RAM:   [==        ]  24.4% (used 80044 bytes from 327680 bytes)
 ; Flash: [=======   ]  67.9% (used 1424185 bytes from 2097152 bytes)
 
 [env:wemos_shield_esp32_16MB_SPM1423_M]
-extends = wemos_shield_esp32_4MB_M_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_M_base
 build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags} ${Shield_SPM1423.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_SPM1423_M
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 ; RAM:   [==        ]  24.4% (used 79820 bytes from 327680 bytes)
 ; Flash: [========= ]  88.6% (used 1393421 bytes from 1572864 bytes)
 
 [env:wemos_shield_esp32_16MB_SPM1423_XL]
-extends = wemos_shield_esp32_4MB_XL_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_XL_base
 build_flags = ${wemos_shield_esp32_4MB_XL_base.build_flags} ${Shield_SPM1423.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_SPM1423_XL
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 ; RAM:   [==        ]  24.4% (used 79820 bytes from 327680 bytes)
 ; Flash: [========= ]  88.6% (used 1393421 bytes from 1572864 bytes)
 
 [env:wemos_shield_esp32_16MB_LineIn_M]
-extends = wemos_shield_esp32_4MB_M_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_M_base
 build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags} ${Shield_LineIn.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_LineIn_M
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 
 ; ESP32 WLED pico board with builtin ICS-43432 microphpone
 [env:esp32_pico_4MB_M]
diff --git a/wled00/wled.h b/wled00/wled.h
index ab9852e9..dd6cf834 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2302700
+#define VERSION 2302701
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG