diff --git a/platformio.ini b/platformio.ini
index a36de1df..bb8d1f9a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -94,7 +94,7 @@ lib_deps =
     ;https://github.com/me-no-dev/ESPAsyncWebServer/archive/master.zip
     ;https://github.com/me-no-dev/ESPAsyncTCP/archive/master.zip
 
-src_filter = +<*> -<.git/> -<examples/> -<test/> -<tests/> -<stm32f4/> -<lv_font_montserrat_*.c>
+build_src_filter = +<*> -<.git/> -<examples/> -<test/> -<tests/> -<stm32f4/> -<lv_font_montserrat_*.c>
 
 [lovyangfx]
 lib_deps =
diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
index 1fe4528e..81cff466 100644
--- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini
+++ b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
@@ -77,7 +77,7 @@ lib_ignore =
   ArduinoLog
   lv_lib_qrcode
 
-src_filter =
+build_src_filter =
   +<*>
   -<*.h>
   +<../hal/sdl2>
diff --git a/user_setups/esp32/m5stack_tough.ini b/user_setups/esp32/m5stack_tough.ini
new file mode 100644
index 00000000..983a5bce
--- /dev/null
+++ b/user_setups/esp32/m5stack_tough.ini
@@ -0,0 +1,49 @@
+;***************************************************;
+;     M5Stack Core2 with integrated touch display   ;
+;               - Custom ESP32 pcb                  ;
+;               - ILI9342C TFT                      ;
+;               - FT6336U touch controller          ;
+;***************************************************;
+
+[env:m5stack-tough]
+extends = esp32_16mb_v2
+board = esp32dev
+
+build_flags =
+    ${env.build_flags}
+    ${esp32.build_flags}
+    ${esp32.ps_ram}
+
+;region -- TFT_eSPI build options ------------------------
+    ${lcd.m5stack}
+    -D TFT_RST=-1    ; Managed by AXP_IO4
+    -D TFT_SCLK=18
+    -D TFT_DC=15
+    -D TFT_CS=5
+    -D TFT_MOSI=23
+    -D TFT_MISO=38
+    -D TFT_BCKL=-1    ; Managed by AXP_DC3 & AXP_LDO2
+    -D TOUCH_DRIVER=0x2046
+    -D TOUCH_CS=5
+    -D TOUCH_SDA=21
+    -D TOUCH_SCL=22
+    -D TOUCH_IRQ=39
+    -D TOUCH_RST=-1   ; Managed by AXP_IO4
+    -D I2C_TOUCH_FREQUENCY=400000
+    -D I2C_TOUCH_ADDRESS=0x2E
+;endregion
+
+;region -- Library options -------------------------------
+lib_deps =
+    ${env.lib_deps}
+    ${esp32.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
+    ${tft_espi.lib_deps}
+    ${ft6336.lib_deps}
+    https://github.com/fvanroie/M5Core2.git#AXP192
+
+lib_ignore =
+    ${env.lib_ignore}
+    ${esp32.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
+;endregion
diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux_sdl/linux_sdl_64bits.ini
index 0db42ec5..f319cfb5 100644
--- a/user_setups/linux_sdl/linux_sdl_64bits.ini
+++ b/user_setups/linux_sdl/linux_sdl_64bits.ini
@@ -70,7 +70,7 @@ lib_ignore =
   ArduinoLog
   lv_lib_qrcode
   
-src_filter =
+build_src_filter =
   +<*>
   -<*.h>
   +<../hal/sdl2>
diff --git a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
index fd18237b..4f4086a0 100644
--- a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
+++ b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
@@ -88,5 +88,5 @@ lib_deps =
 lib_ignore =
     lv_lib_zifont
 
-src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
+build_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 9b0fd301..37c8ad30 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
@@ -61,5 +61,5 @@ lib_ignore =
     XPT2046_Touchscreen
     lv_lib_zifont
 
-src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
+build_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 9145b4f4..5bfabb97 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
@@ -66,5 +66,5 @@ lib_deps =
 lib_ignore =
     lv_lib_zifont
 
-src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
+build_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 608a5e66..93d9cf6b 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_wifi.ini
@@ -76,5 +76,5 @@ lib_ignore =
     XPT2046_Touchscreen
     lv_lib_zifont
 
-src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/> +<espspi/>
+build_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 271a3590..f8a99d18 100644
--- a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
@@ -82,5 +82,5 @@ lib_ignore =
     XPT2046_Touchscreen
     lv_lib_zifont
     
-src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
+build_src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<lv_lib_zifont/> +<stm32f4/>
 ;endregion
diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini
index 6b4efd45..1e2b1954 100644
--- a/user_setups/win32/windows_sdl_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@@ -101,7 +101,7 @@ lib_ignore =
   ArduinoLog
   lv_lib_qrcode
   
-src_filter =
+build_src_filter =
   +<*>
   -<*.h>
   +<../hal/sdl2>