diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6fe5070959..f05f49baaf 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1,7 +1,7 @@
 #define ABL_BLTOUCH // Replaces RGB LED
 #define GraphicalLCD // Will work next to MKS TFT
 #define TMC_2209 // Defaults to TMC2100
-//#define ABL_UBL // Defaults to Bilinear
+#define ABL_UBL // Defaults to Bilinear
 //#define RunoutSensor // Tinymachines Lerdge Sensor
 #define RELOCATE_LED // Since the bltouch by default removed the LED, set this if you simply moved them off the hotend
 //#define E3DHermeaExtruder
diff --git a/platformio.ini b/platformio.ini
index 450fc32eb9..a1e1e991ba 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -63,7 +63,7 @@ board             = megaatmega2560
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # ATmega1280
@@ -74,7 +74,7 @@ board             = megaatmega1280
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # RAMBo
@@ -85,7 +85,7 @@ board             = reprap_rambo
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.3
@@ -96,7 +96,7 @@ board             = fysetc_f6_13
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.4
@@ -107,7 +107,7 @@ board             = fysetc_f6_14
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega644p)
@@ -117,7 +117,7 @@ platform      = atmelavr
 board         = sanguino_atmega644p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega1284p)
@@ -127,7 +127,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Melzi and clones (ATmega1284p)
@@ -137,7 +137,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags   = ${common.build_flags}
 lib_ignore    = TMCStepper
 upload_speed  = 57600
@@ -150,7 +150,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags   = ${common.build_flags}
 lib_ignore    = TMCStepper
 upload_speed  = 115200
@@ -168,7 +168,7 @@ board         = at90usb1286
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # AT90USB1286 boards using DFU bootloader
@@ -181,7 +181,7 @@ platform      = teensy
 board         = at90usb1286
 lib_deps      = ${common.lib_deps}
 lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)