diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 925fa2f631..d2a65447a4 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1299,7 +1299,7 @@ void setup() {
     SETUP_RUN(password.lock_machine());      // Will not proceed until correct password provided
   #endif
 
-  #if HAS_LCD_MENU && ENABLED(TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
+  #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
     ui.check_touch_calibration();
   #endif
 
diff --git a/Marlin/src/gcode/lcd/M995.cpp b/Marlin/src/gcode/lcd/M995.cpp
index aca0401dc4..bc8dc35d4e 100644
--- a/Marlin/src/gcode/lcd/M995.cpp
+++ b/Marlin/src/gcode/lcd/M995.cpp
@@ -25,21 +25,24 @@
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
 
 #include "../gcode.h"
-#if DISABLED(TFT_LVGL_UI)
-  #include "../../lcd/menu/menu.h"
-#else
+
+#if ENABLED(TFT_LVGL_UI)
   #include "../../lcd/extui/lib/mks_ui/draw_touch_calibration.h"
+#else
+  #include "../../lcd/menu/menu.h"
 #endif
 
 /**
  * M995: Touch screen calibration for TFT display
  */
 void GcodeSuite::M995() {
-  #if DISABLED(TFT_LVGL_UI)
-    ui.goto_screen(touch_screen_calibration);
-  #else
+
+  #if ENABLED(TFT_LVGL_UI)
     lv_draw_touch_calibration_screen();
+  #else
+    ui.goto_screen(touch_screen_calibration);
   #endif
+
 }
 
 #endif // TOUCH_SCREEN_CALIBRATION
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
index ad17642605..ca338ae9b2 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
@@ -321,12 +321,10 @@ static uint8_t page;
 #if HAS_TOUCH_BUTTONS
   static bool redrawTouchButtons = true;
   static void drawTouchButtons(u8g_t *u8g, u8g_dev_t *dev) {
-    if (!redrawTouchButtons) {
-      return;
-    }
+    if (!redrawTouchButtons) return;
     redrawTouchButtons = false;
-    // Bottom buttons
 
+    // Bottom buttons
     setWindow(u8g, dev, BUTTOND_X_LO, BUTTON_Y_LO, BUTTOND_X_HI, BUTTON_Y_HI);
     drawImage(buttonD, u8g, dev, BUTTON_DRAW_WIDTH, BUTTON_DRAW_HEIGHT, TFT_BTCANCEL_COLOR);
 
@@ -471,6 +469,7 @@ uint8_t u8g_com_hal_tft_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_p
 U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT, u8g_dev_tft_320x240_upscale_from_128x64_fn, U8G_COM_HAL_TFT_FN);
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
+
   static void drawCross(uint16_t x, uint16_t y, uint16_t color) {
     tftio.set_window(x - 15, y, x + 15, y);
     tftio.WriteMultiple(color, 31);
@@ -527,6 +526,7 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT,
     } while (u8g.nextPage());
     drawing_screen = false;
   }
+
 #endif // TOUCH_SCREEN_CALIBRATION
 
 #endif // HAS_MARLINUI_U8GLIB && (FSMC_CS_PIN || HAS_SPI_GRAPHICAL_TFT)
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
index ec2c817bce..9e7c22bd7e 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
@@ -21,7 +21,7 @@
  */
 #include "../../../../inc/MarlinConfigPre.h"
 
-#if HAS_TFT_LVGL_UI && ENABLED(TOUCH_SCREEN_CALIBRATION)
+#if BOTH(HAS_TFT_LVGL_UI, TOUCH_SCREEN_CALIBRATION)
 
 #include "draw_ui.h"
 #include "draw_touch_calibration.h"
@@ -100,7 +100,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   }
 }
 
-void lv_draw_touch_calibration_screen(void) {
+void lv_draw_touch_calibration_screen() {
   disp_state_stack._disp_index = 0;
   ZERO(disp_state_stack._disp_state);
   scr = lv_screen_create(TOUCH_CALIBRATION_UI, "");
@@ -117,4 +117,4 @@ void lv_clear_touch_calibration_screen() {
   lv_obj_del(scr);
 }
 
-#endif // HAS_TFT_LVGL_UI
+#endif // HAS_TFT_LVGL_UI && TOUCH_SCREEN_CALIBRATION
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h b/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h
index 8d29be3734..b14700dcf3 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h
+++ b/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h
@@ -25,7 +25,7 @@
   extern "C" { /* C-declarations for C++ */
 #endif
 
-extern void lv_draw_touch_calibration_screen(void);
+extern void lv_draw_touch_calibration_screen();
 extern void lv_clear_touch_calibration_screen();
 extern void lv_update_touch_calibration_screen();
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
index 6f97bf130b..a2617662f8 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
@@ -1142,232 +1142,94 @@ void clear_cur_ui() {
   last_disp_state = disp_state_stack._disp_state[disp_state_stack._disp_index];
 
   switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) {
-    case PRINT_READY_UI:
-      //Get_Temperature_Flg = 0;
-      lv_clear_ready_print();
-      break;
-    case PRINT_FILE_UI:
-      lv_clear_print_file();
-      break;
-    case PRINTING_UI:
-      lv_clear_printing();
-      break;
-    case MOVE_MOTOR_UI:
-      lv_clear_move_motor();
-      break;
-    case OPERATE_UI:
-      lv_clear_operation();
-      break;
-    case PAUSE_UI:
-      //Clear_pause();
-      break;
-    case EXTRUSION_UI:
-      lv_clear_extrusion();
-      break;
-    case PRE_HEAT_UI:
-      lv_clear_preHeat();
-      break;
-    case CHANGE_SPEED_UI:
-      lv_clear_change_speed();
-      break;
-    case FAN_UI:
-      lv_clear_fan();
-      break;
-    case SET_UI:
-      lv_clear_set();
-      break;
-    case ZERO_UI:
-      lv_clear_home();
-      break;
-    case SPRAYER_UI:
-      //Clear_Sprayer();
-      break;
-    case MACHINE_UI:
-      //Clear_Machine();
-      break;
-    case LANGUAGE_UI:
-      lv_clear_language();
-      break;
-    case ABOUT_UI:
-      lv_clear_about();
-      break;
-    case LOG_UI:
-      //Clear_Connect();
-      break;
-    case DISK_UI:
-      //Clear_Disk();
-      break;
+    case PRINT_READY_UI:              //Get_Temperature_Flg = 0;
+                                      lv_clear_ready_print(); break;
+    case PRINT_FILE_UI:               lv_clear_print_file(); break;
+    case PRINTING_UI:                 lv_clear_printing(); break;
+    case MOVE_MOTOR_UI:               lv_clear_move_motor(); break;
+    case OPERATE_UI:                  lv_clear_operation(); break;
+    case PAUSE_UI:                    /* Clear_pause(); */ break;
+    case EXTRUSION_UI:                lv_clear_extrusion(); break;
+    case PRE_HEAT_UI:                 lv_clear_preHeat(); break;
+    case CHANGE_SPEED_UI:             lv_clear_change_speed(); break;
+    case FAN_UI:                      lv_clear_fan(); break;
+    case SET_UI:                      lv_clear_set(); break;
+    case ZERO_UI:                     lv_clear_home(); break;
+    case SPRAYER_UI:                  /* Clear_Sprayer(); */ break;
+    case MACHINE_UI:                  /* Clear_Machine(); */ break;
+    case LANGUAGE_UI:                 lv_clear_language(); break;
+    case ABOUT_UI:                    lv_clear_about(); break;
+    case LOG_UI:                      /* Clear_Connect(); */ break;
+    case DISK_UI:                     /* Clear_Disk(); */ break;
     #if ENABLED(USE_WIFI_FUNCTION)
-      case WIFI_UI:
-        lv_clear_wifi();
-        break;
+      case WIFI_UI:                   lv_clear_wifi(); break;
     #endif
-    case MORE_UI:
-      //Clear_more();
-      break;
-    case FILETRANSFER_UI:
-      //Clear_fileTransfer();
-      break;
-    case DIALOG_UI:
-      lv_clear_dialog();
-      break;
-    case FILETRANSFERSTATE_UI:
-      //Clear_WifiFileTransferdialog();
-      break;
-    case PRINT_MORE_UI:
-      //Clear_Printmore();
-      break;
-    case FILAMENTCHANGE_UI:
-      lv_clear_filament_change();
-      break;
-    case LEVELING_UI:
-      lv_clear_manualLevel();
-      break;
-    case BIND_UI:
-      //Clear_Bind();
-      break;
+    case MORE_UI:                     /* Clear_more(); */ break;
+    case FILETRANSFER_UI:             /* Clear_fileTransfer(); */ break;
+    case DIALOG_UI:                   lv_clear_dialog(); break;
+    case FILETRANSFERSTATE_UI:        /* Clear_WifiFileTransferdialog(); */ break;
+    case PRINT_MORE_UI:               /* Clear_Printmore(); */ break;
+    case FILAMENTCHANGE_UI:           lv_clear_filament_change(); break;
+    case LEVELING_UI:                 lv_clear_manualLevel(); break;
+    case BIND_UI:                     /* Clear_Bind(); */ break;
     #if HAS_BED_PROBE
-      case NOZZLE_PROBE_OFFSET_UI:
-        lv_clear_auto_level_offset_settings();
-        break;
+      case NOZZLE_PROBE_OFFSET_UI:    lv_clear_auto_level_offset_settings(); break;
     #endif
-    case TOOL_UI:
-      lv_clear_tool();
-      break;
-    case MESHLEVELING_UI:
-      //Clear_MeshLeveling();
-      break;
-    case HARDWARE_TEST_UI:
-      //Clear_Hardwaretest();
-      break;
+    case TOOL_UI:                     lv_clear_tool(); break;
+    case MESHLEVELING_UI:             /* Clear_MeshLeveling(); */ break;
+    case HARDWARE_TEST_UI:            /* Clear_Hardwaretest(); */ break;
     #if ENABLED(USE_WIFI_FUNCTION)
-      case WIFI_LIST_UI:
-          lv_clear_wifi_list();
-        break;
+      case WIFI_LIST_UI:              lv_clear_wifi_list(); break;
     #endif
-    case KEY_BOARD_UI:
-      lv_clear_keyboard();
-      break;
+    case KEY_BOARD_UI:                lv_clear_keyboard(); break;
     #if ENABLED(USE_WIFI_FUNCTION)
-      case WIFI_TIPS_UI:
-        lv_clear_wifi_tips();
-        break;
+      case WIFI_TIPS_UI:              lv_clear_wifi_tips(); break;
     #endif
-    case MACHINE_PARA_UI:
-      lv_clear_machine_para();
-      break;
-    case MACHINE_SETTINGS_UI:
-      lv_clear_machine_settings();
-      break;
-    case TEMPERATURE_SETTINGS_UI:
-      //Clear_TemperatureSettings();
-      break;
-    case MOTOR_SETTINGS_UI:
-      lv_clear_motor_settings();
-      break;
-    case MACHINETYPE_UI:
-      //Clear_MachineType();
-      break;
-    case STROKE_UI:
-      //Clear_Stroke();
-      break;
-    case HOME_DIR_UI:
-      //Clear_HomeDir();
-      break;
-    case ENDSTOP_TYPE_UI:
-      //Clear_EndstopType();
-      break;
-    case FILAMENT_SETTINGS_UI:
-      lv_clear_filament_settings();
-      break;
-    case LEVELING_SETTIGNS_UI:
-      //Clear_LevelingSettings();
-      break;
-    case LEVELING_PARA_UI:
-      lv_clear_level_settings();
-      break;
-    case DELTA_LEVELING_PARA_UI:
-      //Clear_DeltaLevelPara();
-      break;
-    case MANUAL_LEVELING_POSIGION_UI:
-      lv_clear_manual_level_pos_settings();
-      break;
-    case MAXFEEDRATE_UI:
-      lv_clear_max_feedrate_settings();
-      break;
-    case STEPS_UI:
-      lv_clear_step_settings();
-      break;
-    case ACCELERATION_UI:
-      lv_clear_acceleration_settings();
-      break;
-    case JERK_UI:
-      #if HAS_CLASSIC_JERK
-        lv_clear_jerk_settings();
-      #endif
-      break;
-    case MOTORDIR_UI:
-      //Clear_MotorDir();
-      break;
-    case HOMESPEED_UI:
-      //Clear_HomeSpeed();
-      break;
-    case NOZZLE_CONFIG_UI:
-      //Clear_NozzleConfig();
-      break;
-    case HOTBED_CONFIG_UI:
-      //Clear_HotbedConfig();
-      break;
-    case ADVANCED_UI:
-      lv_clear_advance_settings();
-      break;
-    case DOUBLE_Z_UI:
-      //Clear_DoubleZ();
-      break;
-    case ENABLE_INVERT_UI:
-      //Clear_EnableInvert();
-      break;
-    case NUMBER_KEY_UI:
-      lv_clear_number_key();
-      break;
-    case BABY_STEP_UI:
-      lv_clear_baby_stepping();
-      break;
-    case PAUSE_POS_UI:
-      lv_clear_pause_position();
-      break;
+    case MACHINE_PARA_UI:             lv_clear_machine_para(); break;
+    case MACHINE_SETTINGS_UI:         lv_clear_machine_settings(); break;
+    case TEMPERATURE_SETTINGS_UI:     /* Clear_TemperatureSettings(); */ break;
+    case MOTOR_SETTINGS_UI:           lv_clear_motor_settings(); break;
+    case MACHINETYPE_UI:              /* Clear_MachineType(); */ break;
+    case STROKE_UI:                   /* Clear_Stroke(); */ break;
+    case HOME_DIR_UI:                 /* Clear_HomeDir(); */ break;
+    case ENDSTOP_TYPE_UI:             /* Clear_EndstopType(); */ break;
+    case FILAMENT_SETTINGS_UI:        lv_clear_filament_settings(); break;
+    case LEVELING_SETTIGNS_UI:        /* Clear_LevelingSettings(); */ break;
+    case LEVELING_PARA_UI:            lv_clear_level_settings(); break;
+    case DELTA_LEVELING_PARA_UI:      /* Clear_DeltaLevelPara(); */ break;
+    case MANUAL_LEVELING_POSIGION_UI: lv_clear_manual_level_pos_settings(); break;
+    case MAXFEEDRATE_UI:              lv_clear_max_feedrate_settings(); break;
+    case STEPS_UI:                    lv_clear_step_settings(); break;
+    case ACCELERATION_UI:             lv_clear_acceleration_settings(); break;
+    case JERK_UI:                     TERN_(HAS_CLASSIC_JERK, lv_clear_jerk_settings()); break;
+    case MOTORDIR_UI:                 /* Clear_MotorDir(); */ break;
+    case HOMESPEED_UI:                /* Clear_HomeSpeed(); */ break;
+    case NOZZLE_CONFIG_UI:            /* Clear_NozzleConfig(); */ break;
+    case HOTBED_CONFIG_UI:            /* Clear_HotbedConfig(); */ break;
+    case ADVANCED_UI:                 lv_clear_advance_settings(); break;
+    case DOUBLE_Z_UI:                 /* Clear_DoubleZ(); */ break;
+    case ENABLE_INVERT_UI:            /* Clear_EnableInvert(); */ break;
+    case NUMBER_KEY_UI:               lv_clear_number_key(); break;
+    case BABY_STEP_UI:                lv_clear_baby_stepping(); break;
+    case PAUSE_POS_UI:                lv_clear_pause_position(); break;
       #if HAS_TRINAMIC_CONFIG
-        case TMC_CURRENT_UI:
-          lv_clear_tmc_current_settings();
-          break;
+        case TMC_CURRENT_UI:          lv_clear_tmc_current_settings(); break;
       #endif
-    case EEPROM_SETTINGS_UI:
-      lv_clear_eeprom_settings();
-      break;
+    case EEPROM_SETTINGS_UI:          lv_clear_eeprom_settings(); break;
       #if HAS_STEALTHCHOP
-        case TMC_MODE_UI:
-          lv_clear_tmc_step_mode_settings();
-          break;
+        case TMC_MODE_UI:             lv_clear_tmc_step_mode_settings(); break;
       #endif
     #if ENABLED(USE_WIFI_FUNCTION)
-    case WIFI_SETTINGS_UI:
-      lv_clear_wifi_settings();
-      break;
+    case WIFI_SETTINGS_UI:            lv_clear_wifi_settings(); break;
     #endif
     #if USE_SENSORLESS
-      case HOMING_SENSITIVITY_UI:
-        lv_clear_homing_sensitivity_settings();
-        break;
+      case HOMING_SENSITIVITY_UI:     lv_clear_homing_sensitivity_settings(); break;
     #endif
     #if HAS_ROTARY_ENCODER
-      case ENCODER_SETTINGS_UI:
-        lv_clear_encoder_settings();
-        break;
+      case ENCODER_SETTINGS_UI:       lv_clear_encoder_settings(); break;
     #endif
     #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-      case TOUCH_CALIBRATION_UI:
-        lv_clear_touch_calibration_screen();
-      break;
+      case TOUCH_CALIBRATION_UI:      lv_clear_touch_calibration_screen(); break;
     #endif
     default: break;
   }
@@ -1379,227 +1241,98 @@ void draw_return_ui() {
     disp_state_stack._disp_index--;
 
     switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) {
-      case PRINT_READY_UI:
-        lv_draw_ready_print();
-        break;
-      case PRINT_FILE_UI:
-        lv_draw_print_file();
-        break;
-      case PRINTING_UI:
-        if (gCfgItems.from_flash_pic) flash_preview_begin = true;
-        else default_preview_flg = true;
-        lv_draw_printing();
-        break;
-      case MOVE_MOTOR_UI:
-        lv_draw_move_motor();
-        break;
-      case OPERATE_UI:
-        lv_draw_operation();
-        break;
+      case PRINT_READY_UI:              lv_draw_ready_print(); break;
+      case PRINT_FILE_UI:               lv_draw_print_file(); break;
 
-        #if 1
-          case PAUSE_UI:
-            //draw_pause();
-            break;
-        #endif
+      case PRINTING_UI:                 if (gCfgItems.from_flash_pic)
+                                          flash_preview_begin = true;
+                                        else
+                                          default_preview_flg = true;
+                                        lv_draw_printing();
+                                        break;
 
-      case EXTRUSION_UI:
-        lv_draw_extrusion();
-        break;
-      case PRE_HEAT_UI:
-        lv_draw_preHeat();
-        break;
-      case CHANGE_SPEED_UI:
-        lv_draw_change_speed();
-        break;
-      case FAN_UI:
-        lv_draw_fan();
-        break;
-      case SET_UI:
-        lv_draw_set();
-        break;
-      case ZERO_UI:
-        lv_draw_home();
-        break;
-      case SPRAYER_UI:
-        //draw_Sprayer();
-        break;
-      case MACHINE_UI:
-        //draw_Machine();
-        break;
-      case LANGUAGE_UI:
-        lv_draw_language();
-        break;
-      case ABOUT_UI:
-        lv_draw_about();
-        break;
+      case MOVE_MOTOR_UI:               lv_draw_move_motor(); break;
+      case OPERATE_UI:                  lv_draw_operation(); break;
+      case PAUSE_UI:                    /* draw_pause(); */ break;
+      case EXTRUSION_UI:                lv_draw_extrusion(); break;
+      case PRE_HEAT_UI:                 lv_draw_preHeat(); break;
+      case CHANGE_SPEED_UI:             lv_draw_change_speed(); break;
+      case FAN_UI:                      lv_draw_fan(); break;
+      case SET_UI:                      lv_draw_set(); break;
+      case ZERO_UI:                     lv_draw_home(); break;
+      case SPRAYER_UI:                  /* draw_Sprayer(); */ break;
+      case MACHINE_UI:                  /* draw_Machine(); */ break;
+      case LANGUAGE_UI:                 lv_draw_language(); break;
+      case ABOUT_UI:                    lv_draw_about(); break;
 
-      case CALIBRATE_UI:
-        //draw_calibrate();
-        break;
-      case DISK_UI:
-        //draw_Disk();
-        break;
+      case CALIBRATE_UI:                /* draw_calibrate(); */ break;
+      case DISK_UI:                     /* draw_Disk(); */ break;
       #if ENABLED(USE_WIFI_FUNCTION)
-        case WIFI_UI:
-          lv_draw_wifi();
-          break;
+        case WIFI_UI:                   lv_draw_wifi(); break;
       #endif
-      case MORE_UI:
-        //draw_More();
-        break;
-      case PRINT_MORE_UI:
-        //draw_printmore();
-        break;
-      case FILAMENTCHANGE_UI:
-        lv_draw_filament_change();
-        break;
-      case LEVELING_UI:
-        lv_draw_manualLevel();
-        break;
-      case BIND_UI:
-        //draw_bind();
-        break;
+      case MORE_UI:                     /* draw_More(); */ break;
+      case PRINT_MORE_UI:               /* draw_printmore(); */ break;
+      case FILAMENTCHANGE_UI:           lv_draw_filament_change(); break;
+      case LEVELING_UI:                 lv_draw_manualLevel(); break;
+      case BIND_UI:                     /* draw_bind(); */ break;
       #if HAS_BED_PROBE
-        case NOZZLE_PROBE_OFFSET_UI:
-          lv_draw_auto_level_offset_settings();
-          break;
+        case NOZZLE_PROBE_OFFSET_UI:    lv_draw_auto_level_offset_settings(); break;
       #endif
-      case TOOL_UI:
-        lv_draw_tool();
-        break;
-      case MESHLEVELING_UI:
-        //draw_meshleveling();
-        break;
-      case HARDWARE_TEST_UI:
-        //draw_Hardwaretest();
-        break;
-      case WIFI_LIST_UI:
-        #if ENABLED(USE_WIFI_FUNCTION)
-          lv_draw_wifi_list();
-        #endif
-        break;
-      case KEY_BOARD_UI:
-        lv_draw_keyboard();
-        break;
-      case WIFI_TIPS_UI:
-        #if ENABLED(USE_WIFI_FUNCTION)
-          lv_draw_wifi_tips();
-        #endif
-        break;
-      case MACHINE_PARA_UI:
-        lv_draw_machine_para();
-        break;
-      case MACHINE_SETTINGS_UI:
-        lv_draw_machine_settings();
-        break;
-      case TEMPERATURE_SETTINGS_UI:
-        //draw_TemperatureSettings();
-        break;
-      case MOTOR_SETTINGS_UI:
-        lv_draw_motor_settings();
-        break;
-      case MACHINETYPE_UI:
-        //draw_MachineType();
-        break;
-      case STROKE_UI:
-        //draw_Stroke();
-        break;
-      case HOME_DIR_UI:
-        //draw_HomeDir();
-        break;
-      case ENDSTOP_TYPE_UI:
-        //draw_EndstopType();
-        break;
-      case FILAMENT_SETTINGS_UI:
-        lv_draw_filament_settings();
-        break;
-      case LEVELING_SETTIGNS_UI:
-        //draw_LevelingSettings();
-        break;
-      case LEVELING_PARA_UI:
-        lv_draw_level_settings();
-        break;
-      case DELTA_LEVELING_PARA_UI:
-        //draw_DeltaLevelPara();
-        break;
-      case MANUAL_LEVELING_POSIGION_UI:
-        lv_draw_manual_level_pos_settings();
-        break;
-      case MAXFEEDRATE_UI:
-        lv_draw_max_feedrate_settings();
-        break;
-      case STEPS_UI:
-        lv_draw_step_settings();
-        break;
-      case ACCELERATION_UI:
-        lv_draw_acceleration_settings();
-        break;
-      case JERK_UI:
-        #if HAS_CLASSIC_JERK
-          lv_draw_jerk_settings();
-        #endif
-        break;
-      case MOTORDIR_UI:
-        //draw_MotorDir();
-        break;
-      case HOMESPEED_UI:
-        //draw_HomeSpeed();
-        break;
-      case NOZZLE_CONFIG_UI:
-        //draw_NozzleConfig();
-        break;
-      case HOTBED_CONFIG_UI:
-        //draw_HotbedConfig();
-        break;
-      case ADVANCED_UI:
-        lv_draw_advance_settings();
-        break;
-      case DOUBLE_Z_UI:
-        //draw_DoubleZ();
-        break;
-      case ENABLE_INVERT_UI:
-        //draw_EnableInvert();
-        break;
-      case NUMBER_KEY_UI:
-        lv_draw_number_key();
-        break;
-      case DIALOG_UI:
-        //draw_dialog(uiCfg.dialogType);
-        break;
-      case BABY_STEP_UI:
-        lv_draw_baby_stepping();
-        break;
-      case PAUSE_POS_UI:
-        lv_draw_pause_position();
-        break;
-        #if HAS_TRINAMIC_CONFIG
-          case TMC_CURRENT_UI:
-            lv_draw_tmc_current_settings();
-            break;
-        #endif
-      case EEPROM_SETTINGS_UI:
-        lv_draw_eeprom_settings();
-        break;
+      case TOOL_UI:                     lv_draw_tool(); break;
+      case MESHLEVELING_UI:             /* draw_meshleveling(); */ break;
+      case HARDWARE_TEST_UI:            /* draw_Hardwaretest(); */ break;
+      #if ENABLED(USE_WIFI_FUNCTION)
+        case WIFI_LIST_UI:              lv_draw_wifi_list(); break;
+      #endif
+      case KEY_BOARD_UI:                lv_draw_keyboard(); break;
+      #if ENABLED(USE_WIFI_FUNCTION)
+        case WIFI_TIPS_UI:              lv_draw_wifi_tips(); break;
+      #endif
+      case MACHINE_PARA_UI:             lv_draw_machine_para(); break;
+      case MACHINE_SETTINGS_UI:         lv_draw_machine_settings(); break;
+      case TEMPERATURE_SETTINGS_UI:     /* draw_TemperatureSettings(); */ break;
+      case MOTOR_SETTINGS_UI:           lv_draw_motor_settings(); break;
+      case MACHINETYPE_UI:              /* draw_MachineType(); */ break;
+      case STROKE_UI:                   /* draw_Stroke(); */ break;
+      case HOME_DIR_UI:                 /* draw_HomeDir(); */ break;
+      case ENDSTOP_TYPE_UI:             /* draw_EndstopType(); */ break;
+      case FILAMENT_SETTINGS_UI:        lv_draw_filament_settings(); break;
+      case LEVELING_SETTIGNS_UI:        /* draw_LevelingSettings(); */ break;
+      case LEVELING_PARA_UI:            lv_draw_level_settings(); break;
+      case DELTA_LEVELING_PARA_UI:      /* draw_DeltaLevelPara(); */ break;
+      case MANUAL_LEVELING_POSIGION_UI: lv_draw_manual_level_pos_settings(); break;
+      case MAXFEEDRATE_UI:              lv_draw_max_feedrate_settings(); break;
+      case STEPS_UI:                    lv_draw_step_settings(); break;
+      case ACCELERATION_UI:             lv_draw_acceleration_settings(); break;
+      #if HAS_CLASSIC_JERK
+        case JERK_UI:                   lv_draw_jerk_settings(); break;
+      #endif
+      case MOTORDIR_UI:                 /* draw_MotorDir(); */ break;
+      case HOMESPEED_UI:                /* draw_HomeSpeed(); */ break;
+      case NOZZLE_CONFIG_UI:            /* draw_NozzleConfig(); */ break;
+      case HOTBED_CONFIG_UI:            /* draw_HotbedConfig(); */ break;
+      case ADVANCED_UI:                 lv_draw_advance_settings(); break;
+      case DOUBLE_Z_UI:                 /* draw_DoubleZ(); */ break;
+      case ENABLE_INVERT_UI:            /* draw_EnableInvert(); */ break;
+      case NUMBER_KEY_UI:               lv_draw_number_key(); break;
+      case DIALOG_UI:                   /* draw_dialog(uiCfg.dialogType); */ break;
+      case BABY_STEP_UI:                lv_draw_baby_stepping(); break;
+      case PAUSE_POS_UI:                lv_draw_pause_position(); break;
+      #if HAS_TRINAMIC_CONFIG
+        case TMC_CURRENT_UI:            lv_draw_tmc_current_settings(); break;
+      #endif
+      case EEPROM_SETTINGS_UI:          lv_draw_eeprom_settings(); break;
         #if HAS_STEALTHCHOP
-          case TMC_MODE_UI:
-            lv_draw_tmc_step_mode_settings();
-            break;
+          case TMC_MODE_UI:             lv_draw_tmc_step_mode_settings(); break;
         #endif
       #if ENABLED(USE_WIFI_FUNCTION)
-        case WIFI_SETTINGS_UI:
-        lv_draw_wifi_settings();
-        break;
+        case WIFI_SETTINGS_UI:          lv_draw_wifi_settings(); break;
       #endif
       #if USE_SENSORLESS
-        case HOMING_SENSITIVITY_UI:
-          lv_draw_homing_sensitivity_settings();
-          break;
+        case HOMING_SENSITIVITY_UI:     lv_draw_homing_sensitivity_settings(); break;
       #endif
       #if HAS_ROTARY_ENCODER
-        case ENCODER_SETTINGS_UI:
-          lv_draw_encoder_settings();
-          break;
+        case ENCODER_SETTINGS_UI:       lv_draw_encoder_settings(); break;
       #endif
       default: break;
     }
@@ -1888,15 +1621,11 @@ void LV_TASK_HANDLER() {
   lv_task_handler();
   if (mks_test_flag == 0x1E) mks_hardware_test();
 
-  #if HAS_GCODE_PREVIEW
-    disp_pre_gcode(2, 36);
-  #endif
+  TERN_(HAS_GCODE_PREVIEW, disp_pre_gcode(2, 36));
 
   GUI_RefreshPage();
 
-  #if ENABLED(USE_WIFI_FUNCTION)
-    get_wifi_commands();
-  #endif
+  TERN_(USE_WIFI_FUNCTION, get_wifi_commands());
 
   //sd_detection();
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index d7063d937c..ad253aad51 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -317,7 +317,7 @@ public:
   // LCD implementations
   static void clear_lcd();
 
-  #if HAS_LCD_MENU && ENABLED(TOUCH_SCREEN_CALIBRATION)
+  #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
     static void check_touch_calibration() {
       if (touch_calibration.need_calibration()) currentScreen = touch_calibration_screen;
     }
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index e19b04ccb5..905d7a07cd 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -37,8 +37,10 @@
 #endif
 
 #if HAS_GRAPHICAL_TFT
-  #include "../tft/touch.h"
   #include "../tft/tft.h"
+  #if ENABLED(TOUCH_SCREEN)
+    #include "../tft/touch.h"
+  #endif
 #endif
 
 #if EITHER(PROBE_MANUALLY, MESH_BED_LEVELING)
diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
index c632b10be0..8023f649ce 100644
--- a/Marlin/src/lcd/tft/touch.h
+++ b/Marlin/src/lcd/tft/touch.h
@@ -23,11 +23,12 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(TOUCH_SCREEN)
-
 #include "tft_color.h"
 #include "tft_image.h"
-#include "../tft_io/touch_calibration.h"
+
+#if ENABLED(TOUCH_SCREEN_CALIBRATION)
+  #include "../tft_io/touch_calibration.h"
+#endif
 
 #include HAL_PATH(../../HAL, tft/xpt2046.h)
 #define TOUCH_DRIVER XPT2046
@@ -117,5 +118,3 @@ class Touch {
 };
 
 extern Touch touch;
-
-#endif // TOUCH_SCREEN
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.cpp b/Marlin/src/lcd/tft_io/touch_calibration.cpp
index afed5dd7a5..e4ad8f215b 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.cpp
+++ b/Marlin/src/lcd/tft_io/touch_calibration.cpp
@@ -17,11 +17,11 @@
  *
  */
 
-#include "touch_calibration.h"
+#include "../../inc/MarlinConfig.h"
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
 
-#include "../../inc/MarlinConfig.h"
+#include "touch_calibration.h"
 
 TouchCalibration touch_calibration;
 
@@ -78,4 +78,4 @@ bool TouchCalibration::handleTouch(uint16_t x, uint16_t y) {
   return true;
 }
 
-#endif // ENABLED(TOUCH_SCREEN_CALIBRATION)
+#endif // TOUCH_SCREEN_CALIBRATION
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.h b/Marlin/src/lcd/tft_io/touch_calibration.h
index fdc03e3d18..5bebafffd2 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.h
+++ b/Marlin/src/lcd/tft_io/touch_calibration.h
@@ -36,21 +36,15 @@
   #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
 #endif
 
-#if ENABLED(TOUCH_SCREEN_CALIBRATION)
-
 typedef struct __attribute__((__packed__)) {
-  int32_t x;
-  int32_t y;
-  int16_t offset_x;
-  int16_t offset_y;
+  int32_t x, y;
+  int16_t offset_x, offset_y;
   uint8_t orientation;
 } touch_calibration_t;
 
 typedef struct __attribute__((__packed__)) {
-  uint16_t x;
-  uint16_t y;
-  int16_t raw_x;
-  int16_t raw_y;
+  uint16_t x, y;
+  int16_t raw_x, raw_y;
 } touch_calibration_point_t;
 
 enum calibrationState : uint8_t {
@@ -74,11 +68,11 @@ public:
   static void validate_calibration();
 
   static touch_calibration_t calibration;
-  static void calibration_reset() { calibration = {TOUCH_CALIBRATION_X, TOUCH_CALIBRATION_Y, TOUCH_OFFSET_X, TOUCH_OFFSET_Y, TOUCH_ORIENTATION}; }
+  static void calibration_reset() { calibration = { TOUCH_CALIBRATION_X, TOUCH_CALIBRATION_Y, TOUCH_OFFSET_X, TOUCH_OFFSET_Y, TOUCH_ORIENTATION }; }
   static bool need_calibration() { return !calibration.offset_x && !calibration.offset_y && !calibration.x && !calibration.y; }
 
   static calibrationState calibration_start() {
-    calibration = {0, 0, 0, 0, TOUCH_ORIENTATION_NONE};
+    calibration = { 0, 0, 0, 0, TOUCH_ORIENTATION_NONE };
     calibration_state = CALIBRATION_TOP_LEFT;
     calibration_points[CALIBRATION_TOP_LEFT].x = 30;
     calibration_points[CALIBRATION_TOP_LEFT].y = 30;
@@ -97,5 +91,3 @@ public:
 };
 
 extern TouchCalibration touch_calibration;
-
-#endif
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
index e3e84513af..32d4e0c9d4 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@@ -159,16 +159,16 @@
 // XPT2046 Touch Screen calibration
 #if ANY(TFT_LVGL_UI, TFT_COLOR_UI, TFT_CLASSIC_UI)
   #ifndef TOUCH_CALIBRATION_X
-    #define TOUCH_CALIBRATION_X         -17181
+    #define TOUCH_CALIBRATION_X           -17181
   #endif
   #ifndef TOUCH_CALIBRATION_Y
-    #define TOUCH_CALIBRATION_Y          11434
+    #define TOUCH_CALIBRATION_Y            11434
   #endif
   #ifndef TOUCH_OFFSET_X
-    #define TOUCH_OFFSET_X                 501
+    #define TOUCH_OFFSET_X                   501
   #endif
   #ifndef TOUCH_OFFSET_Y
-    #define TOUCH_OFFSET_Y                  -9
+    #define TOUCH_OFFSET_Y                    -9
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
index e4597772e3..066a6cc8aa 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
@@ -174,16 +174,16 @@
 // XPT2046 Touch Screen calibration
 #if ANY(TFT_LVGL_UI, TFT_COLOR_UI, TFT_CLASSIC_UI)
   #ifndef TOUCH_CALIBRATION_X
-    #define TOUCH_CALIBRATION_X         -17181
+    #define TOUCH_CALIBRATION_X           -17181
   #endif
   #ifndef TOUCH_CALIBRATION_Y
-    #define TOUCH_CALIBRATION_Y          11434
+    #define TOUCH_CALIBRATION_Y            11434
   #endif
   #ifndef TOUCH_OFFSET_X
-    #define TOUCH_OFFSET_X                 501
+    #define TOUCH_OFFSET_X                   501
   #endif
   #ifndef TOUCH_OFFSET_Y
-    #define TOUCH_OFFSET_Y                  -9
+    #define TOUCH_OFFSET_Y                    -9
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 70bede3515..a056aa96e5 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -286,22 +286,22 @@
 
 // MKS Robin TFT v2.0 with ILI9341
 // Read display identification information (0xD3 on ILI9341)
-//#define TOUCH_CALIBRATION_X            12013
-//#define TOUCH_CALIBRATION_Y            -8711
-//#define TOUCH_OFFSET_X                   -32
-//#define TOUCH_OFFSET_Y                   256
+//#define TOUCH_CALIBRATION_X              12013
+//#define TOUCH_CALIBRATION_Y              -8711
+//#define TOUCH_OFFSET_X                     -32
+//#define TOUCH_OFFSET_Y                     256
 
 // MKS Robin TFT v1.1 with ILI9328
-//#define TOUCH_CALIBRATION_X           -11792
-//#define TOUCH_CALIBRATION_Y             8947
-//#define TOUCH_OFFSET_X                   342
-//#define TOUCH_OFFSET_Y                   -19
+//#define TOUCH_CALIBRATION_X             -11792
+//#define TOUCH_CALIBRATION_Y               8947
+//#define TOUCH_OFFSET_X                     342
+//#define TOUCH_OFFSET_Y                     -19
 
 // MKS Robin TFT v1.1 with R61505
-//#define TOUCH_CALIBRATION_X            12489
-//#define TOUCH_CALIBRATION_Y             9210
-//#define TOUCH_OFFSET_X                   -52
-//#define TOUCH_OFFSET_Y                   -17
+//#define TOUCH_CALIBRATION_X              12489
+//#define TOUCH_CALIBRATION_Y               9210
+//#define TOUCH_OFFSET_X                     -52
+//#define TOUCH_OFFSET_Y                     -17
 
 // QQS-Pro uses MKS Robin TFT v2.0
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index 9be509ba47..ca4dd8d792 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -172,16 +172,16 @@
 
 #if ENABLED(TOUCH_SCREEN)
   #ifndef TOUCH_CALIBRATION_X
-    #define TOUCH_CALIBRATION_X          12033
+    #define TOUCH_CALIBRATION_X            12033
   #endif
   #ifndef TOUCH_CALIBRATION_Y
-    #define TOUCH_CALIBRATION_Y          -9047
+    #define TOUCH_CALIBRATION_Y            -9047
   #endif
   #ifndef TOUCH_OFFSET_X
-    #define TOUCH_OFFSET_X                 -30
+    #define TOUCH_OFFSET_X                   -30
   #endif
   #ifndef TOUCH_OFFSET_Y
-    #define TOUCH_OFFSET_Y                 254
+    #define TOUCH_OFFSET_Y                   254
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
index 428469426e..543a90b66b 100644
--- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -142,16 +142,16 @@
 // XPT2046 Touch Screen calibration
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
   #ifndef TOUCH_CALIBRATION_X
-    #define TOUCH_CALIBRATION_X         -17181
+    #define TOUCH_CALIBRATION_X           -17181
   #endif
   #ifndef TOUCH_CALIBRATION_Y
-    #define TOUCH_CALIBRATION_Y          11434
+    #define TOUCH_CALIBRATION_Y            11434
   #endif
   #ifndef TOUCH_OFFSET_X
-    #define TOUCH_OFFSET_X                 501
+    #define TOUCH_OFFSET_X                   501
   #endif
   #ifndef TOUCH_OFFSET_Y
-    #define TOUCH_OFFSET_Y                  -9
+    #define TOUCH_OFFSET_Y                    -9
   #endif
 #endif