diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini
index 7e8db8a9..0d389d03 100644
--- a/ESP32_AP-Flasher/platformio.ini
+++ b/ESP32_AP-Flasher/platformio.ini
@@ -27,6 +27,13 @@ board_build.filesystem = littlefs
 monitor_filters = esp32_exception_decoder
 monitor_speed = 115200
 board_build.f_cpu = 240000000L
+build_flags =
+	-D BUILD_ENV_NAME=$PIOENV
+	-D BUILD_TIME=$UNIX_TIME
+	-D USER_SETUP_LOADED
+	-D DISABLE_ALL_LIBRARY_WARNINGS
+	-D ILI9341_DRIVER
+	-D SMOOTH_FONT
 
 ; ----------------------------------------------------------------------------------------
 ; !!! this configuration expects the Mini_AP
@@ -39,8 +46,7 @@ board_build.partitions = default.csv
 build_unflags =
   -D CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
 build_flags = 
-	-D BUILD_ENV_NAME=$PIOENV
-	-D BUILD_TIME=$UNIX_TIME
+	${env.build_flags}
 	-D OPENEPAPERLINK_MINI_AP_PCB
 	-D ARDUINO_USB_MODE=0
 	-D CONFIG_SPIRAM_USE_MALLOC=1
@@ -59,10 +65,6 @@ build_flags =
   	-D FLASHER_AP_TEST=12
   	-D FLASHER_LED=15
   	-D FLASHER_RGB_LED=33
-	-D USER_SETUP_LOADED
-	-D DISABLE_ALL_LIBRARY_WARNINGS
-	-D ILI9341_DRIVER
-	-D SMOOTH_FONT
 build_src_filter = 
    +<*>-<usbflasher.cpp>-<serialconsole.cpp>
 board_build.psram_type=qspi_opi
@@ -81,8 +83,7 @@ board_build.partitions = default.csv
 build_unflags =
   -D CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
 build_flags = 
-	-D BUILD_ENV_NAME=$PIOENV
-	-D BUILD_TIME=$UNIX_TIME
+	${env.build_flags}
 	-D OPENEPAPERLINK_NANO_AP_PCB
 	-D ARDUINO_USB_MODE=0
 	-D CONFIG_SPIRAM_USE_MALLOC=1
@@ -99,10 +100,6 @@ build_flags =
   	-D FLASHER_AP_TEST=36
   	-D FLASHER_LED=15
   	-D FLASHER_RGB_LED=-1
-	-D USER_SETUP_LOADED
-	-D DISABLE_ALL_LIBRARY_WARNINGS
-	-D ILI9341_DRIVER
-	-D SMOOTH_FONT
 build_src_filter = 
    +<*>-<usbflasher.cpp>-<serialconsole.cpp>
 board_build.psram_type=qspi_opi
@@ -122,8 +119,7 @@ build_unflags =
   -D ARDUINO_USB_MODE=1
   -D CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
 build_flags = 
-	-D BUILD_ENV_NAME=$PIOENV
-	-D BUILD_TIME=$UNIX_TIME
+	${env.build_flags}
 	-D OPENEPAPERLINK_PCB
 	-D ARDUINO_USB_MODE=0
 	-D CONFIG_ESP32S3_SPIRAM_SUPPORT=1
@@ -163,10 +159,6 @@ build_flags =
 	-D FLASHER_ALT_TEST=13
 	-D FLASHER_LED=21
 	-D FLASHER_RGB_LED=48
-	-D USER_SETUP_LOADED
-	-D DISABLE_ALL_LIBRARY_WARNINGS
-	-D ILI9341_DRIVER
-	-D SMOOTH_FONT
 board_build.flash_mode=qio
 board_build.arduino.memory_type = qio_opi
 board_build.psram_type=qspi_opi
@@ -182,8 +174,7 @@ board_upload.flash_size = 16MB
 board = esp32dev
 board_build.partitions = default.csv
 build_flags = 
-	-D BUILD_ENV_NAME=$PIOENV
-	-D BUILD_TIME=$UNIX_TIME
+	${env.build_flags}
 	-D CORE_DEBUG_LEVEL=0
 	-D SIMPLE_AP
 	-D FLASHER_AP_SS=5
@@ -196,10 +187,6 @@ build_flags =
 	-D FLASHER_AP_TXD=17
 	-D FLASHER_AP_RXD=16
 	-D FLASHER_LED=22
-	-D USER_SETUP_LOADED
-	-D DISABLE_ALL_LIBRARY_WARNINGS
-	-D ILI9341_DRIVER
-	-D SMOOTH_FONT
 build_src_filter = 
    +<*>-<usbflasher.cpp>-<serialconsole.cpp>
 
@@ -211,8 +198,7 @@ build_src_filter =
 board = wemos_d1_mini32
 board_build.partitions = default.csv
 build_flags = 
-	-D BUILD_ENV_NAME=$PIOENV
-	-D BUILD_TIME=$UNIX_TIME
+	${env.build_flags}
 	-D CORE_DEBUG_LEVEL=0
 
 	-D POWER_NO_SOFT_POWER
@@ -227,10 +213,6 @@ build_flags =
 	-D FLASHER_AP_TXD=16
 	-D FLASHER_AP_RXD=17
 	-D FLASHER_LED=22
-	-D USER_SETUP_LOADED
-	-D DISABLE_ALL_LIBRARY_WARNINGS
-	-D ILI9341_DRIVER
-	-D SMOOTH_FONT
 build_src_filter = 
    +<*>-<usbflasher.cpp>-<serialconsole.cpp>
 
@@ -243,8 +225,7 @@ platform = espressif32
 board = m5stack-core-esp32
 board_build.partitions = esp32_sdcard.csv
 build_flags = 
-	-D BUILD_ENV_NAME=$PIOENV
-	-D BUILD_TIME=$UNIX_TIME
+	${env.build_flags}
 	-D CORE_DEBUG_LEVEL=0
 
 	-D POWER_NO_SOFT_POWER