diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b0d37da0f0..c9cfaaca62 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1226,7 +1226,7 @@
 
   //#define MENU_ADDAUTOSTART               // Add a menu option to run auto#.g files
 
-  #define EVENT_GCODE_SD_STOP "G28XY"       // G-code to run on Stop Print (e.g., "G28XY" or "G27")
+  #define EVENT_GCODE_SD_ABORT "G28XY"       // G-code to run on Stop Print (e.g., "G28XY" or "G27")
 
   #if ENABLED(PRINTER_EVENT_LEDS)
     #define PE_LEDS_COMPLETED_TIME  (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 7bc40b2127..2ffa2ee5b8 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -126,7 +126,7 @@
      * Move the Z probe (or just the nozzle) to the safe homing point
      * (Z is already at the right height)
      */
-    destination.set(safe_homing_xy, current_position.z);
+    destination.set((xy_float_t){ Z_SAFE_HOMING_X_POINT - home_offset[X_AXIS], Z_SAFE_HOMING_Y_POINT - home_offset[Y_AXIS] }, current_position.z);
 
     TERN_(HOMING_Z_WITH_PROBE, destination -= probe.offset_xy);
 
diff --git a/platformio.ini b/platformio.ini
index 47a0925ea7..acdc207c5b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -24,7 +24,6 @@ default_envs = Mini
   Workhorse
   TazPro
 include_dir  = Marlin
-
 #
 # The 'common' values are used for most Marlin builds
 #
@@ -53,12 +52,12 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/menu/menu_touch_screen.cpp>
   -<src/lcd/menu/menu_ubl.cpp>
   -<src/lcd/extui/lib/mks_ui>
-  -<src/lcd/extui/lib/dgus> -<src/lcd/extui_dgus_lcd.cpp>
-  -<src/lcd/extui_example.cpp>
-  -<src/lcd/extui_malyan_lcd.cpp>
+  -<src/lcd/extui/lib/dgus> -<src/lcd/extui/dgus_lcd.cpp>
+  -<src/lcd/extui/example.cpp>
+  -<src/lcd/extui/malyan_lcd.cpp>
   -<src/lcd/extui/lib/ftdi_eve_touch_ui>
   -<src/lcd/extui/lib/anycubic_i3mega>
-  -<src/lcd/extui_anycubic_tft.cpp>
+  -<src/lcd/extui/anycubic_tft.cpp>
   -<src/lcd/lcdprint.cpp>
   -<src/sd/usb_flashdrive>
   -<src/feature/backlash.cpp>
@@ -157,7 +156,6 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/host/M360.cpp>
   -<src/gcode/host/M876.cpp>
   -<src/gcode/lcd/M0_M1.cpp>
-  -<src/gcode/lcd/M145.cpp>
   -<src/gcode/lcd/M250.cpp>
   -<src/gcode/lcd/M73.cpp>
   -<src/gcode/lcd/M995.cpp>
@@ -245,11 +243,11 @@ HAS_MENU_TMC            = src_filter=+<src/lcd/menu/menu_tmc.cpp>
 HAS_MENU_TOUCH_SCREEN   = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
 HAS_MENU_UBL            = src_filter=+<src/lcd/menu/menu_ubl.cpp>
 ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/lib/anycubic_i3mega>
-HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui_dgus_lcd.cpp>
+HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/dgus_lcd.cpp>
 TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
-HAS_ANYCUBIC_TFT_EXTUI  = src_filter=+<src/lcd/extui_anycubic_tft.cpp>
-EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui_example.cpp>
-MALYAN_LCD              = src_filter=+<src/lcd/extui_malyan_lcd.cpp>
+HAS_ANYCUBIC_TFT_EXTUI  = src_filter=+<src/lcd/extui/anycubic_tft.cpp>
+EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example.cpp>
+MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
 HAS_SPI_LCD             = src_filter=+<src/lcd/lcdprint.cpp>
 USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive>
 AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>
@@ -294,8 +292,7 @@ MK2_MULTIPLEXER         = src_filter=+<src/feature/snmm.cpp>
 EXT_SOLENOID|MANUAL_SOLENOID_CONTROL = src_filter=+<src/feature/solenoid.cpp>
 HAS_CUTTER              = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp>
 EXPERIMENTAL_I2CBUS     = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c>
-Z_STEPPER_AUTO_ALIGN    = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp>
-MECHANICAL_GANTRY_CALIBRATION = src_filter=+<src/gcode/calibrate/G34_M422.cpp>
+MECHANICAL_GANTRY_CALIBRATION|Z_STEPPER_AUTO_ALIGN    = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp>
 G26_MESH_VALIDATION     = src_filter=+<src/gcode/bedlevel/G26.cpp>
 ASSISTED_TRAMMING       = src_filter=+<src/gcode/bedlevel/G35.cpp>
 HAS_MESH                = src_filter=+<src/gcode/bedlevel/G42.cpp>
@@ -335,7 +332,6 @@ HOST_KEEPALIVE_FEATURE  = src_filter=+<src/gcode/host/M113.cpp>
 REPETIER_GCODE_M360     = src_filter=+<src/gcode/host/M360.cpp>
 HAS_GCODE_M876          = src_filter=+<src/gcode/host/M876.cpp>
 HAS_RESUME_CONTINUE     = src_filter=+<src/gcode/lcd/M0_M1.cpp>
-HAS_PREHEAT_COUNT       = src_filter=+<src/gcode/lcd/M145.cpp>
 HAS_LCD_CONTRAST        = src_filter=+<src/gcode/lcd/M250.cpp>
 LCD_SET_PROGRESS_MANUALLY = src_filter=+<src/gcode/lcd/M73.cpp>
 TOUCH_SCREEN_CALIBRATION = src_filter=+<src/gcode/lcd/M995.cpp>