diff --git a/platformio.ini b/platformio.ini
index 1ff2c8c0..e4623b74 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,6 +23,13 @@ default_envs =
     ; You can also create new environments in in platformio_override.ini
     ${override.extra_default_envs}
 
+[override]
+; -- By default there are no ${override.build_flags} set
+; -- to use it, copy the platformio_override.ini file from the template
+build_flags =
+extra_default_envs =
+
+
 ;***************************************************
 ;          Common environment settings
 ;***************************************************
@@ -51,7 +58,7 @@ build_flags =
     ${override.build_flags}
     -D HASP_VERSION_MAJOR=0
     -D HASP_VERSION_MINOR=2
-    -D HASP_VERSION_REVISION=1126
+    -D HASP_VERSION_REVISION=1129
 
 ; -- Shared library dependencies in all environments
 lib_deps =
@@ -104,14 +111,14 @@ build_flags =
 ; -- LittleFS build options ------------------------
 	-D CONFIG_LITTLEFS_FOR_IDF_3_2
 
-lib_deps =
-    LittleFS_esp32
-
 lib_ignore =
     GxTFT
     XPT2046_Touchscreen
     ESP32 BLE Arduino
 
+lib_deps = LittleFS_esp32
+
+
 ; -- Platform specific build flags
 [esp8266]
 build_flags=
@@ -134,12 +141,12 @@ build_flags=
     -D HASP_USE_GPIO=1
     -D HASP_USE_ETHERNET=0
 
-lib_deps =
-
 lib_ignore =
     GxTFT
     XPT2046_Touchscreen
 
+lib_deps =
+
 
 [flags]
 stm32_flags=
@@ -150,12 +157,6 @@ stm32_flags=
     -D STM32
     -D STREAMUTILS_USE_EEPROM_UPDATE=1  ; update cell only when changed
 
-; -- By default there are no ${override.build_flags} set
-; -- to use it, copy the platformio_override.ini file from the template
-[override]
-build_flags =
-extra_default_envs =
-
 ;***************************************************
 ;          Hardware options
 ;***************************************************
diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index 053db80f..a8b34b65 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -16,7 +16,8 @@ board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     ${pins.vspi32}
     -D TFT_DC=5
@@ -24,12 +25,15 @@ build_flags =
     -D TFT_RST=-1  ; RST
     -D TFT_BCKL=-1 ; None, configurable via web UI (e.g. 21)
     -D TOUCH_CS=17 ; (can also be 22 or 16)
+;endregion
 
-
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+;endregion
+    
\ No newline at end of file
diff --git a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
index feba7da7..84f73d5a 100644
--- a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
+++ b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini
@@ -15,7 +15,8 @@ board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
     ;-D ST7796_DRIVER=1 ;3.95inch Arduino Display-UNO
      -D ILI9486_DRIVER=1 ;3.5inch Arduino Display-UNO
@@ -42,14 +43,17 @@ build_flags =
     -D SPI_FREQUENCY=40000000
     ;-D SPI_TOUCH_FREQUENCY=2500000 ; Uses ADC instead
     -D SPI_READ_FREQUENCY=20000000
+;endregion
+
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-; -- Library options -------------------------------
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+;endregion
diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini
index ceeea08f..5dee6202 100644
--- a/user_setups/esp32/esp32-dev_ili9488.ini
+++ b/user_setups/esp32/esp32-dev_ili9488.ini
@@ -22,7 +22,8 @@ debug_init_break = tbreak setup
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
     -D ILI9488_DRIVER=1
     -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
@@ -41,15 +42,17 @@ build_flags =
     -D SPI_FREQUENCY=27000000
     -D SPI_TOUCH_FREQUENCY=2500000
     -D SPI_READ_FREQUENCY=16000000
+;endregion
 
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-; -- Library options -------------------------------
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+;endregion
diff --git a/user_setups/esp32/esp32-dev_ili9488_parallel.ini b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
index 1635f99b..560dacb4 100644
--- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini
+++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
@@ -19,7 +19,8 @@ debug_init_break = tbreak setup
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.mrb3511}
     -D TFT_BCKL=5  ;None, configurable via web UI (e.g. 2 for D4)
     -D TFT_CS=33  ; Chip select control pin
@@ -39,10 +40,12 @@ build_flags =
     -D TOUCH_SCL=22
     -D TOUCH_IRQ=34   ; use 34-39 as these are input only pins
     -D TOUCH_RST=-1   ; not used, connected to 3.3V
+;endregion
+
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-; -- Library options -------------------------------
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
@@ -52,4 +55,5 @@ lib_deps =
 
 lib_ignore =
     ${env.lib_ignore}
-    ; ${esp32.lib_ignore}
\ No newline at end of file
+    ; ${esp32.lib_ignore}
+;endregion
diff --git a/user_setups/esp32/esp32cam_st7796.ini b/user_setups/esp32/esp32cam_st7796.ini
index 6b5651bf..7d327a7a 100644
--- a/user_setups/esp32/esp32cam_st7796.ini
+++ b/user_setups/esp32/esp32cam_st7796.ini
@@ -25,25 +25,29 @@ board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-; -- TFT_eSPI build options ------------------------
+    -DBOARD_HAS_PSRAM
+    -mfix-esp32-psram-cache-issue
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.raspberrypi}
     -D USE_HSPI_PORT
     ${pins.hspi32}
-    -DBOARD_HAS_PSRAM
     -D TFT_CS=15
     -D TFT_DC=2
     -D TFT_RST=-1    ; 3.3v
     -D TOUCH_CS=0   ; 3   ; RX
     -D TFT_BCKL=-1
+;endregion
 
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-; -- Library options -------------------------------
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+;endregion
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index b8c533c2..9769678e 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -20,7 +20,8 @@ build_flags =
     ${esp32.build_flags}
     -DBOARD_HAS_PSRAM
     -mfix-esp32-psram-cache-issue
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     ${pins.vspi32}
     ;-D TFT_DC=5    ; Defined by board, don't redefine !!
@@ -28,11 +29,14 @@ build_flags =
     ;-D TFT_RST=-1  ; Defined by board, don't redefine !!
     -D TFT_BCKL=-1  ; None, configurable via web UI (e.g. 21)
     -D TOUCH_CS=17  ; (can also be 22 or 16)
+;endregion
 
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+;endregion
diff --git a/user_setups/esp32/nodemcu-32s_st7796.ini b/user_setups/esp32/nodemcu-32s_st7796.ini
index a2074089..8323c1ef 100644
--- a/user_setups/esp32/nodemcu-32s_st7796.ini
+++ b/user_setups/esp32/nodemcu-32s_st7796.ini
@@ -18,22 +18,25 @@ debug_init_break = tbreak setup
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.raspberrypi}
     ${pins.vspi32}
     -D TFT_CS=15
     -D TFT_DC=4
     -D TFT_RST=32
     -D TOUCH_CS=22
+;endregion
 
 ; -- Debugging options -----------------------------
 ;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-; -- Library options -------------------------------
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+;endregion
diff --git a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
index 6a2c1f0e..2f5b418f 100644
--- a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
+++ b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
@@ -22,7 +22,8 @@ board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv
 build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     -D TFT_MISO=2
     -D TFT_MOSI=15
@@ -32,14 +33,19 @@ build_flags =
     -D TFT_RST=12  ; RST
     -D TFT_BCKL=16 ; None, configurable via web UI (e.g. 21)
     -D TOUCH_CS=32 ; (can also be 22 or 16)
-; -- Options ----------------------------------------
+;endregion
+
+;region -- Hasp build options ----------------------------
     -D HASP_USE_ETHERNET=1
     -D HASP_USE_WIFI=0
+;endregion
 
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp32.lib_ignore}
\ No newline at end of file
+    ${esp32.lib_ignore}
+;endregion
diff --git a/user_setups/esp8266/d1-mini-esp8266_ili9341.ini b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
index e809153c..c9998782 100644
--- a/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
+++ b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini
@@ -18,7 +18,8 @@ board_build.f_cpu = 160000000L ; set frequency to 160MHz
 build_flags =
     ${env.build_flags}
     ${esp8266.build_flags}
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     ;-D TFT_MISO=12 ;D6  Use default HSPI
     ;-D TFT_MOSI=13 ;D7  Use default HSPI
@@ -28,8 +29,9 @@ build_flags =
     -D TFT_BCKL=-1  ;None, configurable via web UI (e.g. 2 for D4)
     -D TOUCH_CS=0   ;D3  (can also be D1 or D2)
     -D TFT_RST=-1   ;RST
+;endregion
 
-; -- Library options -------------------------------
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp8266.lib_deps}
@@ -37,4 +39,5 @@ lib_deps =
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp8266.lib_ignore}
\ No newline at end of file
+    ${esp8266.lib_ignore}
+;endregion
diff --git a/user_setups/esp8266/esp8266_st7735.ini b/user_setups/esp8266/esp8266_st7735.ini
index b07a34d4..d1637bcc 100644
--- a/user_setups/esp8266/esp8266_st7735.ini
+++ b/user_setups/esp8266/esp8266_st7735.ini
@@ -16,7 +16,8 @@ board_build.f_cpu = 160000000L ; set frequency to 160MHz
 build_flags =
     ${env.build_flags}
     ${esp8266.build_flags}
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     -D USER_SETUP_LOADED=1
     -D ST7735_DRIVER=1
     -D ST7735_BLACKTAB=1
@@ -32,8 +33,9 @@ build_flags =
     -D TOUCH_CS=-1 ;NC
     -D TFT_RST=2   ;D4
     -D SPI_FREQUENCY=27000000
+;endregion
 
-; -- Library options -------------------------------
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     ${esp8266.lib_deps}
@@ -41,4 +43,5 @@ lib_deps =
 
 lib_ignore =
     ${env.lib_ignore}
-    ${esp8266.lib_ignore}
\ No newline at end of file
+    ${esp8266.lib_ignore}
+;endregion
diff --git a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
index 7fa01018..e9f38e8b 100644
--- a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
+++ b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
@@ -33,7 +33,8 @@ build_flags =
     -I include/stm32f4
     -I include/GxTFT/src
     -I include/GxTFT/src/GxCTRL/GxCTRL_ILI9341
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     -D ILI9341_DRIVER=1
     -D TFT_WIDTH=240
     -D TFT_HEIGHT=320
@@ -44,6 +45,9 @@ build_flags =
     ;-D STM32
     ;-D TFT_SPI3
     ;-D USE_DMA_TO_TFT
+;endregion
+
+;region -- Hasp build options ----------------------------
     -D HASP_USE_TASMOTA_SLAVE=0
     -D HASP_OUTPUT_PIN=PA1          ; User LED D2 on DevEBox board 
     -D HASP_INPUT_PIN=PA0           ; User Button K1 on DevEBox board
@@ -58,11 +62,16 @@ build_flags =
     -D HASP_USE_EEPROM=1
     -D HASP_USE_GPIO=0
     -D HASP_USE_ETHERNET=0
+;endregion
+
+;region -- Network build options -------------------------
     -D USE_BUILTIN_ETHERNET=0
     -D HAL_ETH_MODULE_ENABLED=0
     ; -D LAN8742A_PHY_ADDRESS=0x01U ; moved to include\stm32f4\hal_conf_custom.h
     ; -D DP83848_PHY_ADDRESS=0x01U
+;endregion
 
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     Ticker@^3.1.5
@@ -79,3 +88,4 @@ lib_ignore =
     lv_lib_zifont
 
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
+;endregion
\ No newline at end of file
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
index 60b44ffd..cd00ef63 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
@@ -14,7 +14,8 @@ monitor_port = COM7     ; To change the port, use platform_override.ini
 build_flags =
     ${flags.stm32_flags}
     -I include/stm32f4
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     ;-D TFT_MISO=PB4 ;Default
     ;-D TFT_MOSI=PB5 ;Default
@@ -24,19 +25,28 @@ build_flags =
     -D TFT_BCKL=-1 ;None, configurable via web UI (e.g. 2 for D4)
     -D TOUCH_CS=PA6 ;NC
     -D TFT_RST=-1  ;D4
-    -D HASP_OUTPUT_PIN=PE0 ; User LED D2 on DevEBox board
-    -D HASP_INPUT_PIN=PD15 ; User Button K1 on DevEBox board
+;endregion
+
     -D STM32_SERIAL1 ; Set this option to use Serial1 as default sersial port, leave out if using Serial2
     ;-D HAL_ETH_MODULE_ENABLED=1         ; enable ethernet support
     ;-D LAN8742A_PHY_ADDRESS=0x01U       ; set LAN8720 PHY address
+
+;region -- Hasp build options ----------------------------
+    -D HASP_OUTPUT_PIN=PE0 ; User LED D2 on DevEBox board
+    -D HASP_INPUT_PIN=PD15 ; User Button K1 on DevEBox board
     -D HASP_USE_TASMOTA_SLAVE=1
     -D HASP_USE_ETHERNET=1
+;endregion
+
+;region -- Network build options -------------------------
     -D W5500_MOSI=PB15 ;SPI2 MOSI
     -D W5500_MISO=PB14 ;SPI2 MISO
     -D W5500_SCLK=PB13 ;SPI2 SCLK
     -D W5500_CS=PB6 ;SPI2 CS
     -D W5500_RST=PD1 ;SPI2 CS
+;endregion
 
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     Ticker@^3.1.5
@@ -53,5 +63,4 @@ lib_ignore =
     lv_lib_zifont
 
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
-
-;***************************************************
+;endregion
\ No newline at end of file
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
index 2cadc47b..58886aad 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
@@ -14,7 +14,8 @@ monitor_port = COM7     ; To change the port, use platform_override.ini
 build_flags =
     ${flags.stm32_flags}
     -I include/stm32f4
-; -- TFT_eSPI build options ------------------------
+    
+;region -- TFT_eSPI build options ------------------------
     -D ILI9341_DRIVER=1
     -D TFT_WIDTH=240
     -D TFT_HEIGHT=320
@@ -40,15 +41,20 @@ build_flags =
     ; -D TOUCH_CS=PB12
     ; -D TOUCH_IRQ=PC5   ; use 34-39 as these are input only pins
     ; -D TOUCH_RST=-1   ; not used, connected to 3.3V
+;endregion
+
+;region -- Hasp build options ----------------------------
     -D HASP_OUTPUT_PIN=PA6 ; User LED D2 on MCUDev Black board
     -D HASP_INPUT_PIN=PE4 ; User Button K0 on MCUDev Black board
     -D HASP_USE_HTTP=0
     -D HASP_USE_MQTT=0
-    
-; -- Debugging options -----------------------------
-;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+;endregion
 
-; -- Library options -------------------------------
+;region -- Debugging options -----------------------------
+;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+;endregion
+
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     Ticker@^3.1.5
@@ -57,3 +63,4 @@ lib_ignore =
     lv_lib_zifont
 
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
+;endregion
\ No newline at end of file
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
index 5d19fb46..18894403 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
@@ -15,7 +15,8 @@ build_flags =
     ${flags.stm32_flags}
     -I include/stm32f4
     -I include/espspi
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     ;-D TFT_MISO=PB4 ;Default
     ;-D TFT_MOSI=PB5 ;Default
@@ -27,11 +28,15 @@ build_flags =
     -D TFT_BCKL=PA15 ;None, configurable via web UI (e.g. 2 for D4)
     -D TOUCH_CS=PA6 ;NC
     -D TFT_RST=PD13  ;D4
-    -D HASP_OUTPUT_PIN=PE0 ; User LED D2 on DevEBox board
-    -D HASP_INPUT_PIN=PD15 ; User Button K1 on DevEBox board
+;endregion
+
     -D STM32_SERIAL1 ; Set this option to use Serial1 as default sersial port, leave out if using Serial2
     ;-D HAL_ETH_MODULE_ENABLED=1         ; enable ethernet support
     ;-D LAN8742A_PHY_ADDRESS=0x01U       ; set LAN8720 PHY address
+
+;region -- Hasp build options ----------------------------
+    -D HASP_OUTPUT_PIN=PE0 ; User LED D2 on DevEBox board
+    -D HASP_INPUT_PIN=PD15 ; User Button K1 on DevEBox board
     -D HASP_USE_WIFI=1
     -D HASP_USE_MQTT=1
     -D HASP_USE_HTTP=1
@@ -43,12 +48,17 @@ build_flags =
     -D HASP_USE_GPIO=0
     -D HASP_USE_TASMOTA_SLAVE=0
     -D HASP_USE_ETHERNET=0
+;endregion
+
+;region -- Network build options -------------------------
     -D ESPSPI_MOSI=PB15 ;SPI2 MOSI
     -D ESPSPI_MISO=PB14 ;SPI2 MISO
     -D ESPSPI_SCLK=PB13 ;SPI2 SCLK
     -D ESPSPI_CS=PB6 ;SPI2 CS
     -D ESPSPI_RST=PD1 ;SPI2 CS
+;endregion
 
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     Ticker@^3.1.5
@@ -66,5 +76,4 @@ lib_ignore =
     lv_lib_zifont
 
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/> +<espspi/>
-
-;***************************************************
+;endregion
\ No newline at end of file
diff --git a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
index 0583c5c1..da640fd5 100644
--- a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
@@ -25,7 +25,8 @@ debug_tool = stlink
 build_flags =
     ${flags.stm32_flags}
     -I include/stm32f4
-; -- TFT_eSPI build options ------------------------
+
+;region -- TFT_eSPI build options ------------------------
     ${lcd.lolin24}
     ;-D TFT_MISO=PB4 ;Default
     ;-D TFT_MOSI=PB5 ;Default
@@ -39,6 +40,9 @@ build_flags =
 ;#define TFT_SPI_PORT 1 // SPI port 1 maximum clock rate is 55MHz
     -D TFT_SPI3
     -D USE_DMA_TO_TFT
+;endregion
+
+;region -- Hasp build options ----------------------------
     -D HASP_USE_WIFI=0
     -D HASP_USE_MQTT=1
     -D HASP_USE_HTTP=1
@@ -51,13 +55,19 @@ build_flags =
     -D HASP_USE_TASMOTA_SLAVE=0
     -D HASP_OUTPUT_PIN=PA1          ; User LED D2 on DevEBox board 
     -D HASP_INPUT_PIN=PA0           ; User Button K1 on DevEBox board
+;endregion
+
     -D STM32_SERIAL1                ; Set this option to use Serial1 as default sersial port, leave out if using Serial2
+
+;region -- Network build options -------------------------
     -D HASP_USE_ETHERNET=1
     -D USE_BUILTIN_ETHERNET=1
     -D HAL_ETH_MODULE_ENABLED=1
     ; -D LAN8742A_PHY_ADDRESS=0x01U ; moved to include\stm32f4\hal_conf_custom.h
     ; -D DP83848_PHY_ADDRESS=0x01U
+;endregion
 
+;region -- Library options -------------------------------
 lib_deps =
     ${env.lib_deps}
     Ticker@^3.1.5
@@ -73,3 +83,4 @@ lib_ignore =
     lv_lib_zifont
     
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
+;endregion