diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 9298b2b96d..d889e3882a 100755
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,6 @@
+### Please read the styleguide before posting!
+ ----> See styleguide.md in the root of this project
+
 ### Requirements
 
 * Filling out this template is required. Pull Requests without a clear description may be closed at the maintainers' discretion.
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_am.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_am.ini
new file mode 100644
index 0000000000..08af1ceb0f
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_am.ini	
@@ -0,0 +1,284 @@
+#### Language Code:AM
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Հայերեն
+label_heat:Ջերմություն
+label_move:Շարժել
+label_home:Սկզբնական
+label_disable_steppers:Disarm All
+label_print:Տպել
+label_extrude:Հալել
+label_fan:Հովացնել
+label_settings:Կարգավորումներ
+label_screen_settings:Screen
+label_machine_settings:Machine
+label_feature_settings:Feature
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Shut Down
+label_rgb_settings:LED Color
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Custom
+label_leveling:Leveling
+label_point_1:Point 1
+label_point_2:Point 2
+label_point_3:Point 3
+label_point_4:Point 4
+label_point_5:Point 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Deploy
+label_bltouch_stow:Stow
+label_bltouch_repeat:Repeat
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Save
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Ավելացնել
+label_dec:Նվազեցնել
+label_nozzle:Գլխիկ
+label_bed:Տախտակ
+label_chamber:Chamber
+label_start:Start
+label_stop:Դադարեցնել
+label_back:Հետ
+label_page_up:Վերեւ
+label_page_down:Ներքեւ
+label_pause:Կանգնեցնել
+label_resume:Շարունակել
+label_load:Load
+label_unload:Unload
+label_slow_speed:Դանդաղ
+label_normal_speed:Նորմալ
+label_fast_speed:Արագ
+label_fan_full_speed:Ամբողջը
+label_fan_half_speed:Կիսատ
+label_rotate_ui:Rotate UI
+label_touchscreen_adjust:TSC Adjust
+label_more:More
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:White
+label_black:Black
+label_blue:Blue
+label_red:Red
+label_green:Green
+label_cyan:Cyan
+label_yellow:Yellow
+label_brown:Brown
+label_gray:Gray
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Անջատել
+label_baudrate:BaudRate
+label_percentage:Percentage
+label_babystep:Դանդաղ
+label_percentage_speed:Արագություն
+label_percentage_flow:Flow
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Պատրաստ
+label_busy:Ծանրաբեռնված է
+label_unconnected:Տպիչը կցված չէ
+label_disconnect_info:Now you can control the printer by your computer!
+label_loading:Բեռնում է...
+label_power_failed:Տպելը չի ավարտվել, շարունակե՞լ
+label_continue:Շարունակել
+label_cancel:Չեղարկել
+label_adjust_title:Էկրանի կարգավորում
+label_adjust_info:Please click on the red dot
+label_adjust_ok:Adjustment Success
+label_adjust_failed:Adjustment failed, Please Try Again
+label_warning:Warning
+label_stop_print:Stop printing?
+label_confirm:Confirm
+label_tftsd:TFT SD
+label_read_tftsd_error:TFTSD հիշողության սարքը չկա
+label_tftsd_inserted:Card inserted!
+label_tftsd_removed:Card removed!
+label_u_disk:U Disk
+label_read_u_disk_error:Read U Disk error!
+label_u_disk_inserted:U Disk inserted!
+label_u_disk_removed:U Disk removed!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:OnboardSD հիշողության սարքը չկա
+label_filament_sensor:Filament sensor
+label_filament_runout:Filament runout!
+label_preheat:Preheat
+label_preheat_both:Both
+label_is_pause:Unable to extrude when\nprinting.\nPause printing?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Movement
+label_unifiedheat:Heat&Fan
+label_cooldown:Cool Down
+label_emergencystop:EM. STOP
+label_touch_to_exit:Touch anywhere to exit
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wait for the temperature\nof hotend to be\nlower than %d℃
+label_force_shut_down:Force
+label_shutting_down:Shutting down...
+label_parameter_setting:Պարամետր
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:load settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_ca.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_ca.ini
new file mode 100644
index 0000000000..b5eb9f9fd9
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_ca.ini	
@@ -0,0 +1,284 @@
+#### Language Code:CA
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Català
+label_heat:Escalfar
+label_move:Moure
+label_home:Origen
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extruir
+label_fan:Ventilar
+label_settings:Configura
+label_screen_settings:Pantalla
+label_machine_settings:Màquina
+label_feature_settings:Afegits
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Apagar
+label_rgb_settings:Color LED
+label_rgb_off:Apagar LED
+label_terminal:Terminal
+label_custom:Personalitzar
+label_leveling:Anivellar
+label_point_1:Punt 1
+label_point_2:Punt 2
+label_point_3:Punt 3
+label_point_4:Punt 4
+label_point_5:Punt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Nivellat del llit completat
+label_bl_smart_fill:Falten punts de prova\ns'han omplert de forma intel·ligent.\n \nNota: recordeu guardar!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Nivellament del llit Bilinear
+label_abl_settings_ubl:Nivellament de llit unificat
+label_abl_settings_ubl_save:Desa a la ranura
+label_abl_settings_ubl_load:Carrega des de la ranura
+label_abl_slot0:Ranura 0
+label_abl_slot1:Ranura 1
+label_abl_slot2:Ranura 2
+label_abl_slot3:Ranura 3
+label_abl_slot_eeprom:Recordar la ranura per al proper\nreinici? (Guardar EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Provar
+label_bltouch_deploy:Desplegar
+label_bltouch_stow:Plegar
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Sonda Compensar
+label_home_offset:Home Offset
+label_confirmation:Estàs segur?
+label_down:Avall
+label_up:Amunt
+label_save:Gravar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Augmentar
+label_dec:Disminur
+label_nozzle:Nozzle
+label_bed:Llit
+label_chamber:Cambra
+label_start:Començar
+label_stop:Parar
+label_back:Tornar
+label_page_up:Retrocedir
+label_page_down:Avançar
+label_pause:Pausar
+label_resume:Continuar
+label_load:Carregar
+label_unload:Descarregar
+label_slow_speed:Lent
+label_normal_speed:Normal
+label_fast_speed:Ràpid
+label_fan_full_speed:Màxim
+label_fan_half_speed:Meitat
+label_rotate_ui:Rotar
+label_touchscreen_adjust:Calibrar
+label_more:Més
+label_screen_info:Informar
+label_status:Estat
+label_simulator_bg_color:Color de fons del simulador Marlin
+label_simulator_font_color:Color de lletra de simulador Marlin
+label_white:Blanc
+label_black:Negre
+label_blue:Blau
+label_red:Vermell
+label_green:Verd
+label_cyan:Cian
+label_yellow:groc
+label_brown:marró
+label_gray:Gris
+label_orange:taronja
+label_indigo:Índigo
+label_violet:violeta
+label_magenta:Magenta
+label_purple:Porpra
+label_lime:Llima
+label_darkblue:Blau fosc
+label_darkgreen:Verd fosc
+label_darkgray:Gris fosc
+label_disconnect:Desconnectar
+label_baudrate:Velocitat de transmissió
+label_percentage:Percentatge
+label_babystep:BabyStep
+label_percentage_speed:Velocitat
+label_percentage_flow:Flux
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:+X
+label_y_inc:+Y
+label_z_inc:+Z
+label_x_dec:-X
+label_y_dec:-Y
+label_z_dec:-Z
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:A punt!!
+label_busy:Processament ocupat, si us plau esperi ...
+label_unconnected:No hi ha comunicació amb impressora!
+label_disconnect_info:Ara pot controlar la impressora des del seu ordinador!
+label_loading:Carregant ...
+label_power_failed:¿Continuar imprimint?
+label_continue:Continuar
+label_cancel:Cancel · lar
+label_adjust_title:¡Calibrar la pantalla tàctil
+label_adjust_info:Si us plau feu clic al punt vermell
+label_adjust_ok:Ajust correcte
+label_adjust_failed:Ajust fallit, si us plau intenteu de nou
+label_warning:Advertència
+label_stop_print:Voleu aturar la impressió?
+label_confirm:Confirmar
+label_tftsd:SD TFT
+label_read_tftsd_error:Error a la targeta SD TFT!
+label_tftsd_inserted:¡Targeta inserida!
+label_tftsd_removed:¡Targeta extreta!
+label_u_disk:Pendrive
+label_read_u_disk_error:¡Error al Pendrive!
+label_u_disk_inserted:¡Pendrive inserit!
+label_u_disk_removed:¡Pendrive extret!
+label_onboardsd:SD Placa
+label_read_onboardsd_error:Error a la targeta SD de la placa!
+label_filament_sensor:Sensor de filament
+label_filament_runout:¡Filament esgotat!
+label_preheat:Preescalfar
+label_preheat_both:Tots dos
+label_is_pause:No es pot extruir\nal imprimir,¿\nPausar la impressió?
+label_auto_shut_down:Apag. aut.
+label_unifiedmove:Moviment
+label_unifiedheat:Calor/Ventilador
+label_cooldown:Refredar
+label_emergencystop:PARADA EMERGENCIA
+label_touch_to_exit:Toca qualsevol lloc per sortir
+label_mainmenu:Menú
+label_wait_temp_shut_down:Espereu que la\ntemperatura del hotend\nsigui inferior a %d℃
+label_force_shut_down:Forçar Apagat
+label_shutting_down:Apagant...
+label_parameter_setting:Paràmetre
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Mostra ACK a la terminal
+label_invert_xaxis:Invertir eix X
+label_invert_yaxis:Invertir eix Y
+label_invert_zaxis:Invertir eix Z
+label_move_speed:Velocitat de moviment(X Y Z)
+label_knob_led:Perilla rotativa LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:En pausa per l'ordre M0
+label_send_start_gcode:Enviar Gcode inicial
+label_send_end_gcode:Enviar Gcode final
+label_send_cancel_gcode:Cancel · lar Gcode
+label_persistent_status_info:Informació d'estat persistent
+label_file_listmode:Mode de visualització de fitxers
+label_current_setting:Corrent del Driver (mA)
+label_steps_setting:Passos per MM
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleració
+label_acceleration:Acceleració
+label_print_acceleration:Acceleració Impressió
+label_retract_acceleration:Acceleració Retracció
+label_travel_acceleration:Acceleració Viatge
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:Sensibilitat al topall TMC
+label_fwretract:Retracció de FW
+label_fwrecover:Recuperació de Retracció de FW
+label_lin_advance:Avanç Lineal
+label_reset_settings_info:Restableix tota la configuració a\nvalors predeterminats?
+label_reset_settings_done:Restableix tota la configuració\naconseguit.\nreinicieu el dispositiu.
+label_info:Informació
+label_lcd_brightness:Lluminositat LCD
+label_lcd_brightness_dim:Dim Lluminositat LCD
+label_lcd_dim_idle_timer:Temporitzador inactiu LCD
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Personalitzat
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Mode Marlin a pantalla completa
+label_plr_en:Recuperació de pèrdua d’energia
+label_setting_save:Save settings
+label_setting_reset:Restableix la configuració
+label_setting_restore:Restaura la configuració
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Desa la configuració de la impressora\na la EEPROM?
+label_eeprom_restore_info:Carregar la configuració de\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Velocitat Retracció
+label_retract_length:Longitud Retracció
+label_retract_swap_length:Distància retracció intercanvi
+label_retract_z_lift:Z aixecament a la retracció
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Velocitat recuperació
+label_swap_recover_feedrate:Velocitat recuperació intercanvi
+label_recover_length:Distancia recuperació extra
+label_swap_recover_length:Distancia recuperació intercanvi extra
+label_start_print:Comenceu a imprimir:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_cn.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_cn.ini
new file mode 100644
index 0000000000..f522ad490a
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_cn.ini	
@@ -0,0 +1,284 @@
+#### Language Code:CN
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:简体中文
+label_heat:加热
+label_move:移动
+label_home:回原点
+label_disable_steppers:解锁电机
+label_print:打印
+label_extrude:挤出
+label_fan:风扇
+label_settings:设置
+label_screen_settings:屏幕设置
+label_machine_settings:机器设置
+label_feature_settings:功能设置
+label_sound:声音
+label_touch_sound:按钮声音
+label_toast_sound:Toast 提示声音
+label_alert_sound:弹窗和提示声音
+label_preheatdone_sound:Preheat done notification
+label_shut_down:关闭电源
+label_rgb_settings:灯光颜色
+label_rgb_off:熄灭灯光
+label_terminal:Terminal
+label_custom:自定义
+label_leveling:调平
+label_point_1:第一点
+label_point_2:第二点
+label_point_3:第三点
+label_point_4:第四点
+label_point_5:第五点
+label_bed_leveling:Bed Level
+label_bl_complete:平台调平完成!
+label_bl_smart_fill:部分点未探测,已被自动填充, 需要手动保存!
+label_bl_enable:BL:已开启
+label_bl_disable:BL:已关闭
+label_abl:自动调平
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:BL自检
+label_bltouch_deploy:探针弹出
+label_bltouch_stow:探针收回
+label_bltouch_repeat:精度测试
+label_z_offset:Z-偏移量
+label_probe_offset:探针偏移量
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:降低
+label_up:抬升
+label_save:保存参数
+label_restore:恢复
+label_reset:重置
+label_default:默认
+label_clear:Clear
+label_next:下一个
+label_distance:距离
+label_invalid_value:没有有效的条件!
+label_timeout_reached:已超时!
+label_process_running:正在运行,请稍后
+label_process_completed:处理已完成!
+label_process_aborted:处理已被中断!
+label_inc:增加
+label_dec:减少
+label_nozzle:喷头
+label_bed:热床
+label_chamber:机箱
+label_start:开始
+label_stop:停止
+label_back:返回
+label_page_up:上一页
+label_page_down:下一页
+label_pause:暂停
+label_resume:继续
+label_load:进料
+label_unload:退料
+label_slow_speed:慢速
+label_normal_speed:常速
+label_fast_speed:快速
+label_fan_full_speed:全速
+label_fan_half_speed:半速
+label_rotate_ui:旋转界面
+label_touchscreen_adjust:触屏校准
+label_more:更多
+label_screen_info:关于
+label_status:状态
+label_simulator_bg_color:Marlin模式背景颜色
+label_simulator_font_color:Marlin模式字体颜色
+label_white:白色
+label_black:黑色
+label_blue:蓝色
+label_red:红色
+label_green:绿色
+label_cyan:青色
+label_yellow:黄色
+label_brown:棕色
+label_gray:灰色
+label_orange:橙色
+label_indigo:靛
+label_violet:紫罗兰色
+label_magenta:桃红色
+label_purple:紫色
+label_lime:青柠色
+label_darkblue:暗蓝色
+label_darkgreen:暗绿色
+label_darkgray:暗灰色
+label_disconnect:断开连接
+label_baudrate:波特率
+label_percentage:百分比
+label_babystep:Z-微调
+label_percentage_speed:速度百分比
+label_percentage_flow:流量百分比
+label_value_zero:清零
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:准备打印
+label_busy:系统繁忙,请稍候...
+label_unconnected:未连接到打印机!
+label_disconnect_info:现在可以用电脑控制打印机
+label_loading:加载中...
+label_power_failed:是否继续打印?
+label_continue:继续
+label_cancel:取消
+label_adjust_title:触屏校准
+label_adjust_info:请点击红点中心位置
+label_adjust_ok:校准成功
+label_adjust_failed:校准失败,请重试
+label_warning:警告
+label_stop_print:是否停止打印?
+label_confirm:确定
+label_tftsd:TFT SD
+label_read_tftsd_error:读TFT SD卡出错!
+label_tftsd_inserted:SD卡已插入!
+label_tftsd_removed:SD卡已拔出!
+label_u_disk:U盘
+label_read_u_disk_error:读U盘出错!
+label_u_disk_inserted:U盘已插入!
+label_u_disk_removed:U盘已拔出!
+label_onboardsd:板载SD
+label_read_onboardsd_error:读板载SD卡出错!
+label_filament_sensor:耗材检测传感器
+label_filament_runout:耗材已用尽,请更换耗材!
+label_preheat:一键预热
+label_preheat_both:全部
+label_is_pause:打印中无法挤出耗材, 是否暂停打印?
+label_auto_shut_down:自动关机
+label_unifiedmove:运动
+label_unifiedheat:温度
+label_cooldown:冷却
+label_emergencystop:紧急停止
+label_touch_to_exit:触摸任意点退出当前界面
+label_mainmenu:菜单
+label_wait_temp_shut_down:喷头温度正在降温，等待低于%d℃后自动关机
+label_force_shut_down:强制关机
+label_shutting_down:正在关机...
+label_parameter_setting:参数设置
+label_on:开启
+label_off:关闭
+label_smart:智能
+label_terminal_ack:在G-code终端中显示温度信息
+label_invert_xaxis:翻转X轴
+label_invert_yaxis:翻转Y轴
+label_invert_zaxis:翻转Z轴
+label_move_speed:移动速度(X Y Z)
+label_knob_led:旋钮LED颜色
+label_knob_led_idle:旋钮LED自动睡眠
+label_m0_pause:M0暂停
+label_send_start_gcode:执行打印前起始Gcode
+label_send_end_gcode:执行打印后结束Gcode
+label_send_cancel_gcode:中断打印Gcode
+label_persistent_status_info:顶部温度信息
+label_file_listmode:文件浏览列表模式
+label_current_setting:TMC驱动电流设置
+label_steps_setting:电机每毫米脉冲数(Steps/mm)
+label_maxfeedrate:最大移动速度
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:打印加速度
+label_retract_acceleration:回抽加速度
+label_travel_acceleration:空载加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC堵转检测灵敏度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:所有的设置会被重置为默认值, 是否继续?
+label_reset_settings_done:重置所有参数成功! 重启设备后生效.
+label_info:提示
+label_lcd_brightness:LCD背光亮度
+label_lcd_brightness_dim:LCD睡眠背光亮度
+label_lcd_dim_idle_timer:LCD自动睡眠时间
+label_5_seconds:5秒
+label_10_seconds:10秒
+label_30_seconds:30秒
+label_60_seconds:1分钟
+label_120_seconds:2分钟
+label_300_seconds:5分钟
+label_custom_seconds:自定义
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:全屏显示Marlin模式
+label_plr_en:断电续打
+label_setting_save:保存设置
+label_setting_reset:重置设置
+label_setting_restore:保存设置
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:是否保存打印机设置到EEPROM?
+label_eeprom_restore_info:是否从EEPROM加载设置?
+label_eeprom_reset_info:重置EEPROM到出厂设置?
+label_retract_feedrate:FW回抽速度
+label_retract_length:FW回抽长度
+label_retract_swap_length:换料时回抽的长度
+label_retract_z_lift:回抽时Z轴抬升的高度
+label_retract_auto:FW自动回抽
+label_recover_feedrate:FW挤出速度
+label_swap_recover_feedrate:换料时挤出的速度
+label_recover_length:额外挤出的长度
+label_swap_recover_length:换料时额外挤出的长度
+label_start_print:是否开始打印:\n %s?
+label_ack_notification:ACK 弹窗类型
+label_leveling_edge_distance:手动调平边沿距离
+label_xy_unlock:解锁XY
+label_tuning:调整
+label_pid:PID
+label_pid_title:PID自动整定
+label_pid_start_info:开始PID自动整定,需要几分钟来完成,是否继续?
+label_pid_start_info_2:PID 正在自动整定中!
+label_pid_start_info_3:不要操作触控屏直到整定完成!
+label_tune_extruder:微调E-Steps
+label_tune_ext_extrude_100:挤出100mm
+label_tune_ext_temp:挤出机微调 | 加热
+label_tune_ext_templow:目标温度太低,最低温度为: %d℃
+label_tune_ext_desiredval:实际温度还没达到设定值
+label_tune_ext_mark120mm:在耗材上标记120mm\n标记完成后点击 '%s'\n挤出完成后测量剩余长度
+label_tune_ext_heatoff:关闭加热?
+label_tune_ext_adj_esteps:调整E-Steps
+label_tune_ext_esteps_saved:新的E-Steps已生效,需要手动保存到EEPROM\n新E-Steps: %0.2f
+label_tune_ext_measured:剩余的长度:
+label_tune_ext_old_estep:旧的E-Steps: %0.2f
+label_tune_ext_new_estep:新的E-Steps: %0.2f
+label_connection_settings:连接
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_cz.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_cz.ini
new file mode 100644
index 0000000000..472b26d525
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_cz.ini	
@@ -0,0 +1,284 @@
+#### Language Code:CZ
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Čeština
+label_heat:Teplota
+label_move:Posunout
+label_home:Domů
+label_disable_steppers:Motory
+label_print:Tisknout
+label_extrude:Filament
+label_fan:Ofuk
+label_settings:Nastavení
+label_screen_settings:Displej
+label_machine_settings:Tiskárna
+label_feature_settings:Vlastnosti
+label_sound:Zvuk
+label_touch_sound:Zvuk při dotyku
+label_toast_sound:Zvuk vytápění
+label_alert_sound:Upozornění, popup okno
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Vypnout
+label_rgb_settings:Barva LED
+label_rgb_off:LED vyp.
+label_terminal:Terminál
+label_custom:Vlastní
+label_leveling:Srovnat
+label_point_1:Bod 1
+label_point_2:Bod 2
+label_point_3:Bod 3
+label_point_4:Bod 4
+label_point_5:Bod 5
+label_bed_leveling:Bed Level
+label_bl_complete:Vyrovnání kompletní
+label_bl_smart_fill:Chybějící body sondy\nbyly vyplněny inteligentně.\n \nPozn: Nezapomeň uložit!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:Vyrovnat
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Ruční vyrovnání
+label_abl_settings:Auto vyrovnání
+label_abl_settings_bbl:Bilineární vyrovnání
+label_abl_settings_ubl:UBL vyrovnání
+label_abl_settings_ubl_save:Uložit do slotu
+label_abl_settings_ubl_load:Nahrát ze slotu
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Zapamatuj si slot\nrestart? (Uložit EEPROM)
+label_abl_z:Z-Slábnutí
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Vysunout
+label_bltouch_stow:Zasunout
+label_bltouch_repeat:Přesnost
+label_z_offset:Z Offset
+label_probe_offset:Offset sondy
+label_home_offset:Home Offset
+label_confirmation:Jste si jistý?
+label_down:Dolů
+label_up:Nahoru
+label_save:Uložit
+label_restore:Obnovit
+label_reset:Reset
+label_default:Výchozí
+label_clear:Vymaž
+label_next:Další
+label_distance:Vzdálenost
+label_invalid_value:Neplatná hodnota/y!
+label_timeout_reached:Časový limit vypršel!
+label_process_running:Probíhá proces!
+label_process_completed:Proces dokončen!
+label_process_aborted:Proces přerušen!
+label_inc:Přidat
+label_dec:Ubrat
+label_nozzle:Tryska
+label_bed:Stolek
+label_chamber:Komora
+label_start:Start
+label_stop:Stop
+label_back:Zpět
+label_page_up:Další
+label_page_down:Předchozí
+label_pause:Pauza
+label_resume:Obnovit
+label_load:Zavést
+label_unload:Vysunout
+label_slow_speed:Pomalu
+label_normal_speed:Normál
+label_fast_speed:Rychle
+label_fan_full_speed:Plný
+label_fan_half_speed:Poloviční
+label_rotate_ui:Otočit UI
+label_touchscreen_adjust:Kalibrovat
+label_more:Více
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin - Barva pozadí
+label_simulator_font_color:Marlin - Barva písma
+label_white:Bílá
+label_black:Černá
+label_blue:Modrá
+label_red:Červená
+label_green:Zelená
+label_cyan:Tyrkys
+label_yellow:Žlutá
+label_brown:Hnědá
+label_gray:Šedá
+label_orange:Oranžová
+label_indigo:Indigo
+label_violet:Fialová
+label_magenta:Purpurová
+label_purple:Nachová
+label_lime:Limetková
+label_darkblue:Tmavá Modrá
+label_darkgreen:Tmavá Červená
+label_darkgray:Tmavá Šedá
+label_disconnect:Odpojit
+label_baudrate:Serial Port
+label_percentage:Procenta
+label_babystep:BabyStep
+label_percentage_speed:Rychlost
+label_percentage_flow:Průtok
+label_value_zero:Vynulovat
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0,01mm
+label_01_mm:0,1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Připraven
+label_busy:Zpracovávám, čekejte prosím...
+label_unconnected:Tiskárna není připojena!
+label_disconnect_info:Nyní můžete tiskárnu ovládat z počítače!
+label_loading:Nahrávám...
+label_power_failed:Obnovit tisk?
+label_continue:Pokračovat
+label_cancel:Zrušit
+label_adjust_title:Kalibrace dotykové obrazovky
+label_adjust_info:Dotkněte se postupně všech bodů
+label_adjust_ok:Kalibrace úspěšná
+label_adjust_failed:Kalibrace selhala, zopakujte znovu
+label_warning:Varování
+label_stop_print:Zastavit tisk?
+label_confirm:Potvrdit
+label_tftsd:TFT SD
+label_read_tftsd_error:Chyba při čtení SD karty!
+label_tftsd_inserted:SD karta vložena!
+label_tftsd_removed:SD karta vyjmuta!
+label_u_disk:USB Disk
+label_read_u_disk_error:Chyba při čtení USB disku!
+label_u_disk_inserted:USB disk  vložen!
+label_u_disk_removed:USB disk vyjmut!
+label_onboardsd:Onboard SD
+label_read_onboardsd_error:Chyba při čtení Onboard SD!
+label_filament_sensor:Senzor filamentu
+label_filament_runout:Došel filament!
+label_preheat:Zahřát
+label_preheat_both:Vše
+label_is_pause:Během tisku nelze\nextrudovat,\nmám pozastavit tisk?
+label_auto_shut_down:Auto.vypnutí
+label_unifiedmove:Pohyb
+label_unifiedheat:Teplota
+label_cooldown:Zchladit
+label_emergencystop:!!STOP!!
+label_touch_to_exit:Pro návrat se dotkněte obrazovky...
+label_mainmenu:Menu
+label_wait_temp_shut_down:Čekám na zchladnutí\nextruderu pod %d℃
+label_force_shut_down:Vynutit
+label_shutting_down:Vypínám se...
+label_parameter_setting:Parametry
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:zobrazit ACK Terminálu
+label_invert_xaxis:Otočit osu X
+label_invert_yaxis:Otočit osu Y
+label_invert_zaxis:Otočit osu Z
+label_move_speed:Rychlost pohybu X Y Z
+label_knob_led:Rotační knob LED
+label_knob_led_idle:Rotační knob LED idle
+label_m0_pause:Pauza po příkazu M0
+label_send_start_gcode:Spustit Gcode před tiskem
+label_send_end_gcode:Spustit Gcode po tisku
+label_send_cancel_gcode:Přerušení tisku
+label_persistent_status_info:Trvalé zobrazení stavu
+label_file_listmode:Zobrazit soub.jako seznam
+label_current_setting:Proud motorů (mA)
+label_steps_setting:Kroků/mm
+label_maxfeedrate:Max rychlost
+label_maxacceleration:Max zrychlení
+label_acceleration:Zrychlení
+label_print_acceleration:Zrychlení při tisku
+label_retract_acceleration:Zrychlení retrakcí
+label_travel_acceleration:Zrychlení při přesunu
+label_jerk:Jerk-trhnutí
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:Citlivost nárazu TMC
+label_fwretract:FW Zatažení
+label_fwrecover:FW Obnovení
+label_lin_advance:Linear Advance
+label_reset_settings_info:Všechna nastavení budou\nobnovena na výchozí\nhodnoty. Pokračovat?
+label_reset_settings_done:Resetování všech nastavení\nbylo úspěšně provedeno.\nRestartujte zařízení.
+label_info:Info
+label_lcd_brightness:LCD Jas
+label_lcd_brightness_dim:LCD snížení jasu
+label_lcd_dim_idle_timer:LCD snížení jasu po
+label_5_seconds:5 sec.
+label_10_seconds:10 sec.
+label_30_seconds:30 sec.
+label_60_seconds:1 min.
+label_120_seconds:2 min.
+label_300_seconds:5 min.
+label_custom_seconds:Vlastní
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Celoobrazovkový režim Marlin
+label_plr_en:Obnova po ztrátě napájení
+label_setting_save:Uložení nastavení
+label_setting_reset:Reset nastavení
+label_setting_restore:Obnovení nastavení
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Uložit nastavení tiskárny\ndo EEPROM?
+label_eeprom_restore_info:Obnovit nastavení \nz EEPROM?
+label_eeprom_reset_info:Reset EEPROM na výchozí hodnoty?
+label_retract_feedrate:Rychlost zatažení
+label_retract_length:Délka zatažení
+label_retract_swap_length:Délka zatažení Swap
+label_retract_z_lift:Z zvýšení při zatažení
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Rychlost obnovení
+label_swap_recover_feedrate:Rychlost obnovení Swap
+label_recover_length:Délka obnovení
+label_swap_recover_length:Délka obnovení Swap
+label_start_print:Spustit tisk:\n %s?
+label_ack_notification:Styl oznámení ACK
+label_leveling_edge_distance:Vzdálenost nivelačních bodů\n stolku od kraje
+label_xy_unlock:Uvolnit XY
+label_tuning:Kalibrace
+label_pid:PID
+label_pid_title:PID autokalibrace
+label_pid_start_info:PID autokalibrace bude spuštěna.\n Bude to cvíli trvat. Pokračovat?
+label_pid_start_info_2:PID autokalibrace probíhá!
+label_pid_start_info_3:NEDOTÝKEJ se displeje dokud není dokončeno\n (Zelená LED svítí)!
+label_tune_extruder:E-Krok
+label_tune_ext_extrude_100:100mm Vysunutí
+label_tune_ext_temp:Kalibrace extruderu, ohřev
+label_tune_ext_templow:Požadovaná teplota je příliš nízká!\nMinimální teplota: %d C
+label_tune_ext_desiredval:Teplota ještě není na požadované hodnotě
+label_tune_ext_mark120mm:Označ 120mm on fillamentu\nStlač '%s' pokud jsi připraven.\nZměř zbývající délku\npo vytlačení.
+label_tune_ext_heatoff:Vypnout topení?
+label_tune_ext_adj_esteps:Nastavení E-Kroků
+label_tune_ext_esteps_saved:Nové E-kroky uloženy!\nNezapmeň \nuložit do EEPROM.\nNová hodnota: %0.2f
+label_tune_ext_measured:Zbývající délka:
+label_tune_ext_old_estep:Původní E-kroky: %0.2f
+label_tune_ext_new_estep:Nový E-kroky: %0.2f
+label_connection_settings:Připojení
+label_offset_tool:Offset 2.trysky
+label_hybrid_threshold:TMC Hybridní práh
+label_notifications:Oznámení
+label_mesh_editor:Mesh síť
+label_mesh_tuner:Mesh nastavení
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_de.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_de.ini
new file mode 100644
index 0000000000..090ba9e0d1
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_de.ini	
@@ -0,0 +1,284 @@
+#### Language Code:DE
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Deutsch
+label_heat:heizen
+label_move:bewegen
+label_home:Home XYZ
+label_disable_steppers:alle lösen
+label_print:drucken
+label_extrude:Extruder
+label_fan:Lüfter
+label_settings:Einstellungen
+label_screen_settings:Bildschirm
+label_machine_settings:Drucker
+label_feature_settings:Andere
+label_sound:Töne
+label_touch_sound:Eingabe
+label_toast_sound:Toasts
+label_alert_sound:Popups & Alarme
+label_preheatdone_sound:Preheat done notification
+label_shut_down:auschalten (PS_ON)
+label_rgb_settings:LED Farbe
+label_rgb_off:LED aus
+label_terminal:Terminal
+label_custom:Extras
+label_leveling:justieren
+label_point_1:Punkt 1
+label_point_2:Punkt 2
+label_point_3:Punkt 3
+label_point_4:Punkt 4
+label_point_5:Punkt 5
+label_bed_leveling:vermessen
+label_bl_complete:Bett-Vermessung ausgeführt
+label_bl_smart_fill:Fehlende Messpunkte\nwurden berechent.\n \nHinweis: Bitte speichern!
+label_bl_enable:BL: an
+label_bl_disable:BL: aus
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Bett Vermessung (Raster)
+label_abl_settings:Bett Vermessung (auto)
+label_abl_settings_bbl:Bett Vermessung (bilinear)
+label_abl_settings_ubl:Bett Vermessung (Unified)
+label_abl_settings_ubl_save:im Slot speichern
+label_abl_settings_ubl_load:aus Slot laden
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Slot für den nächsten\nNeustart merken?(Im EEPROM speichern)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:testen
+label_bltouch_deploy:ausfahren
+label_bltouch_stow:einziehen
+label_bltouch_repeat:widerholen
+label_z_offset:Delta Z
+label_probe_offset:Delta Fühler
+label_home_offset:Home Offset
+label_confirmation:Sicher?
+label_down:ab
+label_up:auf
+label_save:speichern
+label_restore:laden
+label_reset:zurücksetzen
+label_default:Standard
+label_clear:löschen
+label_next:nächster
+label_distance:Abstand
+label_invalid_value:Ungültige(r) Wert(e)
+label_timeout_reached:Timeout erreicht!
+label_process_running:Prozess läuft bereits!
+label_process_completed:Prozess fertiggestellt!
+label_process_aborted:Prozess abgebrochen!
+label_inc:erhöhen
+label_dec:verringern
+label_nozzle:Düse
+label_bed:Heizbett
+label_chamber:Kammer
+label_start:Start
+label_stop:Stop
+label_back:zurück
+label_page_up:Seite hoch
+label_page_down:Seite runter
+label_pause:Pause
+label_resume:Wiederaufnahme
+label_load:laden
+label_unload:entladen
+label_slow_speed:langsam
+label_normal_speed:normal
+label_fast_speed:schnell
+label_fan_full_speed:alles
+label_fan_half_speed:halb
+label_rotate_ui:UI drehen
+label_touchscreen_adjust:TSC kalib.
+label_more:mehr
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Hintergrundfarbe Marlin
+label_simulator_font_color:Schriftfarbe Marlin
+label_white:weiß
+label_black:schwarz
+label_blue:blau
+label_red:rot
+label_green:grün
+label_cyan:cyan
+label_yellow:gelb
+label_brown:braun
+label_gray:grau
+label_orange:orange
+label_indigo:indigo
+label_violet:violet
+label_magenta:magenta
+label_purple:lila
+label_lime:grüngelb
+label_darkblue:dunkelblau
+label_darkgreen:dunkelgrün
+label_darkgray:dunkelgrau
+label_disconnect:trennen
+label_baudrate:Baudrate
+label_percentage:Prozent
+label_babystep:BabyStep
+label_percentage_speed:Geschw.
+label_percentage_flow:Fluss
+label_value_zero:0
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:bereit
+label_busy:Bitte warten ...
+label_unconnected:Keine Verbindung zum Drucker!
+label_disconnect_info:Verbindung getrennt!
+label_loading:Lade ...
+label_power_failed:Druck fortsetzen?
+label_continue:fortsetzen
+label_cancel:Abbruch
+label_adjust_title:Touchscreen kalibrieren
+label_adjust_info:roten Punkt antippen
+label_adjust_ok:erfolgreich kalibriert
+label_adjust_failed:Kalibrierung fehlgeschlagen, erneut versuchen.
+label_warning:Warnung
+label_stop_print:Druck abbrechen?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SD Lesefehler!
+label_tftsd_inserted:SD-Karte eingesteckt!
+label_tftsd_removed:SD-Karte entfernt!
+label_u_disk:USB-Stick
+label_read_u_disk_error:USB-Stick Lesefehler!
+label_u_disk_inserted:USB-Stick eingesteckt!
+label_u_disk_removed:USB-Stick entfernt!
+label_onboardsd:Onboard SD
+label_read_onboardsd_error:Onboard SD Lesefehler!
+label_filament_sensor:Filament Sensor
+label_filament_runout:Filament alle!
+label_preheat:vorheizen
+label_preheat_both:beide
+label_is_pause:Extrudieren während\nDruckvorgang nicht\nmöglich!\nDruck pausieren?
+label_auto_shut_down:Automatisch AUS (PS_ON)
+label_unifiedmove:Bewegung
+label_unifiedheat:Heiz.Lüft.
+label_cooldown:abkühlen
+label_emergencystop:NOT AUS!
+label_touch_to_exit:Zum Verlassen, Bildschirm berühren.
+label_mainmenu:Menü
+label_wait_temp_shut_down:Warte bis Hotend-\nTemperatur unter\n %d℃ fällt.
+label_force_shut_down:erzwinge
+label_shutting_down:Fahre herunter...
+label_parameter_setting:Parameter
+label_on:AN
+label_off:AUS
+label_smart:SMART
+label_terminal_ack:Zeige ACK im Terminal
+label_invert_xaxis:Invertiere X-Achse
+label_invert_yaxis:Invertiere Y-Achse
+label_invert_zaxis:Invertiere Z-Achse
+label_move_speed:Geschwindigkeit (XYZ)
+label_knob_led:Drehknopf LED Farbe
+label_knob_led_idle:Drehknopf LED idle Farbe
+label_m0_pause:Pause durch M0 Befehl
+label_send_start_gcode:Gcode vor Druck
+label_send_end_gcode:Gcode nach Druck
+label_send_cancel_gcode:Gcode bei Abbruch
+label_persistent_status_info:Speicherungs-Status
+label_file_listmode:Datein als Liste
+label_current_setting:Treiber Strom (mA)
+label_steps_setting:Steps pro mm
+label_maxfeedrate:max. Geschwindigkeit
+label_maxacceleration:max. Beschleunigung
+label_acceleration:Beschleunigung
+label_print_acceleration:Beschleunigung (Druck)
+label_retract_acceleration:Beschleunigung (Rückzug)
+label_travel_acceleration:Beschleunigung (Fahrt)
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC Empfindlichkeit
+label_fwretract:FW Rückzug
+label_fwrecover:FW Rückeinschub
+label_lin_advance:Linear Advance
+label_reset_settings_info:Hiermit werden alle\nEinstellungen zurückgesetzt. Fortfahren?
+label_reset_settings_done:Einstellungen wurden\nerfolgreich zurückgesetzt.\nBitte neustarten.
+label_info:Info
+label_lcd_brightness:LCD Helligkeit
+label_lcd_brightness_dim:LCD Helligkeit (Standby)
+label_lcd_dim_idle_timer:LCD Timer Standby
+label_5_seconds:5 Sek.
+label_10_seconds:10 Sek.
+label_30_seconds:30 Sek.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Benutz.
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin Modus im Vollbild
+label_plr_en:Wiederherstellung nach Stromausfall
+label_setting_save:Einstellungen speichern
+label_setting_reset:Einstellungen zurücksetzten
+label_setting_restore:Einstellungen wiederherstellen
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Einstellungen im\nEEPROM speichern?
+label_eeprom_restore_info:Einstellungen aus\nEEPROM laden?
+label_eeprom_reset_info:Standardeinstellungen des Druckers wiederherstellen?
+label_retract_feedrate:Rückzugsgeschwindigkeit
+label_retract_length:Rückzugslänge
+label_retract_swap_length:Rückzugslänge (Wechsel)
+label_retract_z_lift:Z-Anhebung bei Rückzug
+label_retract_auto:Auto-Rückzug über Firmware
+label_recover_feedrate:Geschw. Rückeinschub
+label_swap_recover_feedrate:Geschw. Rückeinschub (Wechsel)
+label_recover_length:zus. Länge Rückeinschub
+label_swap_recover_length:zus. Länge Rückeinschub (Wechsel)
+label_start_print:Druck starten:\n %s?
+label_ack_notification:ACK Benachrichtigungs-Stil
+label_leveling_edge_distance:Bettecken-Abstand
+label_xy_unlock:löse XY
+label_tuning:Justage
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune benötigt\neinige Zeit.\nWeitermachen?
+label_pid_start_info_2:PID autotune läuft!
+label_pid_start_info_3:Berühren Sie den Bildschirm erst bei Fertigstellung (Grüne LED)!
+label_tune_extruder:Steps anp.
+label_tune_ext_extrude_100:100mm ext.
+label_tune_ext_temp:Ext. Kalib. Temp.
+label_tune_ext_templow:Temparatur zu niedrig!\nMinimale Temparatur: %d C
+label_tune_ext_desiredval:Temparatur hat gewünschten Wert noch nicht erreicht
+label_tune_ext_mark120mm:Filament 120 mm über Einlass markieren,\ndann '%s' drücken & nach Extrusion\nerneut messen
+label_tune_ext_heatoff:Heizung abschalten?
+label_tune_ext_adj_esteps:E-Steps einstellen
+label_tune_ext_esteps_saved:Neue E-Steps gespeichert!\nBitte auch im EEPROM speichern.\nNeuer Wert: %0.2f
+label_tune_ext_measured:Restliche Länge:
+label_tune_ext_old_estep:Alte E-Steps: %0.2f
+label_tune_ext_new_estep:Neue E-Steps: %0.2f
+label_connection_settings:Verbindung
+label_offset_tool:Abstand 2te Düse
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Benachrichtigungen
+label_mesh_editor:Mesh edit.
+label_mesh_tuner:Mesh anp.
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_en.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_en.ini
new file mode 100644
index 0000000000..242e34b9c0
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_en.ini	
@@ -0,0 +1,284 @@
+#### Language Code:EN
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:English
+label_heat:Heat
+label_move:Move
+label_home:Home
+label_disable_steppers:Disarm All
+label_print:Print
+label_extrude:Extrude
+label_fan:Fan
+label_settings:Settings
+label_screen_settings:Screen
+label_machine_settings:Machine
+label_feature_settings:Feature
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Shut Down
+label_rgb_settings:LED Color
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Custom
+label_leveling:Leveling
+label_point_1:Point 1
+label_point_2:Point 2
+label_point_3:Point 3
+label_point_4:Point 4
+label_point_5:Point 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Deploy
+label_bltouch_stow:Stow
+label_bltouch_repeat:Repeat
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Save
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Increase
+label_dec:Decrease
+label_nozzle:Nozzle
+label_bed:Hotbed
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Back
+label_page_up:Page up
+label_page_down:Page down
+label_pause:Pause
+label_resume:Resume
+label_load:Load
+label_unload:Unload
+label_slow_speed:Slow
+label_normal_speed:Normal
+label_fast_speed:Fast
+label_fan_full_speed:Full
+label_fan_half_speed:Half
+label_rotate_ui:Rotate UI
+label_touchscreen_adjust:TSC Adjust
+label_more:More
+label_screen_info:Info
+label_status:Info
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:White
+label_black:Black
+label_blue:Blue
+label_red:Red
+label_green:Green
+label_cyan:Cyan
+label_yellow:Yellow
+label_brown:Brown
+label_gray:Gray
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Disconnect
+label_baudrate:BaudRate
+label_percentage:Percentage
+label_babystep:BabyStep
+label_percentage_speed:Speed
+label_percentage_flow:Flow
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Ready
+label_busy:Busy processing, please wait...
+label_unconnected:No printer attached!
+label_disconnect_info:Now you can control the printer by your computer!
+label_loading:Loading...
+label_power_failed:Continue printing?
+label_continue:Continue
+label_cancel:Cancel
+label_adjust_title:Touch Screen Calibration
+label_adjust_info:Please click on the red dot
+label_adjust_ok:Adjustment Success
+label_adjust_failed:Adjustment failed, Please Try Again
+label_warning:Warning
+label_stop_print:Stop printing?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:Read TFT SD card error!
+label_tftsd_inserted:Card inserted!
+label_tftsd_removed:Card removed!
+label_u_disk:U Disk
+label_read_u_disk_error:Read U Disk error!
+label_u_disk_inserted:U Disk inserted!
+label_u_disk_removed:U Disk removed!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:Read Onboard SD card error!
+label_filament_sensor:Filament sensor
+label_filament_runout:filament runout!
+label_preheat:Preheat
+label_preheat_both:Both
+label_is_pause:Unable to extrude when\nprinting.\nPause printing?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Movement
+label_unifiedheat:Heat/Fan
+label_cooldown:Cool Down
+label_emergencystop:EM. STOP
+label_touch_to_exit:Touch anywhere to exit
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wait for the hotend\ntemperature to be\nlower than %d ℃
+label_force_shut_down:Force
+label_shutting_down:Shutting down...
+label_parameter_setting:Parameter Settings
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_es.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_es.ini
new file mode 100644
index 0000000000..057786fc95
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_es.ini	
@@ -0,0 +1,284 @@
+#### Language Code:ES
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Español
+label_heat:Calentar
+label_move:Mover
+label_home:Origen
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extruir
+label_fan:Ventilar
+label_settings:Configurar
+label_screen_settings:Pantalla
+label_machine_settings:Máquina
+label_feature_settings:Añadidos
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Apagar
+label_rgb_settings:Color LED
+label_rgb_off:Apagar LED
+label_terminal:Terminal
+label_custom:Personalizar
+label_leveling:Nivelar
+label_point_1:Punto 1
+label_point_2:Punto 2
+label_point_3:Punto 3
+label_point_4:Punto 4
+label_point_5:Punto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Probar
+label_bltouch_deploy:Desplegar
+label_bltouch_stow:Plegar
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Sonda Compensar
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Grabar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Aumentar
+label_dec:Disminur
+label_nozzle:Punta
+label_bed:Cama
+label_chamber:Chamber
+label_start:Start
+label_stop:Parar
+label_back:Volver
+label_page_up:Retroceder
+label_page_down:Avanzar
+label_pause:Pausar
+label_resume:Continuar
+label_load:Cargar
+label_unload:Descargar
+label_slow_speed:Despacio
+label_normal_speed:Normal
+label_fast_speed:Rápido
+label_fan_full_speed:Todo
+label_fan_half_speed:Mitad
+label_rotate_ui:Rotar
+label_touchscreen_adjust:Calibrar
+label_more:Más
+label_screen_info:Informar
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Blanco
+label_black:Negro
+label_blue:Azul
+label_red:Rojo
+label_green:Verde
+label_cyan:Cyan
+label_yellow:Amarillo
+label_brown:Marrón
+label_gray:Gris
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Desconectar
+label_baudrate:BaudRate
+label_percentage:Porcentaje
+label_babystep:BabyStep
+label_percentage_speed:Velocidad
+label_percentage_flow:Flujo
+label_value_zero:Cero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:+X
+label_y_inc:+Y
+label_z_inc:+Z
+label_x_dec:-X
+label_y_dec:-Y
+label_z_dec:-Z
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Preparado
+label_busy:Procesamiento ocupado, por favor espere...
+label_unconnected:¡No hay comunicación con impresora!
+label_disconnect_info:¡Ahora puede controlar la impresora desde su ordenador!
+label_loading:Cargando...
+label_power_failed:¿Continuar imprimiendo?
+label_continue:Continuar
+label_cancel:Cancelar
+label_adjust_title:¡Calibrar la pantalla táctil
+label_adjust_info:Por favor haga clic en el punto rojo
+label_adjust_ok:Ajuste correcto
+label_adjust_failed:Ajuste fallido, por favor intentelo de nuevo
+label_warning:Advertencia
+label_stop_print:¿Desea parar la impresión?
+label_confirm:Confirmar
+label_tftsd:SD TFT
+label_read_tftsd_error:¡Error en la tarjeta SD TFT!
+label_tftsd_inserted:¡Tarjeta insertada!
+label_tftsd_removed:¡Tarjeta extraida!
+label_u_disk:Pendrive
+label_read_u_disk_error:¡Error en el Pendrive!
+label_u_disk_inserted:¡Pendrive insertado!
+label_u_disk_removed:¡Pendrive extraido!
+label_onboardsd:SD Placa
+label_read_onboardsd_error:¡Error en la tarjeta SD de la placa!
+label_filament_sensor:Filament sensor
+label_filament_runout:¡Filamento agotado!
+label_preheat:Precalentar
+label_preheat_both:Ambos
+label_is_pause:No se puede extruir\nal imprimir,¿\nPausar la impresión?
+label_auto_shut_down:Apag. aut.
+label_unifiedmove:Movimiento
+label_unifiedheat:Calor/Ventilador
+label_cooldown:Enfriarse
+label_emergencystop:PARADA EMERGENCIA
+label_touch_to_exit:Toca cualquier lugar para salir
+label_mainmenu:Menu
+label_wait_temp_shut_down:Espere a que la\ntemperatura del hotend\nsea inferior a %d℃
+label_force_shut_down:Forzar Apagado
+label_shutting_down:Apagando...
+label_parameter_setting:Parámetro
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Desbloquear XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_fr.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_fr.ini
new file mode 100644
index 0000000000..e7f1a05e5a
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_fr.ini	
@@ -0,0 +1,284 @@
+#### Language Code:FR
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Français
+label_heat:Chauffer
+label_move:Déplacer
+label_home:Home
+label_disable_steppers:Moteurs
+label_print:Imprimer
+label_extrude:Extruder
+label_fan:Ventiler
+label_settings:Options
+label_screen_settings:Écran
+label_machine_settings:Machine
+label_feature_settings:Paramètres
+label_sound:Son
+label_touch_sound:Son des touches
+label_toast_sound:Notifications
+label_alert_sound:Popups et alertes
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Eteindre
+label_rgb_settings:LED
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Gcode
+label_leveling:Niveaux
+label_point_1:Point 1
+label_point_2:Point 2
+label_point_3:Point 3
+label_point_4:Point 4
+label_point_5:Point 5
+label_bed_leveling:ABL
+label_bl_complete:Nivellement terminé
+label_bl_smart_fill:Les points de sonde manquants\nont été intelligemment remplis.\n \nNote : n'oubliez pas de sauvegarder !
+label_bl_enable:BL On
+label_bl_disable:BL Off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Nivellement Mesh
+label_abl_settings:Nivellement Automatique
+label_abl_settings_bbl:Nivellement bilinéaire
+label_abl_settings_ubl:Nivellement unifié
+label_abl_settings_ubl_save:Enregistrer dans l'emplacement
+label_abl_settings_ubl_load:Charger depuis l'emplacement
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Se souvenir de l'emplacement\nau prochain redémarrage ?\n(Sauvegarde EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Tester
+label_bltouch_deploy:Déployer
+label_bltouch_stow:Rentrer
+label_bltouch_repeat:Répéter
+label_z_offset:Z Offset
+label_probe_offset:Décalage Palpeur
+label_home_offset:Home Offset
+label_confirmation:Êtes-vous sûr ?
+label_down:Descendre
+label_up:Monter
+label_save:Sauver
+label_restore:Restaurer
+label_reset:Reset
+label_default:Défaut
+label_clear:Effacer
+label_next:Suivant
+label_distance:Distance
+label_invalid_value:Aucune valeur valide fournie !
+label_timeout_reached:Délai d'attente dépassé !
+label_process_running:Processus en cours ! Veuillez patienter
+label_process_completed:Processus terminé !
+label_process_aborted:Processus annulé !
+label_inc:Plus
+label_dec:Moins
+label_nozzle:Buse
+label_bed:Plateau
+label_chamber:Caisson
+label_start:Démarrer
+label_stop:Stopper
+label_back:Retour
+label_page_up:Précédent
+label_page_down:Suivant
+label_pause:Pause
+label_resume:Reprendre
+label_load:Charger
+label_unload:Décharger
+label_slow_speed:Lent
+label_normal_speed:Normal
+label_fast_speed:Rapide
+label_fan_full_speed:Max
+label_fan_half_speed:Moitié
+label_rotate_ui:Rotation
+label_touchscreen_adjust:Ajuster
+label_more:Plus
+label_screen_info:Infos
+label_status:Statut
+label_simulator_bg_color:Couleur de l'arrière-plan Marlin
+label_simulator_font_color:Couleur de la police Marlin
+label_white:Blanc
+label_black:Noir
+label_blue:Bleu
+label_red:Rouge
+label_green:Vert
+label_cyan:Cyan
+label_yellow:Jaune
+label_brown:Marron
+label_gray:Gris
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violette
+label_magenta:Magenta
+label_purple:Violet
+label_lime:Lime
+label_darkblue:Bleu Foncé
+label_darkgreen:Vert Foncé
+label_darkgray:Gris Foncé
+label_disconnect:Libérer
+label_baudrate:Vitesse
+label_percentage:Avancement
+label_babystep:BabyStep
+label_percentage_speed:Vitesse
+label_percentage_flow:Débit
+label_value_zero:Zéro
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Prête
+label_busy:Occupée, veuillez patienter...
+label_unconnected:Aucune imprimante connectée !
+label_disconnect_info:Vous pouvez maintenant contrôler l'imprimante depuis votre ordinateur !
+label_loading:Chargement...
+label_power_failed:Continuer l'impression ?
+label_continue:Continuer
+label_cancel:Annuler
+label_adjust_title:Calibration écran tactile
+label_adjust_info:Veuillez toucher le point rouge
+label_adjust_ok:Succès de l'ajustement
+label_adjust_failed:Ajustement incorrect, veuillez réessayer
+label_warning:Attention
+label_stop_print:Arrêter l'impression ?
+label_confirm:Confirmer
+label_tftsd:SD TFT
+label_read_tftsd_error:Erreur de lecture de la carte SD TFT !
+label_tftsd_inserted:Carte insérée !
+label_tftsd_removed:Carte retirée !
+label_u_disk:Clé USB
+label_read_u_disk_error:Erreur de lecture de la clé USB !
+label_u_disk_inserted:Clé USB insérée !
+label_u_disk_removed:Clé USB retirée !
+label_onboardsd:SD interne
+label_read_onboardsd_error:Erreur de lecture de la carte SD interne !
+label_filament_sensor:Capteur de filament
+label_filament_runout:Fin de Filament !
+label_preheat:Préparer
+label_preheat_both:Global
+label_is_pause:Extrusion impossible quand\nl'impression est en cours.\nMettre l'impression en pause ?
+label_auto_shut_down:Extinction automatique
+label_unifiedmove:Mouvement
+label_unifiedheat:Chauffer
+label_cooldown:Refroidir
+label_emergencystop:Arrêt
+label_touch_to_exit:Toucher n'importe où pour quitter
+label_mainmenu:Menu
+label_wait_temp_shut_down:Attendez que la température de la buse\nsoit inférieure à %d℃
+label_force_shut_down:Forcer l'extinction
+label_shutting_down:Extinction en cours...
+label_parameter_setting:Réglages
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Afficher ACK sur Terminal
+label_invert_xaxis:Inverser l'axe X
+label_invert_yaxis:Inverser l'axe Y
+label_invert_zaxis:Inverser l'axe Z
+label_move_speed:Vitesse de déplacement (X Y Z)
+label_knob_led:LED du bouton rotatif
+label_knob_led_idle:Veille du bouton rotatif
+label_m0_pause:Suspendu par la commande M0
+label_send_start_gcode:Gcode avant l'impression
+label_send_end_gcode:Gcode après l'impression
+label_send_cancel_gcode:Gcode d'annulation
+label_persistent_status_info:Temp. toujours affichées
+label_file_listmode:Fichiers en mode liste
+label_current_setting:Courant Driver (mA)
+label_steps_setting:Steps par mm
+label_maxfeedrate:Débit maximum
+label_maxacceleration:Accélération maximale
+label_acceleration:Accélération
+label_print_acceleration:Impression
+label_retract_acceleration:Rétraction
+label_travel_acceleration:Déplacements
+label_jerk:Jerk
+label_junction_deviation:Ecart de jonction
+label_bump_sensitivity:Sensibilité TMC
+label_fwretract:Rétraction FW
+label_fwrecover:Récupération FW
+label_lin_advance:Linear Advance
+label_reset_settings_info:Réinitialiser tous les\nparamètres aux valeurs\npar défaut ?
+label_reset_settings_done:Réinitialisation des paramètres\nréalisé avec succès.\nVeuillez redémarrer l'imprimante.
+label_info:Infos
+label_lcd_brightness:Luminosité LCD
+label_lcd_brightness_dim:Diminution luminosité
+label_lcd_dim_idle_timer:Durée avant diminution
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Mode Marlin plein écran
+label_plr_en:Reprise après coupure
+label_setting_save:Sauvegarder les paramètres
+label_setting_reset:RAZ des paramètres
+label_setting_restore:Restaurer les paramètres
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Enregistrer les paramètres\ndans l'EEPROM ?
+label_eeprom_restore_info:Restaurer les paramètres\nde l'EEPROM ?
+label_eeprom_reset_info:Réinitialiser l'EEPROM\naux paramètres d'origine\nde l'imprimante ?
+label_retract_feedrate:Vitesse
+label_retract_length:Longueur
+label_retract_swap_length:Longueur de swap
+label_retract_z_lift:Décalage en Z
+label_retract_auto:Rétraction Firmware auto
+label_recover_feedrate:Vitesse
+label_swap_recover_feedrate:Vitesse de swap
+label_recover_length:Longueur
+label_swap_recover_length:Longueur de swap
+label_start_print:Démarrer l'impression :\n%s ?
+label_ack_notification:Style de notification ACK
+label_leveling_edge_distance:Distance au bord du plateau
+label_xy_unlock:Moteurs XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:Autocalibrage PID
+label_pid_start_info:L'autocalibrage PID va être\nlancé. Cela peut prendre\nquelques minutes. Continuer ?
+label_pid_start_info_2:Autocalibrage PID en cours !
+label_pid_start_info_3:Ne touchez pas l'écran avant la fin (LED verte allumée) !
+label_tune_extruder:Extrudeur
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Réglage de l'extrudeur
+label_tune_ext_templow:Température souhaitée\ntrop basse !\nTempérature minimum : %d C
+label_tune_ext_desiredval:La température n'est pas\nencore à la valeur souhaitée
+label_tune_ext_mark120mm:Marquer 120 mm sur le filament\nAppuyer ensuite sur '%s'\nMesurer la longueur restante
+label_tune_ext_heatoff:Arrêter la chauffe ?
+label_tune_ext_adj_esteps:Ajustement E-Steps
+label_tune_ext_esteps_saved:Nouveau E-steps\nenregistré !
+label_tune_ext_measured:Longueur restante
+label_tune_ext_old_estep:Ancien : %0.2f
+label_tune_ext_new_estep:Nouveau : %0.2f
+label_connection_settings:Connexion
+label_offset_tool:Offset 2ème Buse
+label_hybrid_threshold:Seuil Hybride TMC
+label_notifications:Notifications
+label_mesh_editor:Maillage
+label_mesh_tuner:Edition du maillage
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_gr.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_gr.ini
new file mode 100644
index 0000000000..c6b8d9d6fb
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_gr.ini	
@@ -0,0 +1,284 @@
+#### Language Code:GR
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Ελληνικά
+label_heat:Θέρμανση
+label_move:Μετακίνηση
+label_home:Αυτο-Κατεύθυνση
+label_disable_steppers:Disarm All
+label_print:Εκτύπωση
+label_extrude:Εκβολή
+label_fan:Ανεμιστήρας
+label_settings:Ρυθμίσεις
+label_screen_settings:Οθόνη
+label_machine_settings:Μηχανήματος
+label_feature_settings:Χαρακτηριστικών
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Απενεργοποίηση
+label_rgb_settings:Χρώμα LED
+label_rgb_off:Απενεργοποίηση LED
+label_terminal:Τερματικό
+label_custom:Τροποποιημένο
+label_leveling:Ισοπέδωση
+label_point_1:Σημείο 1
+label_point_2:Σημείο 2
+label_point_3:Σημείο 3
+label_point_4:Σημείο 4
+label_point_5:Σημείο 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Δοκιμή
+label_bltouch_deploy:Επέκταση
+label_bltouch_stow:Aπόσυρση
+label_bltouch_repeat:Επανάληψη
+label_z_offset:Αντιστάθμιση Z
+label_probe_offset:Αντιστάθμιση Καθετήρας
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Αποθήκευση
+label_restore:Restore
+label_reset:Επαναφορά
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Αύξηση
+label_dec:Μείωση
+label_nozzle:Στόμιο
+label_bed:Θερμή Βάση
+label_chamber:Chamber
+label_start:Start
+label_stop:Τερμάτιση
+label_back:Πίσω
+label_page_up:Σελίδα πάνω
+label_page_down:Σελίδα κάτω
+label_pause:Παύση
+label_resume:Ξαναρχίσει
+label_load:Φόρτωση
+label_unload:Ξεφόρτωση
+label_slow_speed:Αργά
+label_normal_speed:Κανονικά
+label_fast_speed:Γρήγορα
+label_fan_full_speed:Ολοταχώς
+label_fan_half_speed:Μισή ταχύτητα
+label_rotate_ui:Περιστροφή UI
+label_touchscreen_adjust:Προσαρμογή TOUCH
+label_more:Περισσότερα
+label_screen_info:Πληροφορίες
+label_status:ΚΑΤΑΣΤΑΣΗ
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Άσπρο
+label_black:Μάυρο
+label_blue:Μπλέ
+label_red:Κόκκινο
+label_green:Πράσινο
+label_cyan:Κυανό
+label_yellow:Κίτρινο
+label_brown:Καφέ
+label_gray:Γκρί
+label_orange:Πορτοκάλι
+label_indigo:Ινδικό
+label_violet:Βιολετί
+label_magenta:Πορφύρα
+label_purple:Μωβ
+label_lime:Πρασινοκίτρινο
+label_darkblue:Σκούρο μπλε
+label_darkgreen:Σκούρο πράσινο
+label_darkgray:Σκούρο γκρίζο
+label_disconnect:Αποσυνδέσει
+label_baudrate:BaudRate
+label_percentage:Ποσοστό
+label_babystep:Μικροβήμα
+label_percentage_speed:Ταχύτητα
+label_percentage_flow:Ροή
+label_value_zero:Μηδέν
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01χιλ
+label_01_mm:0.1χιλ
+label_1_mm:1χιλ
+label_5_mm:5χιλ
+label_10_mm:10χιλ
+label_100_mm:100χιλ
+label_200_mm:200χιλ
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Έτοιμο
+label_busy:Απασχολημένη επεξεργασία, παρακάλω περιμένετε ...
+label_unconnected:Δεν υπάρχει συνδεδεμένος εκτυπωτής!
+label_disconnect_info:Τώρα μπορείτε να ελέγξετε τον εκτυπωτή από τον υπολογιστή σας!
+label_loading:Φόρτωση...
+label_power_failed:Συνέχεια εκτύπωσης;
+label_continue:Συνέχεια
+label_cancel:Ματαίωση
+label_adjust_title:Βαθμονόμηση οθόνης αφής
+label_adjust_info:Κάντε κλικ στην κόκκινη κουκκίδα
+label_adjust_ok:Επιτυχία προσαρμογής
+label_adjust_failed:Η προσαρμογή απέτυχε. Δοκιμάστε ξανά
+label_warning:Προειδοποίηση
+label_stop_print:Διακοπή εκτύπωσης?
+label_confirm:Εντάξει
+label_tftsd:TFT SD
+label_read_tftsd_error:Σφάλμα ανάγνωσης κάρτας SD οθόνης!
+label_tftsd_inserted:Η κάρτα έχει εισαχθεί!
+label_tftsd_removed:Η κάρτα αφαιρέθηκε!
+label_u_disk:USB Δίσκος
+label_read_u_disk_error:Σφάλμα ανάγνωσης USB Δίσκου!
+label_u_disk_inserted:Ο USB Δίσκος έχει εισαχθεί!
+label_u_disk_removed:Ο USB Δίσκος αφαιρέθηκε!
+label_onboardsd:Ενσωματωμένη κάρτα SD
+label_read_onboardsd_error:Σφάλμα ανάγνωσης ενσωματωμένης κάρτας SD!
+label_filament_sensor:Αισθητήρας νήματος
+label_filament_runout:τελείωσε το νημά!
+label_preheat:Προθέρμανση
+label_preheat_both:Και τα δυο
+label_is_pause:Δεν είναι δυνατή η εξώθηση κατα τη δυάρκεια\nεκτύπωσης.\nΠαύση εκτύπωσης?
+label_auto_shut_down:Αυτόματη απενεργοποίηση
+label_unifiedmove:Κίνηση
+label_unifiedheat:Θέρμανση/Ανεμιστήρας
+label_cooldown:Κρυώσει
+label_emergencystop:Σταμάτημα έκτακτης ανάγκης
+label_touch_to_exit:Αγγίξτε οπουδήποτε για έξοδο
+label_mainmenu:Μενού
+label_wait_temp_shut_down:Περιμένετε για την \nθερμοκρασία του hotend να πέσει \nχαμηλότερα απο %d ℃
+label_force_shut_down:Αναγκαστική απενεργοποίηση
+label_shutting_down:Απενεργοποίηση...
+label_parameter_setting:Ρυθμίσεις παραμέτρων
+label_on:Ενεργό
+label_off:Σβηστό
+label_smart:ΈΞΥΠΝΟ
+label_terminal_ack:Εμφάνιση ACK στο τερματικό
+label_invert_xaxis:Αντιστρέψει X άξονα
+label_invert_yaxis:Αντιστρέψει Y άξονα
+label_invert_zaxis:Αντιστρέψει Z άξονα
+label_move_speed:Ταχύτητα κίνησης(X Y Z)
+label_knob_led:LED περιστροφικού κουμπιού
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Διακόπηκε λόγω M0 εντολής
+label_send_start_gcode:Αρχικό Gcode προ εκτύπωσης
+label_send_end_gcode:Τερματικό Gcode εφότου εκτύπωσης
+label_send_cancel_gcode:Ματαίωση Gcode
+label_persistent_status_info:Πληροφορίες μόνιμης κατάστασης
+label_file_listmode:Λειτουργία λίστας προβολής αρχείων
+label_current_setting:Ένταση η. ρεύ. οδηγού(mA)
+label_steps_setting:Βήματα ανά χιλ
+label_maxfeedrate:Μέγιστο ποσοστό τροφοδοσίας
+label_maxacceleration:Μέγιστη επιτάχυνση
+label_acceleration:Eπιτάχυνση
+label_print_acceleration:Επιτάχυνση εκτύπωσης
+label_retract_acceleration:Eπιτάχυνση ανάκλησης
+label_travel_acceleration:Επιτάχυνση ταξιδιού
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC ευαισθησία χτυπήματος
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Όλες οι ρυθμίσεις θα \nεπαναφερθούν στις προεπιλεγμένες \nτιμές. Συνεχίσει?
+label_reset_settings_done:Η επαναφορά όλων των ρυθμίσεων \nολοκληρώθηκε με επιτυχία. \nΓια πλήρη εφαρμογή,\nπαρακάλω επανεκκινήστε τη συσκευή σας.
+label_info:Πληροφορίες
+label_lcd_brightness:Φωτεινότητα οθόνης
+label_lcd_brightness_dim:Φωτεινότητα LCD σκοτεινή
+label_lcd_dim_idle_timer:Xρονομετρητής αδράνειας οθόνης
+label_5_seconds:5 Δευτ.
+label_10_seconds:10 Δευτ.
+label_30_seconds:30 Δευτ.
+label_60_seconds:1 Λεπτό
+label_120_seconds:2 Λεπτά
+label_300_seconds:5 Λεπτά
+label_custom_seconds:Τροποποιημένες ρυθμίσεις
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Λειτουργία Marlin σε πλήρη οθόνη
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_hu.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_hu.ini
new file mode 100644
index 0000000000..18f4a1d3b6
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_hu.ini	
@@ -0,0 +1,284 @@
+#### Language Code:HU
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Magyar
+label_heat:Fűtés
+label_move:Mozgás
+label_home:Végállás
+label_disable_steppers:Léptetők
+label_print:Nyomtatás
+label_extrude:Adagolás
+label_fan:Hűtés
+label_settings:Opciók
+label_screen_settings:Kijelző
+label_machine_settings:Gép
+label_feature_settings:Funkciók
+label_sound:Hangok
+label_touch_sound:Érintés hangja
+label_toast_sound:Fűtő értesítések
+label_alert_sound:Felugró riasztások
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Leállítás
+label_rgb_settings:LED Szín
+label_rgb_off:LED KI
+label_terminal:Terminál
+label_custom:Egyedi
+label_leveling:Szintezés
+label_point_1:1. pont
+label_point_2:2. pont
+label_point_3:3. pont
+label_point_4:4. pont
+label_point_5:5. pont
+label_bed_leveling:Ágyszint
+label_bl_complete:Ágy Szintezése Sikeres
+label_bl_smart_fill:A hiányzó szonda pontok\nkitöltésre kerültek.\nMegjegyzés: Mentsd el!
+label_bl_enable:BL: be
+label_bl_disable:BL: ki
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Kézi Rács Szintezés
+label_abl_settings:Automata Szintezés
+label_abl_settings_bbl:Bilineáris Szintezés
+label_abl_settings_ubl:Egységes Szintezés
+label_abl_settings_ubl_save:Mentés szlotba
+label_abl_settings_ubl_load:Betöltés szlotból
+label_abl_slot0:Szlot 0
+label_abl_slot1:Szlot 1
+label_abl_slot2:Szlot 2
+label_abl_slot3:Szlot 3
+label_abl_slot_eeprom:Emlékezzen a következő\nújraindításnál? (EEPROM Mentése)
+label_abl_z:Z Áttűnés
+label_bltouch:BLTouch
+label_bltouch_test:Teszt
+label_bltouch_deploy:Telepítés
+label_bltouch_stow:Elhelyezés
+label_bltouch_repeat:Ismétlés
+label_z_offset:Z Eltolás
+label_probe_offset:Szonda Eltolás
+label_home_offset:Home Offset
+label_confirmation:Biztos vagy benne?
+label_down:Le
+label_up:Fel
+label_save:Mentés
+label_restore:Betöltés
+label_reset:Újratölt
+label_default:Alapért.
+label_clear:Tiszta
+label_next:Tovább
+label_distance:Távolság
+label_invalid_value:Nincs érvényes érték/s megadva
+label_timeout_reached:Időkorlát elérve!
+label_process_running:Folyamat fut!
+label_process_completed:Folyamat befejezve!
+label_process_aborted:Folyamat megszakítva!
+label_inc:Növel
+label_dec:Csökkent
+label_nozzle:Fej
+label_bed:Ágy
+label_chamber:Kamra
+label_start:Kezdés
+label_stop:Állj
+label_back:Vissza
+label_page_up:Fel
+label_page_down:Le
+label_pause:Szünet
+label_resume:Folytatás
+label_load:Betöltés
+label_unload:Kiadás
+label_slow_speed:Lassú
+label_normal_speed:Normál
+label_fast_speed:Gyors
+label_fan_full_speed:Teljes
+label_fan_half_speed:Fél
+label_rotate_ui:Forgatás
+label_touchscreen_adjust:Igazítás
+label_more:Több
+label_screen_info:Infó
+label_status:Státusz
+label_simulator_bg_color:Marlin mód háttérszín
+label_simulator_font_color:Marlin mód betűszín
+label_white:Fehér
+label_black:Fekete
+label_blue:Kék
+label_red:Piros
+label_green:Zöld
+label_cyan:Cián
+label_yellow:Sárga
+label_brown:Barna
+label_gray:Szürke
+label_orange:Narancs
+label_indigo:Indigó
+label_violet:Viola
+label_magenta:Bíborvörös
+label_purple:Lila
+label_lime:Mész
+label_darkblue:Sötétkék
+label_darkgreen:Sötétzöld
+label_darkgray:Sötétszürke
+label_disconnect:Leválaszt
+label_baudrate:Kapcsolat
+label_percentage:Százalék
+label_babystep:Mikrolépés
+label_percentage_speed:Sebesség
+label_percentage_flow:Folyás
+label_value_zero:Nulla
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Kész
+label_busy:Feldolgozás alatt, kérlek várj...
+label_unconnected:Nincs nyomtató csatlakoztatva!
+label_disconnect_info:Most a számítógépéről vezérelheted a nyomtatót!
+label_loading:Betöltés...
+label_power_failed:Folytatod a nyomtatást?
+label_continue:Folytatás
+label_cancel:Mégse
+label_adjust_title:Érintőképernyő kalibrálása.
+label_adjust_info:Kattints a piros pontra.
+label_adjust_ok:Kalibrálás sikeres.
+label_adjust_failed:A kalibrálás sikertelen, próbáld újra
+label_warning:Figyelem!
+label_stop_print:Megállítod a nyomtatást?
+label_confirm:Igen
+label_tftsd:TFT-SD
+label_read_tftsd_error:TFT-SD olvasási hiba!
+label_tftsd_inserted:SD-Kártya behelyezve!
+label_tftsd_removed:SD-Kártya eltávolítva!
+label_u_disk:USB Tár
+label_read_u_disk_error:USB olvasási hiba!
+label_u_disk_inserted:USB behelyezve!
+label_u_disk_removed:USB eltávolítva!
+label_onboardsd:Lap-SD
+label_read_onboardsd_error:Alaplap-SD olvasási hiba!
+label_filament_sensor:Filament érzékelő
+label_filament_runout:Filament kifutás!
+label_preheat:Előfűtés
+label_preheat_both:Mindkettő
+label_is_pause:Nem sikerült az adagolás\na nyomtatás alatt.\nSzünetelteted a nyomtatást?
+label_auto_shut_down:Automata kikapcsolás
+label_unifiedmove:Mozgás
+label_unifiedheat:Fűt/Hűt
+label_cooldown:Lehűtés
+label_emergencystop:VészSTOP
+label_touch_to_exit:Érintsd meg a kilépéshez.
+label_mainmenu:Főmenü
+label_wait_temp_shut_down:Várd meg a fej\nvisszahűlését.%d℃
+label_force_shut_down:Kényszerítés
+label_shutting_down:Leállítás...
+label_parameter_setting:Tényezők
+label_on:BE
+label_off:KI
+label_smart:OKOS
+label_terminal_ack:ACK Megjelenítése
+label_invert_xaxis:X megfordítása
+label_invert_yaxis:Y megfordítása
+label_invert_zaxis:Z megfordítása
+label_move_speed:Mozg.Sebesség (X-Y-Z)
+label_knob_led:Forgatógomb LED
+label_knob_led_idle:Forgatógomb tétlen
+label_m0_pause:Szünetelés M0 parancsal
+label_send_start_gcode:Kezdő G-Kód
+label_send_end_gcode:Befejező G-Kód
+label_send_cancel_gcode:Leállító G-Kód
+label_persistent_status_info:Perzisztens állapotinfó
+label_file_listmode:Fájlnéző listamód
+label_current_setting:Motoráramok Beállítása
+label_steps_setting:Lépés Beállítás
+label_maxfeedrate:Max Előtolási Sebesség
+label_maxacceleration:Max Gyorsulás
+label_acceleration:Gyorsulás
+label_print_acceleration:Nyomtatás Gyorsulás
+label_retract_acceleration:Adagoló Gyorsulása
+label_travel_acceleration:Utazási Gyorsulás
+label_jerk:Rántás
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC ütközés érzékenység
+label_fwretract:FW Visszahúzás
+label_fwrecover:FW Visszahúzás helyreáll.
+label_lin_advance:Lineáris Haladás
+label_reset_settings_info:Minden beállítás vissza\nfog állni alapértelmezett\nértékre. Folytatod?
+label_reset_settings_done:A beállítások visszaállítása\nsikeresen megtörtént.\nAz aktiváláshoz indítsd\nújra az eszközt.
+label_info:Infó
+label_lcd_brightness:LCD Fényerősség
+label_lcd_brightness_dim:LCD Halványítás
+label_lcd_dim_idle_timer:LCD Halványítási idő
+label_5_seconds:5 Mp.
+label_10_seconds:10 Mp.
+label_30_seconds:30 Mp.
+label_60_seconds:1 Perc.
+label_120_seconds:2 Perc.
+label_300_seconds:5 Perc.
+label_custom_seconds:Egyedi
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Nagyképernyős Marlin mód
+label_plr_en:Áramkiesés helyreálítása
+label_setting_save:Beállítások mentése
+label_setting_reset:Beállítás visszaállítása
+label_setting_restore:Beállítások újratöltése
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Menti a megváltozott\nbeállításokat az EEPROM-ba?
+label_eeprom_restore_info:Betöltöd a beállításokat az\nEEPROM-ból?
+label_eeprom_reset_info:Visszaállítod az EEPROM-ot a\ngyári beállításokra?
+label_retract_feedrate:Visszahúzás előtol.
+label_retract_length:Visszahúzás hossz
+label_retract_swap_length:Csere hossz vissza.
+label_retract_z_lift:Z emelése visszahú.
+label_retract_auto:Automata Visszahúzás
+label_recover_feedrate:Előtolás javítás
+label_swap_recover_feedrate:Csere előtolás jav.
+label_recover_length:Hossz javítás
+label_swap_recover_length:Cserehossz javítás
+label_start_print:Elindítod a %s\nfájl nyomtatását?
+label_ack_notification:ACK egyéb típus
+label_leveling_edge_distance:Ágy szélének távolsága
+label_xy_unlock:Felold XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID Automatikus Hangolás
+label_pid_start_info:A PID önhangolása elindul.\nPercekig is eltarthat.\nFolytatod?
+label_pid_start_info_2:PID Automatikus hangolása zajlik!
+label_pid_start_info_3:NE ÉRINTSD meg a kijelzőt míg nincs kész! (zöld LED jelzi)!
+label_tune_extruder:Lépés hangolás
+label_tune_ext_extrude_100:Kiad 100mm
+label_tune_ext_temp:Adagoló hangolás | Fűt
+label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d C
+label_tune_ext_desiredval:A hőfok még nem érte el a kívánt értéket
+label_tune_ext_mark120mm:A 120mm-t jelöld be a szálon\nNyomd '%s' ha kész\nMérd meg a hátralévő hosszt\nadagolás után.
+label_tune_ext_heatoff:Kikapcsolod a fűtést?
+label_tune_ext_adj_esteps:Állítható E-lépés
+label_tune_ext_esteps_saved:Új E-lépés mentve!\nNe felejtsd el\nmenteni EEPROM-ba.\nÚj érték: %0.2f
+label_tune_ext_measured:Fennmaradó Hossz:
+label_tune_ext_old_estep:Régi e-lépés: %0.2f
+label_tune_ext_new_estep:Új e-lépés: %0.2f
+label_connection_settings:Kapcsolat
+label_offset_tool:Második fej eltolása
+label_hybrid_threshold:TMC Hibrid Küszöbérték
+label_notifications:Értesítések
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_it.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_it.ini
new file mode 100644
index 0000000000..0a7368f35f
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_it.ini	
@@ -0,0 +1,284 @@
+#### Language Code:IT
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Italiano
+label_heat:Riscalda
+label_move:Muovi
+label_home:Home
+label_disable_steppers:Spegni mot
+label_print:Stampa
+label_extrude:Estrudi
+label_fan:Ventola
+label_settings:Opzioni
+label_screen_settings:Schermo
+label_machine_settings:Stampante
+label_feature_settings:Extra
+label_sound:Suono
+label_touch_sound:Suono touch
+label_toast_sound:Notifiche Toast
+label_alert_sound:Popup e Avvisi
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Spegni
+label_rgb_settings:RGB LED
+label_rgb_off:Spegni
+label_terminal:Terminale
+label_custom:Custom
+label_leveling:Livella
+label_point_1:Punto 1
+label_point_2:Punto 2
+label_point_3:Punto 3
+label_point_4:Punto 4
+label_point_5:Punto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Livellamento Bed Completato
+label_bl_smart_fill:Punti di test mancanti\nsono stati scelti automaticamente.\n \nNote: ricorda di salvare!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Salva in slot
+label_abl_settings_ubl_load:Carica da slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Ricorda lo slot per il prossimo\nriavvio? (Salva EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Estrai
+label_bltouch_stow:Ritrai
+label_bltouch_repeat:Ripeti
+label_z_offset:Z Offset
+label_probe_offset:Offset Sonda
+label_home_offset:Home Offset
+label_confirmation:Sei sicuro?
+label_down:Giù
+label_up:Su
+label_save:Salva
+label_restore:Ripristina
+label_reset:Reset
+label_default:Default
+label_clear:Cancella
+label_next:Avanti
+label_distance:Distanza
+label_invalid_value:Valore invalido
+label_timeout_reached:Timeout raggiunto!
+label_process_running:Processo già in esecuzione!
+label_process_completed:Processo completato!
+label_process_aborted:Processo interrotto!
+label_inc:Aumenta
+label_dec:Diminuisci
+label_nozzle:Ugello
+label_bed:Piatto
+label_chamber:Camera
+label_start:Avvia
+label_stop:Stop
+label_back:Indietro
+label_page_up:Pagina Su
+label_page_down:Pagina Giu
+label_pause:Pausa
+label_resume:Riprendi
+label_load:Carica
+label_unload:Estrai
+label_slow_speed:Lento
+label_normal_speed:Normale
+label_fast_speed:Veloce
+label_fan_full_speed:Massimo
+label_fan_half_speed:Metà
+label_rotate_ui:Ruota UI
+label_touchscreen_adjust:Calibra
+label_more:Altro
+label_screen_info:Info
+label_status:Stato
+label_simulator_bg_color:Marlin simulator colore sfondo
+label_simulator_font_color:Marlin simulator colore scritte
+label_white:Bianco
+label_black:Nero
+label_blue:Blu
+label_red:Rosso
+label_green:Verde
+label_cyan:Ciano
+label_yellow:Giallo
+label_brown:Marrone
+label_gray:Grigio
+label_orange:Arancione
+label_indigo:Indaco
+label_violet:Viola
+label_magenta:Magenta
+label_purple:Viola
+label_lime:Lime
+label_darkblue:Blu Scuro
+label_darkgreen:Vrde Scuro
+label_darkgray:Grigio Scuro
+label_disconnect:Scollega
+label_baudrate:BaudRate
+label_percentage:Percentuale
+label_babystep:BabyStep
+label_percentage_speed:Velocità
+label_percentage_flow:Flusso
+label_value_zero:Zero
+label_1_degree:1°
+label_5_degree:5°
+label_10_degree:10°
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pronto
+label_busy:Caricamento,attendi...
+label_unconnected:Stampante non connessa
+label_disconnect_info:Puoi controllare la stampante dal PC!
+label_loading:Caricamento...
+label_power_failed:Vuoi continuare la stampa?
+label_continue:Continua
+label_cancel:Cancella
+label_adjust_title:Calibrazione Touch Screen
+label_adjust_info:Premi sui punti rossi
+label_adjust_ok:Regolazione Completata!
+label_adjust_failed:Regolazione Fallita. Riprova!
+label_warning:Attenzione
+label_stop_print:Vuoi fermare la stampa?
+label_confirm:Conferma
+label_tftsd:SD Schermo
+label_read_tftsd_error:Errore lettura SD!
+label_tftsd_inserted:SD Inserita
+label_tftsd_removed:SD Rimossa
+label_u_disk:USB Disk
+label_read_u_disk_error:Errore lettura U Disk
+label_u_disk_inserted:U Disk inserita!
+label_u_disk_removed:U Disk rimossa!
+label_onboardsd:Micro SD
+label_read_onboardsd_error:Errore lettura Micro SD!
+label_filament_sensor:Sensore Filamento
+label_filament_runout:Filamento finito!
+label_preheat:Prepara
+label_preheat_both:Entrambi
+label_is_pause:Impossibile estrudere\ndurante la stampa,\nvuoi sospendere?
+label_auto_shut_down:Auto Spegnimento
+label_unifiedmove:Movimento
+label_unifiedheat:Scalda
+label_cooldown:Raffredda
+label_emergencystop:EMERGENZA
+label_touch_to_exit:Premi ovunque per uscire
+label_mainmenu:Menu
+label_wait_temp_shut_down:Attendi che la temperatura\ndell'hotend scenda\nsotto %d℃
+label_force_shut_down:Forza
+label_shutting_down:Spegnimento...
+label_parameter_setting:Parametri
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Mostra ACK nel terminale
+label_invert_xaxis:Inverti Asse X
+label_invert_yaxis:Inverti Asse Y
+label_invert_zaxis:Inverti Asse Z
+label_move_speed:Vel. Movimenti (X Y Z)
+label_knob_led:LED Manopola 
+label_knob_led_idle:LED Manopola inattivo
+label_m0_pause:Messo in pausa dal comando M0
+label_send_start_gcode:Gcode prima di stampare
+label_send_end_gcode:Gcode dopo la stampa
+label_send_cancel_gcode:Gcode Cancella
+label_persistent_status_info:Info/Stato Permanenti
+label_file_listmode:Files in modalità lista
+label_current_setting:Corrente Motori(mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Avanzamento
+label_maxacceleration:Max Accelerazione
+label_acceleration:Accelerazione
+label_print_acceleration:Accel. Stampa
+label_retract_acceleration:Accel. Ritrazione
+label_travel_acceleration:Accel. Spostamenti
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC Sensibilità Urto
+label_fwretract:FW Retrazione
+label_fwrecover:FW Recupero Retrazione
+label_lin_advance:Linear Advance
+label_reset_settings_info:Ripristinare tutte le\nimpostazioni\nai valori predefiniti?
+label_reset_settings_done:Ripristino di tutte le impostazioni\navvenuto con successo.\nperfavore riavvia il dispositivo.
+label_info:Info
+label_lcd_brightness:Luminosità LCD
+label_lcd_brightness_dim:Lumin. LCD ridotta
+label_lcd_dim_idle_timer:Riduzione lumin. dopo
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode schermo pieno
+label_plr_en:Recupero mancanza corrente
+label_setting_save:Salva le impostazioni
+label_setting_reset:Ripristina impost standard
+label_setting_restore:Ripristina impost precedenti
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Salvare le impostazioni di\nstampa nella EEPROM?
+label_eeprom_restore_info:Carica le impostazioni \ndalla EEPROM?
+label_eeprom_reset_info:Ripristino EEPROM alle \nimpostazioni di fabbrica?
+label_retract_feedrate:Avanzamento retraz
+label_retract_length:Lunghezza retraz
+label_retract_swap_length:Lunghezza cambio fil.
+label_retract_z_lift:Alza Z al cambio
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Avanzamento ripristino
+label_swap_recover_feedrate:Avanzamento cambio fil
+label_recover_length:Lunghezza extra al ripr.
+label_swap_recover_length:Lunghezza extra al cambio
+label_start_print:Inizia a stampare:\n %s?
+label_ack_notification:ACK stile notifica
+label_leveling_edge_distance:Distanza dai bordi
+label_xy_unlock:Sblocca XY
+label_tuning:Regola
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune potrebbe\nrichiedere un po' di tempo.\nContinuare?
+label_pid_start_info_2:PID autotune in corso!
+label_pid_start_info_3:Non toccare lo schermo prima del completamento (LED verde Acceso)!
+label_tune_extruder:Step E
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Temperatura desisderata troppo bassa!\nTemperatura minima: %d C
+label_tune_ext_desiredval:La temperatura non è ancora al valore desiderato
+label_tune_ext_mark120mm:Segna 120 mm sul filamento\nPremi '%s' quando pronto\nMisura lunghezza rimanente\ndopo l'estrusione
+label_tune_ext_heatoff:Spegnere il riscaldamento?
+label_tune_ext_adj_esteps:Regola E-Steps
+label_tune_ext_esteps_saved:Nuovi E-steps salvati!\nNon dimenticare di\nsalvarli nellaEEPROM\nNuovo valore: %0.2f
+label_tune_ext_measured:Lunghezza rimanente:
+label_tune_ext_old_estep:Vecchi e-steps: %0.2f
+label_tune_ext_new_estep:Nuovi e-steps: %0.2f
+label_connection_settings:Imp.Conn.
+label_offset_tool:Offset 2nd Ugello
+label_hybrid_threshold:TMC Soglia Modo Ibrido
+label_notifications:Notifiche
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_jp.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_jp.ini
new file mode 100644
index 0000000000..27b8cbadf3
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_jp.ini	
@@ -0,0 +1,284 @@
+#### Language Code:JP
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:日本語
+label_heat:あたため
+label_move:移動
+label_home:ゼロにする
+label_disable_steppers:Disarm All
+label_print:プリント
+label_extrude:押出
+label_fan:ファン
+label_settings:設定
+label_screen_settings:画面
+label_machine_settings:マシン
+label_feature_settings:機能
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:シャットダウン
+label_rgb_settings:LED カラー
+label_rgb_off:LED オフ
+label_terminal:端末
+label_custom:カスタム
+label_leveling:レベリング
+label_point_1:ポイント1
+label_point_2:ポイント2
+label_point_3:ポイント3
+label_point_4:ポイント4
+label_point_5:ポイント5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:自動調整
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:テスト
+label_bltouch_deploy:展開
+label_bltouch_stow:収納
+label_bltouch_repeat:繰り返す
+label_z_offset:Zオフセット
+label_probe_offset:プローブオフセット
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:保存
+label_restore:Restore
+label_reset:リセット
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:増え
+label_dec:減る
+label_nozzle:ノズル
+label_bed:ベッド
+label_chamber:Chamber
+label_start:Start
+label_stop:停止
+label_back:戻る
+label_page_up:前ページ
+label_page_down:次ページ
+label_pause:一時停止
+label_resume:続ける
+label_load:増え
+label_unload:減る
+label_slow_speed:ゆっくり
+label_normal_speed:正常速度
+label_fast_speed:早め
+label_fan_full_speed:全速
+label_fan_half_speed:50%速さ
+label_rotate_ui:回転UI
+label_touchscreen_adjust:校正する
+label_more:詳細
+label_screen_info:ついて
+label_status:状態
+label_simulator_bg_color:Marlin シミュレータの背景色
+label_simulator_font_color:Marlinシミュレータフォントの色
+label_white:白色
+label_black:黒色
+label_blue:青色
+label_red:赤色
+label_green:緑色
+label_cyan:シアン
+label_yellow:黄色
+label_brown:茶色
+label_gray:灰色
+label_orange:オレンジ
+label_indigo:インディゴ
+label_violet:バイオレット
+label_magenta:赤紫色
+label_purple:紫
+label_lime:ライム
+label_darkblue:濃紺
+label_darkgreen:ダークグリーン
+label_darkgray:暗灰色
+label_disconnect:データ接続
+label_baudrate:ポートレート
+label_percentage:パーセント
+label_babystep:ベビーステップ
+label_percentage_speed:スビード
+label_percentage_flow:押出
+label_value_zero:ゼロ
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:準備中
+label_busy:ビジー状態、しばらくお待ちください...
+label_unconnected:プリンターに連続していない!
+label_disconnect_info:SDカード　PC両用
+label_loading:ロッド中...
+label_power_failed:プリントを継続しますか?
+label_continue:継続
+label_cancel:キャンセル
+label_adjust_title:タッチスクリーン較正
+label_adjust_info:赤星をタッチ
+label_adjust_ok:校正が成功しました
+label_adjust_failed:校正が失敗しました、も一度お試して下さい
+label_warning:注意
+label_stop_print:プリントを中止しますか?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SDカードの読み取りがエラー発生しました!
+label_tftsd_inserted:SDカード入りました!
+label_tftsd_removed:SDカード出しました!
+label_u_disk:USBメモリー
+label_read_u_disk_error:USBメモリー読み込みエラー!
+label_u_disk_inserted:U Diskカード入りました!
+label_u_disk_removed:U Diskカード出しました!
+label_onboardsd:内部 mSDカード
+label_read_onboardsd_error:内部 mSDカードの読み取りがエラー発生しました!
+label_filament_sensor:フィラメントセンサ
+label_filament_runout:フィラメントランアウト!
+label_preheat:予熱する
+label_preheat_both:両方
+label_is_pause:印刷時に押し出すことができない。印刷を中止しますか？
+label_auto_shut_down:オートパワー
+label_unifiedmove:移動
+label_unifiedheat:ヒート&ファン
+label_cooldown:クールダウン
+label_emergencystop:EM.停止
+label_touch_to_exit:クリックして終了します
+label_mainmenu:メニュー
+label_wait_temp_shut_down:ホットエンドの温度が%d℃未満になるまで待ちます。
+label_force_shut_down:フォース
+label_shutting_down:シャットダウン...
+label_parameter_setting:パラメータ
+label_on:ON
+label_off:OFF
+label_smart:スマート
+label_terminal_ack:端末でACKを表示する
+label_invert_xaxis:X軸を反転
+label_invert_yaxis:Y軸を反転
+label_invert_zaxis:Z軸を反転
+label_move_speed:移動速度(X Y Z)
+label_knob_led:回転ノブLED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:MOコマンドで一時停止
+label_send_start_gcode:印刷前にGコードを開始する
+label_send_end_gcode:印刷後にGコードを終了する
+label_send_cancel_gcode:Gコードをキャンセルする
+label_persistent_status_info:永続的なステータス情報
+label_file_listmode:ファイルビューアリストモード
+label_current_setting:ドライバー電流 (mA)
+label_steps_setting:MMあたりのステップ
+label_maxfeedrate:マックスフィード率
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:印刷加速度
+label_retract_acceleration:引き戻し加速度
+label_travel_acceleration:空振り加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC バンプ感度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:すべての設定をデフォルト値にリセットしますか?
+label_reset_settings_done:すべての設定が正常にリセットされました。デバイスを再起動してください。
+label_info:情報
+label_lcd_brightness:LCD明るさ
+label_lcd_brightness_dim:LCDの輝度が薄暗い
+label_lcd_dim_idle_timer:LCD調光アイドルタイマー
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:カスタム
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:フルスクリーンでマーリンモード
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:設定をリセットする
+label_setting_restore:設定を復元する
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:プリンタの設定をEEPROMに保存しますか?
+label_eeprom_restore_info:EEPROMから設定を再読み込み?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:引き戻し速度
+label_retract_length:引き戻し長さ
+label_retract_swap_length:交換時の引き戻し長さ
+label_retract_z_lift:引き戻し時のz軸上げの高さ
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:押出速度
+label_swap_recover_feedrate:交換時の押出速度
+label_recover_length:余分な押し出し長さ
+label_swap_recover_length:交換時の余分な押し出し長さ
+label_start_print:印刷を開始する:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_pl.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_pl.ini
new file mode 100644
index 0000000000..4295f350d2
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_pl.ini	
@@ -0,0 +1,284 @@
+#### Language Code:PL
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Polski
+label_heat:Temp.
+label_move:Ruch
+label_home:Powrót
+label_disable_steppers:Disarm All
+label_print:Druk
+label_extrude:Extrude
+label_fan:Wentylator
+label_settings:Ustawienia
+label_screen_settings:Ekran
+label_machine_settings:Drukarka
+label_feature_settings:Opcje
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Wyłącz
+label_rgb_settings:Kolor LED
+label_rgb_off:Wyłącz LED
+label_terminal:Terminal
+label_custom:Własne
+label_leveling:Poziomowanie
+label_point_1:Punkt 1
+label_point_2:Punkt 2
+label_point_3:Punkt 3
+label_point_4:Punkt 4
+label_point_5:Punkt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Wysuń
+label_bltouch_stow:Schowaj
+label_bltouch_repeat:Powtórz
+label_z_offset:Z Offset
+label_probe_offset:Przesunięcie
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Zapisz
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Więcej
+label_dec:Mniej
+label_nozzle:Głowica
+label_bed:Stół
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Powrót
+label_page_up:Dalej
+label_page_down:Wstecz
+label_pause:Wstrzymaj
+label_resume:Wznów
+label_load:Load
+label_unload:Unload
+label_slow_speed:Wolno
+label_normal_speed:Normalnie
+label_fast_speed:Szybko
+label_fan_full_speed:Max
+label_fan_half_speed:Połowa
+label_rotate_ui:Obrót
+label_touchscreen_adjust:Kalibracja
+label_more:Więcej
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Biały
+label_black:Czarny
+label_blue:Niebieski
+label_red:Czerwony
+label_green:Zielony
+label_cyan:Turkusowy
+label_yellow:Żółty
+label_brown:Brązowy
+label_gray:Szary
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Odłącz
+label_baudrate:BaudRate
+label_percentage:Procent
+label_babystep:BabyStep
+label_percentage_speed:Prędkość
+label_percentage_flow:Flow
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Gotowy
+label_busy:Trwa przetwarzanie, proszę czekać...
+label_unconnected:Drukarka nie podłączona!
+label_disconnect_info:Teraz możesz kontrolować drukarkę z komputera!
+label_loading:Loading...
+label_power_failed:Kontynuować drukowanie?
+label_continue:Kontynuuj
+label_cancel:Anuluj
+label_adjust_title:Kalibracja ekranu dotykowego
+label_adjust_info:Dotykaj czerwoną kropkę
+label_adjust_ok:Kalibracja poprawna
+label_adjust_failed:Kalibracja niepoprawna, spróbuj ponownie
+label_warning:Uwaga
+label_stop_print:Zatrzymać drukowanie?
+label_confirm:Potwierdź
+label_tftsd:SD TFT
+label_read_tftsd_error:Błąd odczytu karty SD wyświetlacza!
+label_tftsd_inserted:Karta włożona!
+label_tftsd_removed:Karta wyjęta!
+label_u_disk:U Disk
+label_read_u_disk_error:Błąd odczytu U Disk!
+label_u_disk_inserted:U Disk włożony!
+label_u_disk_removed:U Disk wyjęty!
+label_onboardsd:SD płyta
+label_read_onboardsd_error:Błąd odczytu karty SD na płycie!
+label_filament_sensor:Filament sensor
+label_filament_runout:brak filamentu!
+label_preheat:Rozgrzew.
+label_preheat_both:Wszystko
+label_is_pause:Operacja niedostępna\nw trakcie drukowania,\nwstrzymać drukowanie?
+label_auto_shut_down:Auto Wył.
+label_unifiedmove:Ruch
+label_unifiedheat:Temperatura
+label_cooldown:Chłodzenie
+label_emergencystop:ZATRZYMAJ
+label_touch_to_exit:Dotkij aby wyjść
+label_mainmenu:Menu
+label_wait_temp_shut_down:Czekam na schłodzenie\ndo %d℃
+label_force_shut_down:Wymuś
+label_shutting_down:Wyłączanie...
+label_parameter_setting:Parametr
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Odblokuj XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_pt.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_pt.ini
new file mode 100644
index 0000000000..7fabd12fbd
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_pt.ini	
@@ -0,0 +1,284 @@
+#### Language Code:PT
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Portugues
+label_heat:Aquecer
+label_move:Mover
+label_home:Inicio
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extrudir
+label_fan:Ventoinha
+label_settings:Configurar
+label_screen_settings:Ecra
+label_machine_settings:Impressora
+label_feature_settings:Extras
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Desligar
+label_rgb_settings:LED cor
+label_rgb_off:Desligar
+label_terminal:Terminal
+label_custom:Custom
+label_leveling:Nivelar
+label_point_1:Ponto 1
+label_point_2:Ponto 2
+label_point_3:Ponto 3
+label_point_4:Ponto 4
+label_point_5:Ponto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Testar
+label_bltouch_deploy:Abrir
+label_bltouch_stow:Encolher
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Gravar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Aumentar
+label_dec:Diminuir
+label_nozzle:Nozzle
+label_bed:Hotbed
+label_chamber:Chamber
+label_start:Start
+label_stop:Parar
+label_back:Voltar
+label_page_up:Subir pagina
+label_page_down:Pagina abaixo
+label_pause:Pausar
+label_resume:Resumir
+label_load:Carregar
+label_unload:Descarregar
+label_slow_speed:Lento
+label_normal_speed:Normal
+label_fast_speed:Rapido
+label_fan_full_speed:Full
+label_fan_half_speed:Half
+label_rotate_ui:Rodar
+label_touchscreen_adjust:Ajustar
+label_more:Mais
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Branco
+label_black:Preto
+label_blue:Azul
+label_red:Vermelho
+label_green:Verde
+label_cyan:Turquesa
+label_yellow:Amarelo
+label_brown:Castanho
+label_gray:Cinzento
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Desconectar
+label_baudrate:BaudRate
+label_percentage:Percentagem
+label_babystep:BabyStep
+label_percentage_speed:Rapidez
+label_percentage_flow:Fluxo
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pronto
+label_busy:Em processamento, aguarde...
+label_unconnected:Nenhuma impressora conectada!
+label_disconnect_info:Agora podes controlar a impressora com o computador!
+label_loading:Carregando...
+label_power_failed:Continuar a imprimir?
+label_continue:Continuar
+label_cancel:Cancelar
+label_adjust_title:Calibracao do Touch Screen
+label_adjust_info:Por favor, clique no ponto vermelho
+label_adjust_ok:Ajustado com sucesso
+label_adjust_failed:Ajuste falhou, tente novamente
+label_warning:Aviso
+label_stop_print:Parar de imprimir?
+label_confirm:Confirme
+label_tftsd:TFT SD
+label_read_tftsd_error:Erro a ler TFT SD!
+label_tftsd_inserted:Cartao inserido!
+label_tftsd_removed:Cartao removido!
+label_u_disk:U Disk
+label_read_u_disk_error:Erro a ler U Disk!
+label_u_disk_inserted:U Disk inserido!
+label_u_disk_removed:U Disk removido!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:Erro a ler Onboard SD card!
+label_filament_sensor:Filament sensor
+label_filament_runout:Filamento runout!
+label_preheat:Aquecer
+label_preheat_both:Ambos
+label_is_pause:Nao e possível a extrusão\ndurante a impressao,\npausar a impressao?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Movimento
+label_unifiedheat:Heat/Fan
+label_cooldown:Arrefecer
+label_emergencystop:EMERGENCIA STOP
+label_touch_to_exit:Toque em qualquer lugar para sair
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wait for the hotend\ntemperature to be\nlower than %d ℃
+label_force_shut_down:Force
+label_shutting_down:Shutting down...
+label_parameter_setting:Parâmetro
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Desbloquear XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_ru.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_ru.ini
new file mode 100644
index 0000000000..2378beb99b
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_ru.ini	
@@ -0,0 +1,284 @@
+#### Language Code:RU
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Русский
+label_heat:Нагрев
+label_move:Движение
+label_home:Домой
+label_disable_steppers:Двигатели
+label_print:Печать
+label_extrude:Экструзия
+label_fan:Вентилятор
+label_settings:Настройки
+label_screen_settings:Экран
+label_machine_settings:Принтер
+label_feature_settings:Опции
+label_sound:Звуки
+label_touch_sound:Звуки нажатий
+label_toast_sound:Звуки инфостроки
+label_alert_sound:Предупреждения
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Выключить
+label_rgb_settings:Цвет LED
+label_rgb_off:LED выкл
+label_terminal:Терминал
+label_custom:Своё меню
+label_leveling:Стол вруч.
+label_point_1:Точка 1
+label_point_2:Точка 2
+label_point_3:Точка 3
+label_point_4:Точка 4
+label_point_5:Точка 5
+label_bed_leveling:Стол равнен.
+label_bl_complete:Выравнивание стола окончено
+label_bl_smart_fill:Отсутствующие точки\nзамера были атоматически\nзаполнены.\nЗапомните для сохраниения!
+label_bl_enable:BL: вкл
+label_bl_disable:BL: выкл
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Равнение по сетке
+label_abl_settings:Автовыравнивание
+label_abl_settings_bbl:Билинейная калибровка
+label_abl_settings_ubl:Универсальная калибровка
+label_abl_settings_ubl_save:Сохранить в ячейку
+label_abl_settings_ubl_load:Загрузить из ячейки
+label_abl_slot0:Ячейка 0
+label_abl_slot1:Ячейка 1
+label_abl_slot2:Ячейка 2
+label_abl_slot3:Ячейка 3
+label_abl_slot_eeprom:Восстановить из ячейки\nпри перезагрузке?\n(Сохранить в EEPROM)
+label_abl_z:Z затухание
+label_bltouch:BLTouch
+label_bltouch_test:BLT тест
+label_bltouch_deploy:BLT вниз
+label_bltouch_stow:BLT вверх
+label_bltouch_repeat:Точность Z
+label_z_offset:Отступ Z
+label_probe_offset:Смещение датчика
+label_home_offset:Home Offset
+label_confirmation:Вы уверены?
+label_down:Вниз
+label_up:Вверх
+label_save:Сохранить
+label_restore:Вернуть
+label_reset:Сброс
+label_default:По умолчанию
+label_clear:Очистить
+label_next:Следующий
+label_distance:Отступы
+label_invalid_value:Остутствуют правильные значения!
+label_timeout_reached:Время истекло!
+label_process_running:Идёт процесс!
+label_process_completed:Процесс завершён!
+label_process_aborted:Процесс прерван!
+label_inc:Увеличить
+label_dec:Уменьшить
+label_nozzle:Сопло
+label_bed:Стол
+label_chamber:Камера
+label_start:Начать
+label_stop:Стоп
+label_back:Назад
+label_page_up:Стр.
+label_page_down:Стр. 
+label_pause:Пауза
+label_resume:Продолжить
+label_load:Загрузка
+label_unload:Выгрузка
+label_slow_speed:Медленно
+label_normal_speed:Обычно
+label_fast_speed:Быстро
+label_fan_full_speed:Максимум
+label_fan_half_speed:50%
+label_rotate_ui:Переворот
+label_touchscreen_adjust:Калибровка
+label_more:Больше
+label_screen_info:Инфо
+label_status:Статус
+label_simulator_bg_color:Задний фон Marlin режима
+label_simulator_font_color:Передний фон Marlin режима
+label_white:Белый
+label_black:Чёрный
+label_blue:Синий
+label_red:Красный
+label_green:Зелёный
+label_cyan:Голубой
+label_yellow:Жёлтый
+label_brown:Коричневый
+label_gray:Серый
+label_orange:Оранжевый
+label_indigo:Индиго
+label_violet:Фиолетовый
+label_magenta:Маджента
+label_purple:Пурпурный
+label_lime:Лаймовый
+label_darkblue:Тёмно-синий
+label_darkgreen:Тёмно-зелёный
+label_darkgray:Тёмно-серый
+label_disconnect:Отключить
+label_baudrate:Скорость
+label_percentage:Подстройки
+label_babystep:Микрошаг Z
+label_percentage_speed:Скорость
+label_percentage_flow:Поток
+label_value_zero:Обнулить
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01мм
+label_01_mm:0.1мм
+label_1_mm:1мм
+label_5_mm:5мм
+label_10_mm:10мм
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Готов
+label_busy:Занято процессом, подождите...
+label_unconnected:Нет подключения!
+label_disconnect_info:Управление принтером через компьютер
+label_loading:Загрузка...
+label_power_failed:Продолжить печать?
+label_continue:Продолжение
+label_cancel:Отмена
+label_adjust_title:Калибровка экрана
+label_adjust_info:Нажмите на красную точку
+label_adjust_ok:Успешная калибровка
+label_adjust_failed:Неудачная калибровка, попробуйте снова
+label_warning:Внимание
+label_stop_print:Остановить печать?
+label_confirm:OK
+label_tftsd:SD экрана
+label_read_tftsd_error:Ошибка чтения SD карты!
+label_tftsd_inserted:SD карта вставлена!
+label_tftsd_removed:SD карта извлечена!
+label_u_disk:Флеш карта
+label_read_u_disk_error:Ошибка чтения флеш карты!
+label_u_disk_inserted:Флеш карта вставлена!
+label_u_disk_removed:Флеш карта извлечена!
+label_onboardsd:SD платы
+label_read_onboardsd_error:Ошибка чтения SD карты!
+label_filament_sensor:Сенсор прутка
+label_filament_runout:Пруток закончился
+label_preheat:Преднагрев
+label_preheat_both:Оба
+label_is_pause:Невозможна экструзия\nпри печати, поставить\nна паузу?
+label_auto_shut_down:Автовыключение
+label_unifiedmove:Движение
+label_unifiedheat:Нагрев
+label_cooldown:Охладить
+label_emergencystop:Экст.стоп
+label_touch_to_exit:Нажмите для возврата
+label_mainmenu:Меню
+label_wait_temp_shut_down:Дождитесь температуры\nсопла не ниже чем %d℃
+label_force_shut_down:Принудительно выкл
+label_shutting_down:Выключаю...
+label_parameter_setting:Параметры
+label_on:Вкл
+label_off:Выкл
+label_smart:Умный
+label_terminal_ack:ACK терминала (C°)
+label_invert_xaxis:Инверсия оси X
+label_invert_yaxis:Инверсия оси Y
+label_invert_zaxis:Инверсия оси Z
+label_move_speed:Скорость (X Y Z)
+label_knob_led:Подсветка энкодера
+label_knob_led_idle:Простой подсветки энкодера
+label_m0_pause:Пауза по команде M0
+label_send_start_gcode:G-код перед печатью
+label_send_end_gcode:G-код после печати
+label_send_cancel_gcode:G-код отмены печати
+label_persistent_status_info:Нагрев в инфостроке
+label_file_listmode:Файлы в режиме строк
+label_current_setting:Настройка TMC драйверов
+label_steps_setting:Настройка шагов на мм
+label_maxfeedrate:MAX скорость подачи
+label_maxacceleration:MAX ускорение
+label_acceleration:Ускорение
+label_print_acceleration:Печати
+label_retract_acceleration:Ретракта
+label_travel_acceleration:Перемещения
+label_jerk:Рывок
+label_junction_deviation:Отклонение узла
+label_bump_sensitivity:TMC чувствительность удара
+label_fwretract:M207 ретракт
+label_fwrecover:M208 восстановление ретракта
+label_lin_advance:К-фактор
+label_reset_settings_info:Все настройки будут\nсброшены по умолчанию.\nПродолжить?
+label_reset_settings_done:Успешный сброс настроек\nэкрана. Для полного\nвступления в силу,\nперегрузите устройство.
+label_info:Информация
+label_lcd_brightness:Яркость LCD
+label_lcd_brightness_dim:Регулировка яркости LCD
+label_lcd_dim_idle_timer:Время до гашения LCD
+label_5_seconds:5 сек.
+label_10_seconds:10 сек.
+label_30_seconds:30 сек.
+label_60_seconds:1 мин.
+label_120_seconds:2 мин.
+label_300_seconds:5 мин.
+label_custom_seconds:Своё
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin на весь экран
+label_plr_en:Работа после потери питания
+label_setting_save:Сохранить настройки
+label_setting_reset:Сбросить настройки
+label_setting_restore:Восстановить настройки
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Сохранить настройки\nпринтера в EEPROM?
+label_eeprom_restore_info:Загрузить настройки\nиз EEPROM?
+label_eeprom_reset_info:Сбрость EEPROM настройки\nпринтера на начальные?
+label_retract_feedrate:Скорость
+label_retract_length:Длина
+label_retract_swap_length:Длина при смене сопла
+label_retract_z_lift:Подъём по Z
+label_retract_auto:Авто FW ретракт
+label_recover_feedrate:Скорость
+label_swap_recover_feedrate:Скорость при смене сопла
+label_recover_length:Длина
+label_swap_recover_length:Длина при смене сопла
+label_start_print:Начать печать:\n %s?
+label_ack_notification:ACK стиль уведомления
+label_leveling_edge_distance:Отступы от краёв стола
+label_xy_unlock:Моторы выкл
+label_tuning:Наладка
+label_pid:PID
+label_pid_title:PID автонастройка
+label_pid_start_info:Сейчас будет запущена PID\nавтонастройка, это займёт\nнекоторое время. Продолжить?
+label_pid_start_info_2:Автонастройка PID в работе!
+label_pid_start_info_3:Не трогайте экран до\nокончания настройки\n(загориться зелёным LED)!
+label_tune_extruder:Настройка шагов
+label_tune_ext_extrude_100:100mm экст.
+label_tune_ext_temp:Настройка экструдера/Нагрев
+label_tune_ext_templow:Требуемая температура\nслишком низкая!\nМинимальная температура: %d℃
+label_tune_ext_desiredval:Температура еще не достигла требуемого значения
+label_tune_ext_mark120mm:Отметьте 120 мм на филаменте\nНажмите '%s' по говности\nИзмерьте полученную длину/nпосле экструдирования
+label_tune_ext_heatoff:Отключить нагрев?
+label_tune_ext_adj_esteps:Подстройка E-шагов
+label_tune_ext_esteps_saved:E-шаги установлены!\nНе забудьте сохранить\nих в EEPROM\nНовое значение: %0.2f
+label_tune_ext_measured:Оставшаяся длина:
+label_tune_ext_old_estep:Старые E-шаги: %0.2f
+label_tune_ext_new_estep:Новые E-шаги: %0.2f
+label_connection_settings:Соединение
+label_offset_tool:Смещение 2-го сопла
+label_hybrid_threshold:TMC гибридный порог
+label_notifications:Уведомления
+label_mesh_editor:Сетка ред.
+label_mesh_tuner:Сетка настр.
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_sk.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_sk.ini
new file mode 100644
index 0000000000..208b160e9c
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_sk.ini	
@@ -0,0 +1,284 @@
+#### Language Code:SK
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Slovensky
+label_heat:Teplota
+label_move:Posunúť
+label_home:Domov
+label_disable_steppers:Disarm All
+label_print:Tlačiť
+label_extrude:Extrúder
+label_fan:Ofuk
+label_settings:Nastavenia
+label_screen_settings:Obrazovka
+label_machine_settings:Tlačiareň
+label_feature_settings:Funkcie
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Vypnúť
+label_rgb_settings:Farba LED
+label_rgb_off:Vypnúť LED
+label_terminal:Terminál
+label_custom:Vlastné
+label_leveling:Vyrovnanie
+label_point_1:Bod 1
+label_point_2:Bod 2
+label_point_3:Bod 3
+label_point_4:Bod 4
+label_point_5:Bod 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Vystrčiť
+label_bltouch_stow:Stiahnuť
+label_bltouch_repeat:Opakovať
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Uložiť
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Pridať
+label_dec:Ubrať
+label_nozzle:Tryska
+label_bed:Podložka
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Naspäť
+label_page_up:Ďalej
+label_page_down:Naspäť
+label_pause:Pauza
+label_resume:Pokračovať
+label_load:Zaviesť
+label_unload:Vysunúť
+label_slow_speed:Pomaly
+label_normal_speed:Normálne
+label_fast_speed:Rýchlo
+label_fan_full_speed:Naplno
+label_fan_half_speed:Polovičná
+label_rotate_ui:Otočiť
+label_touchscreen_adjust:Kalibrácia
+label_more:Viacej
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Biela
+label_black:Čierna
+label_blue:Modrá
+label_red:Červená
+label_green:Zelená
+label_cyan:Tyrkysová
+label_yellow:Žltá
+label_brown:Hnedá
+label_gray:Šedá
+label_orange:Oranžová
+label_indigo:Indigo
+label_violet:Fialová
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Odpojiť
+label_baudrate:BaudRate
+label_percentage:Percentá
+label_babystep:BabyStep
+label_percentage_speed:Rýchlosť
+label_percentage_flow:Prietok
+label_value_zero:Vypnúť
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pripravená
+label_busy:Počkajte prosím...
+label_unconnected:Tlačiareň odpojená!
+label_disconnect_info:Teraz môžete tlačiareň ovládať z počítača!
+label_loading:Načítavam...
+label_power_failed:Pokračovať v tlači?
+label_continue:Pokračovať
+label_cancel:Zrušiť
+label_adjust_title:Kalibrácia
+label_adjust_info:Dotknite sa postupne všetkých bodov
+label_adjust_ok:Kalibrácia úspešná
+label_adjust_failed:Kalibrácia zlyhala, opakovať
+label_warning:Varovanie
+label_stop_print:Zastaviť tlač?
+label_confirm:Potvrdiť
+label_tftsd:TFT SD
+label_read_tftsd_error:Chyba pri načítaní SD karty!
+label_tftsd_inserted:SD karta vložená!
+label_tftsd_removed:SD karta odstránená!
+label_u_disk:USB kľúč
+label_read_u_disk_error:Chyba pri načítaní USB kľúča!
+label_u_disk_inserted:USB kľúč vložený!
+label_u_disk_removed:USB disk odstránený!
+label_onboardsd:SD karta na doske
+label_read_onboardsd_error:Chyba pri načítaní SD karty na doske!
+label_filament_sensor:Filament senzor
+label_filament_runout:Chýba filament!
+label_preheat:Nahriať
+label_preheat_both:Tryska/Podložka
+label_is_pause:Nemožno extrudovať\npočas tlače,\npozastaviť tlač?
+label_auto_shut_down:Auto vyp.
+label_unifiedmove:Pohyb
+label_unifiedheat:Nahriať
+label_cooldown:Ochladiť
+label_emergencystop:STOP
+label_touch_to_exit:Dotknite sa obrazovky pre ukončenie
+label_mainmenu:Menu
+label_wait_temp_shut_down:Počkať na teplotu\ntrysky menej ako %d℃
+label_force_shut_down:Vynútené vypnutie
+label_shutting_down:Vypínanie...
+label_parameter_setting:Parametre
+label_on:ZAP
+label_off:VYP
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invertovať os X
+label_invert_yaxis:Invertovať os Y
+label_invert_zaxis:Invertovať os Z
+label_move_speed:Rýchlosť pohybu XYZ
+label_knob_led:LED otočného tlačidla
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Pauza príkazom M0
+label_send_start_gcode:Začiatočný Gcode
+label_send_end_gcode:Koncový Gcode
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Trvalé info o stave
+label_file_listmode:Zobraziť súbory ako zoznam
+label_current_setting:Prúd ovládača (mA)
+label_steps_setting:Počet krokov na MM
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Maximálna akcelerácia
+label_acceleration:Akcelerácia
+label_print_acceleration:Akcelerácia pri tlači
+label_retract_acceleration:Akcelerácia retrakcie
+label_travel_acceleration:Akcelerácia presunu
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump citlivosť
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Resetovať všetky nastavenia.
+label_reset_settings_done:Reset všetkých nastavení\nvykonaný. Pre správne\nfungovanie, prosím,\nreštartovať zariadenie.
+label_info:Info
+label_lcd_brightness:Jas LCD
+label_lcd_brightness_dim:Zníženie jasu LCD
+label_lcd_dim_idle_timer:Zníženie jasu LCD po
+label_5_seconds:5 sek.
+label_10_seconds:10 sek.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Odomknite XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_sl.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_sl.ini
new file mode 100644
index 0000000000..1e50ac4142
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_sl.ini	
@@ -0,0 +1,284 @@
+#### Language Code:SL
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Slovenski
+label_heat:Gretje
+label_move:Pomik
+label_home:Domov
+label_disable_steppers:Disarm All
+label_print:Tisk
+label_extrude:Filament
+label_fan:Hlajenje
+label_settings:Nastavitve
+label_screen_settings:Zaslon
+label_machine_settings:Naprava
+label_feature_settings:Funkcije
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Izklop
+label_rgb_settings:Barva LED
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Po meri
+label_leveling:Niveliraj
+label_point_1:Točka 1
+label_point_2:Točka 2
+label_point_3:Točka 3
+label_point_4:Točka 4
+label_point_5:Točka 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Postavi
+label_bltouch_stow:Skrij
+label_bltouch_repeat:Ponovi
+label_z_offset:Z odmik
+label_probe_offset:Odmik sonde
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Shrani
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Več
+label_dec:Manj
+label_nozzle:Šoba
+label_bed:Miza
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Nazaj
+label_page_up:Stran gor
+label_page_down:Stran dol
+label_pause:Pavza
+label_resume:Nadaljuj
+label_load:Naloži
+label_unload:Izvrzi
+label_slow_speed:Počasi
+label_normal_speed:Normalo
+label_fast_speed:Hitro
+label_fan_full_speed:100% moč
+label_fan_half_speed:50% moč
+label_rotate_ui:Obrni UI
+label_touchscreen_adjust:Umeri
+label_more:Več
+label_screen_info:Info
+label_status:Info
+label_simulator_bg_color:Barva ozadja Marlin simulatorja
+label_simulator_font_color:Barva pisave Marlin simulatorja
+label_white:Belo
+label_black:Črno
+label_blue:Mordo
+label_red:Rdeče
+label_green:Zeleno
+label_cyan:Modrozelena
+label_yellow:Rumena
+label_brown:Rjana
+label_gray:Siva
+label_orange:Oranžna
+label_indigo:Indigo
+label_violet:Vijolična
+label_magenta:Magenta
+label_purple:Temno vijolična
+label_lime:Limeta
+label_darkblue:Temno morda
+label_darkgreen:Temno zelena
+label_darkgray:Temno siva
+label_disconnect:Odklopi
+label_baudrate:Baud hitr.
+label_percentage:Procent
+label_babystep:BabyStep
+label_percentage_speed:Hitrost
+label_percentage_flow:Pretok
+label_value_zero:Nič
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pripravljen
+label_busy:Zaseden s procesiranjem, prosim počakaj...
+label_unconnected:Nobenega tiskalnika priključenega!
+label_disconnect_info:Zdaj lahko upravljaš tiskalnik z računalnikom!
+label_loading:Nalagam...
+label_power_failed:Nadaljuj s tiskanjem?
+label_continue:Nadaljuj
+label_cancel:Prekliči
+label_adjust_title:Kalibracija zaslona na dotik
+label_adjust_info:Pritisni na rdečo piko
+label_adjust_ok:Nastavitev uspešna
+label_adjust_failed:Nastavitev neuspešna, prosim poskusi ponovno
+label_warning:Opozorilo
+label_stop_print:Ustavim tisk?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:Napaka branja TFT SD kartice!
+label_tftsd_inserted:Kartica vstavljena!
+label_tftsd_removed:Kartica odstranjena!
+label_u_disk:USB disk
+label_read_u_disk_error:Napaka branja USB diska!
+label_u_disk_inserted:USB disk vstavljen!
+label_u_disk_removed:USB disk odstranjen!
+label_onboardsd:SKR SD
+label_read_onboardsd_error:Napaka branja SKR SD kartice!
+label_filament_sensor:Senzor filamenta
+label_filament_runout:Ni več filamenta!
+label_preheat:Predgretje
+label_preheat_both:Oboje
+label_is_pause:Ne morem estrudirat\nmed tiskanjem.\nPavziram tisk?
+label_auto_shut_down:Samodejni izklop
+label_unifiedmove:Vodenje
+label_unifiedheat:Gretje
+label_cooldown:Ohlajanje
+label_emergencystop:EM. STOP
+label_touch_to_exit:Klikni kjerkoli za izhod
+label_mainmenu:Meni
+label_wait_temp_shut_down:Čakam, da se šoba\nohladi pod %d °C
+label_force_shut_down:Prisilni izklop
+label_shutting_down:Ugašam...
+label_parameter_setting:Parametri
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Pokaži ACK v terminalu
+label_invert_xaxis:Invertiraj X os
+label_invert_yaxis:Invertiraj Y os
+label_invert_zaxis:Invertiraj Z os
+label_move_speed:Hitr. pomika (X Y Z)
+label_knob_led:LED enkoder gumba
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Pavza (M0 ukaz)
+label_send_start_gcode:Zaženi startno G-kodo
+label_send_end_gcode:Zaženi končno G-kodo
+label_send_cancel_gcode:Zaženi G-kodo preklica
+label_persistent_status_info:Stalno prikazuj status
+label_file_listmode:Prikaz datotek v seznamu
+label_current_setting:Tok driverja mot. (mA)
+label_steps_setting:Št. korakov na MM
+label_maxfeedrate:Max hitr. dovajanja fil.
+label_maxacceleration:Max pospešek
+label_acceleration:Pospešek
+label_print_acceleration:Pospešek tiska
+label_retract_acceleration:Pospešek privleka fil.
+label_travel_acceleration:Pospešek pomika
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC občutljivost trka
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset vseh nastavitev na\nprivzete vrednosti?
+label_reset_settings_done:Reset vseh nastavitev\nuspešna.\nPonovno zaženi napravo.
+label_info:Info
+label_lcd_brightness:Svetilnost LCD
+label_lcd_brightness_dim:Zatemnitev LCD
+label_lcd_dim_idle_timer:Zatemnitev po času
+label_5_seconds:5 sek.
+label_10_seconds:10 sek.
+label_30_seconds:30 sek.
+label_60_seconds:1 min.
+label_120_seconds:2 min.
+label_300_seconds:5 min.
+label_custom_seconds:Po meri
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin čez cel zaslon
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset nastavitev
+label_setting_restore:Obnovi nastavitve
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Shrani nastavitve tiskalnika\nv EEPROM?
+label_eeprom_restore_info:Naloži nastavitve iz\nEEPROM-a?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start tiska:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_tc.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_tc.ini
new file mode 100644
index 0000000000..4f65bf0080
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_tc.ini	
@@ -0,0 +1,284 @@
+#### Language Code:TC
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:正體中文
+label_heat:加熱
+label_move:移動
+label_home:回原點
+label_disable_steppers:解鎖電機
+label_print:列印
+label_extrude:擠出
+label_fan:風扇
+label_settings:設定
+label_screen_settings:螢幕設定
+label_machine_settings:機器設定
+label_feature_settings:功能設定
+label_sound:聲音
+label_touch_sound:按鈕聲音
+label_toast_sound:Toast 提示聲音
+label_alert_sound:彈窗和提示聲音
+label_preheatdone_sound:Preheat done notification
+label_shut_down:關閉電源
+label_rgb_settings:燈光顏色
+label_rgb_off:關閉燈光
+label_terminal:終端
+label_custom:自定義
+label_leveling:調平
+label_point_1:第一點
+label_point_2:第二點
+label_point_3:第三點
+label_point_4:第四點
+label_point_5:第五點
+label_bed_leveling:Bed Level
+label_bl_complete:平臺調平完成!
+label_bl_smart_fill:部分點未探測，已被自動填充，需要手動保存!
+label_bl_enable:BL:已開啟
+label_bl_disable:BL:已關閉
+label_abl:自動調平
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch 
+label_bltouch_test:BLTouch檢測
+label_bltouch_deploy:探針彈出
+label_bltouch_stow:探針收回
+label_bltouch_repeat:精度測試
+label_z_offset:Z軸偏移
+label_probe_offset:探針偏移
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:降低
+label_up:抬升
+label_save:儲存設定
+label_restore:恢復
+label_reset:重設
+label_default:默認
+label_clear:Clear
+label_next:下一個
+label_distance:距離
+label_invalid_value:沒有有效的條件!
+label_timeout_reached:已超時!
+label_process_running:正在運行,請稍後
+label_process_completed:處理已完成!
+label_process_aborted:處理已被中斷!
+label_inc:增加
+label_dec:減少
+label_nozzle:噴頭
+label_bed:熱床
+label_chamber:機殼
+label_start:開始
+label_stop:停止
+label_back:返回
+label_page_up:上一頁
+label_page_down:下一頁
+label_pause:暫停
+label_resume:繼續
+label_load:進料
+label_unload:退料
+label_slow_speed:慢速
+label_normal_speed:常速
+label_fast_speed:快速
+label_fan_full_speed:全速
+label_fan_half_speed:半速
+label_rotate_ui:顯示方向
+label_touchscreen_adjust:觸控校正
+label_more:更多
+label_screen_info:關於
+label_status:狀態
+label_simulator_bg_color:Marlin模式背景顏色
+label_simulator_font_color:Marlin模式字體顏色
+label_white:白
+label_black:黑
+label_blue:藍
+label_red:紅
+label_green:綠
+label_cyan:青
+label_yellow:黃
+label_brown:棕
+label_gray:灰
+label_orange:橘
+label_indigo:靛藍
+label_violet:藍紫
+label_magenta:桃紅
+label_purple:紫
+label_lime:萊姆
+label_darkblue:暗藍
+label_darkgreen:暗綠
+label_darkgray:深灰
+label_disconnect:中斷連線
+label_baudrate:串列傳輸速率
+label_percentage:百分比
+label_babystep:Z軸微調
+label_percentage_speed:速度百分比
+label_percentage_flow:流量百分比
+label_value_zero:歸零
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:已準備好
+label_busy:系統繁忙請稍等
+label_unconnected:尚未連線到主機板
+label_disconnect_info:電腦控制模式
+label_loading:讀取中
+label_power_failed:要繼續列印嗎？
+label_continue:繼續
+label_cancel:取消
+label_adjust_title:觸控校正
+label_adjust_info:點擊紅點
+label_adjust_ok:校正成功
+label_adjust_failed:校正失敗
+label_warning:警告
+label_stop_print:要停止列印嗎？
+label_confirm:確定
+label_tftsd:SD卡
+label_read_tftsd_error:SD卡讀取失敗
+label_tftsd_inserted:偵測到SD卡
+label_tftsd_removed:SD卡已拔出
+label_u_disk:隨身碟
+label_read_u_disk_error:隨身碟讀取失敗
+label_u_disk_inserted:偵測到隨身碟
+label_u_disk_removed:隨身碟已拔出
+label_onboardsd:主機板插槽的SD卡
+label_read_onboardsd_error:主機板插槽的SD卡讀取失敗
+label_filament_sensor:耗材感應器
+label_filament_runout:沒偵測到耗材
+label_preheat:預熱
+label_preheat_both:全部
+label_is_pause:列印時無法擠出耗材，要暫停列印嗎？
+label_auto_shut_down:自動關機
+label_unifiedmove:運動
+label_unifiedheat:溫度
+label_cooldown:冷卻
+label_emergencystop:立刻停止
+label_touch_to_exit:觸控任意位置退出頁面
+label_mainmenu:選單
+label_wait_temp_shut_down:噴頭降溫中，直到%d ℃時自動關機
+label_force_shut_down:強制關機
+label_shutting_down:關機中
+label_parameter_setting:參數設定
+label_on:開啟
+label_off:關閉
+label_smart:自動
+label_terminal_ack:在G-code終端顯示溫度
+label_invert_xaxis:X軸反向運轉
+label_invert_yaxis:Y軸反向運轉
+label_invert_zaxis:Z軸反向運轉
+label_move_speed:移動速度(X Y Z)
+label_knob_led:旋鈕LED顏色
+label_knob_led_idle:旋鈕LED自動睡眠
+label_m0_pause:M0暫停
+label_send_start_gcode:執行起始G-code
+label_send_end_gcode:執行結尾G-code
+label_send_cancel_gcode:中斷執行G-code
+label_persistent_status_info:頂部溫度訊息
+label_file_listmode:文件預覽列表模式
+label_current_setting:驅動晶片電流設定 (mA)
+label_steps_setting:電機每毫米步數Steps/mm
+label_maxfeedrate:最大移動速度
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:列印加速度
+label_retract_acceleration:回抽加速度
+label_travel_acceleration:空跑加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:堵料檢測靈敏度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:所有設定都會恢復預設值，確定嗎?
+label_reset_settings_done:重設成功，請重新開機
+label_info:提示
+label_lcd_brightness:螢幕亮度
+label_lcd_brightness_dim:睡眠狀態螢幕亮度
+label_lcd_dim_idle_timer:螢幕進入睡眠時間
+label_5_seconds:5秒.
+label_10_seconds:10秒.
+label_30_seconds:30秒.
+label_60_seconds:1分鐘
+label_120_seconds:2分鐘
+label_300_seconds:5分鐘
+label_custom_seconds:自訂
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:全螢幕Marlin模式
+label_plr_en:断电续打
+label_setting_save:保存设置
+label_setting_reset:重置设置
+label_setting_restore:保存设置
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:是否保存打印机设置到EEPROM?
+label_eeprom_restore_info:是否从EEPROM加载设置?
+label_eeprom_reset_info:重置EEPROM到出厂设置?
+label_retract_feedrate:FW回抽速度
+label_retract_length:FW回抽长度
+label_retract_swap_length:换料时回抽的长度
+label_retract_z_lift:回抽时Z轴抬升的高度
+label_retract_auto:FW自动回抽
+label_recover_feedrate:FW挤出速度
+label_swap_recover_feedrate:换料时挤出的速度
+label_recover_length:额外挤出的长度
+label_swap_recover_length:换料时额外挤出的长度
+label_start_print:是否开始打印:\n %s?
+label_ack_notification:ACK 弹窗类型
+label_leveling_edge_distance:手动调平边沿距离
+label_xy_unlock:解锁XY
+label_tuning:调整
+label_pid:PID
+label_pid_title:PID自动整定
+label_pid_start_info:开始PID自动整定,需要几分钟来完成,是否继续?
+label_pid_start_info_2:PID 正在自动整定中!
+label_pid_start_info_3:不要操作触控屏直到整定完成!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:挤出100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:连接
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_tr.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_tr.ini
new file mode 100644
index 0000000000..2ca140d514
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/Language Packs/language_tr.ini	
@@ -0,0 +1,284 @@
+#### Language Code:TR
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Türkçe
+label_heat:Isıt
+label_move:Hareket
+label_home:Sıfırla
+label_disable_steppers:Disarm All
+label_print:Yazdır
+label_extrude:Filament
+label_fan:Fan
+label_settings:Ayarlar
+label_screen_settings:Ekran
+label_machine_settings:Makine
+label_feature_settings:Özellik
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Kapat
+label_rgb_settings:LED Rengi
+label_rgb_off:LED'i Kapat
+label_terminal:Terminal
+label_custom:Diğer
+label_leveling:Kalibrasyon
+label_point_1:1.Nokta
+label_point_2:2.Nokta
+label_point_3:3.Nokta
+label_point_4:4.Nokta
+label_point_5:5.Nokta
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Deploy
+label_bltouch_stow:Stow
+label_bltouch_repeat:Repeat
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Kaydet
+label_restore:Restore
+label_reset:Sıfırla
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Arttır
+label_dec:Azalt
+label_nozzle:Nozül
+label_bed:Tabla
+label_chamber:Chamber
+label_start:Start
+label_stop:Durdur
+label_back:Geri
+label_page_up:Yukarı
+label_page_down:Aşağı
+label_pause:Duraklat
+label_resume:Devam
+label_load:Yükle
+label_unload:Çıkar
+label_slow_speed:Yavaş
+label_normal_speed:Normal
+label_fast_speed:Hızlı
+label_fan_full_speed:Tam
+label_fan_half_speed:Yarım
+label_rotate_ui:Döndür
+label_touchscreen_adjust:Kalibre
+label_more:Daha
+label_screen_info:Bilgi
+label_status:Bilgi
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Beyaz
+label_black:Siyah
+label_blue:Mavi
+label_red:Kırmızı
+label_green:Yeşil
+label_cyan:Camgöbeği
+label_yellow:Sarı
+label_brown:Kahverengi
+label_gray:Gri
+label_orange:Turuncu
+label_indigo:Çivit Mavisi
+label_violet:Menekşe
+label_magenta:Eflatun
+label_purple:Mor
+label_lime:Çim Rengi
+label_darkblue:Koyu Mavi
+label_darkgreen:Koyu Yeşil
+label_darkgray:Koyu Gri
+label_disconnect:Bağlt. Kes
+label_baudrate:BaudRate
+label_percentage:Yüzde
+label_babystep:BabyStep
+label_percentage_speed:Hız
+label_percentage_flow:Akış
+label_value_zero:Sıfır
+label_1_degree:1°C
+label_5_degree:5°C
+label_10_degree:10°C
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%
+label_ready:Hazır
+label_busy:İşlem devam ediyor, lütfen bekleyiniz...
+label_unconnected:Yazıcı bağlı değil!
+label_disconnect_info:Artık yazıcıyı\nbilgisayarınızdan kontrol\nedebilirsiniz!
+label_loading:Yükleniyor...
+label_power_failed:Yazdırmaya devam edilsin mi?
+label_continue:Devam et
+label_cancel:İptal
+label_adjust_title:Dokunmatik Ekran Kalibrasyonu
+label_adjust_info:Lütfen kırmızı noktaya\ntıklayın
+label_adjust_ok:Kalibrasyon başarılı.
+label_adjust_failed:Kalibrasyon başarısız,\nlütfen tekrar deneyiniz.
+label_warning:Uyarı
+label_stop_print:Baskı durdurulsun mu?
+label_confirm:Tamam
+label_tftsd:SD Kart
+label_read_tftsd_error:SD kart okunamadı!
+label_tftsd_inserted:SD Kart Takıldı!
+label_tftsd_removed:SD Kart Çıkarıldı!
+label_u_disk:USB Disk
+label_read_u_disk_error:USB disk okunamadı!
+label_u_disk_inserted:USB Disk Takıldı!
+label_u_disk_removed:USB Disk Çıkarıldı!
+label_onboardsd:Dahili SD
+label_read_onboardsd_error:Dahili SD Okunamadı!
+label_filament_sensor:Filament sensörü
+label_filament_runout:Filament Bitti!
+label_preheat:Ön Isıtma
+label_preheat_both:Birlikte
+label_is_pause:Ekstrüde edilemiyor\nyazdırırken,\nNbaskı duraklatılsın mı?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Hareket
+label_unifiedheat:Isıtma/Fan
+label_cooldown:Soğutma
+label_emergencystop:AcilDurdur
+label_touch_to_exit:Çıkmak için herhangi bir yere dokunun
+label_mainmenu:Menü
+label_wait_temp_shut_down:Wait for the hotend\ntemperature to be\nlower than %d℃
+label_force_shut_down:Zorlamak
+label_shutting_down:Kapatılıyor...
+label_parameter_setting:Parametre Ayarları
+label_on:Açık
+label_off:Kapalı
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:X Eksenini Tersine Çevir
+label_invert_yaxis:Y Eksenini Tersine Çevir
+label_invert_zaxis:Z Eksenini Tersine Çevir
+label_move_speed:Hareket Hızı(X Y Z)
+label_knob_led:Döner Düğme LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Gcode'u iptal et
+label_persistent_status_info:Dosyaları Liste Şeklinde
+label_file_listmode:Dosya Görüntüleyici Liste Modu
+label_current_setting:Sürücü Akımı (mA)
+label_steps_setting:MM başına adım sayısı
+label_maxfeedrate:Maks. İlerleme Hızı
+label_maxacceleration:Maks. İvmelenme
+label_acceleration:İvmelenme
+label_print_acceleration:Baskı İvmelenmesi
+label_retract_acceleration:Geriçekme İvmelenmesi
+label_travel_acceleration:Gezinti İvmelenmesi
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC çarpma hassasiyeti
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Tüm ayarlar varsayılana\nsıfırlanacak değerler.\nDevam edilsin mi?
+label_reset_settings_done:Tüm ayarları başarıyla\nsıfırlama tamamlandı. Tam\nolarak etkili olması için\nlütfen cihazı yeniden\nbaşlatın.
+label_info:Bilgi
+label_lcd_brightness:Ekran Parlaklığı
+label_lcd_brightness_dim:Ekran Parlaklığı Kısılma Oranı
+label_lcd_dim_idle_timer:Ekran Parlaklığı Kısılma Süresi
+label_5_seconds:5 Sn.
+label_10_seconds:10 Sn.
+label_30_seconds:30 Sn.
+label_60_seconds:1 Dak.
+label_120_seconds:2 Dak.
+label_300_seconds:5 Dak.
+label_custom_seconds:Kişisel
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update - Unified Menu Material theme/config.ini b/Copy to SD Card root directory to update - Unified Menu Material theme/config.ini
new file mode 100644
index 0000000000..539e43be42
--- /dev/null
+++ b/Copy to SD Card root directory to update - Unified Menu Material theme/config.ini	
@@ -0,0 +1,452 @@
+#### Default Config file for BigTreeTech TFT Controllers
+#
+# BIGTREE_TFT35_V1_1 / BIGTREE_TFT35_V1_2    / BIGTREE_TFT35_V2_0
+# BIGTREE_TFT35_V3_0 / BIGTREE_TFT35_E3_V3_0 / BIGTREE_TFT28_V1_0
+# BIGTREE_TFT28_V3_0 / BIGTREE_TFT24_V1_1    / MKS_32_V1_4
+#
+# Firmware Source: https://github.com/bigtreetech/BIGTREETECH-TouchScreenFirmware
+
+
+#--------------------------------------------------------------------
+# Supported Marlin Firmware Version
+#--------------------------------------------------------------------
+#  Minimum Marlin Firmware Version: 2.0.5.4
+#  Distribution date: 2020-05-12
+#  Source: https://github.com/MarlinFirmware/Marlin/releases
+#
+
+#  Note: Ensure that following options are enabled in Marlin firmware
+#
+#  M115_GEOMETRY_REPORT (in Configuration_adv.h)
+#  REPORT_FAN_CHANGE (in Configuration_adv.h)
+#  EMERGENCY_PARSER (in Configuration_adv.h)
+#  SERIAL_FLOAT_PRECISION 4 (in Configuration_adv.h)
+
+#--------------------------------------------------------------------
+# General Settings
+#--------------------------------------------------------------------
+
+#### UNIFIED MENU / CLASSIC MENU
+# Select a UI Menu flavour
+# Options: [Unified Menu: 1, Classic Menu: 0]
+unified_menu:1
+
+#### Baudrate
+# Options: [2400: 0, 9600: 1, 19200: 2, 38400: 3, 57600: 4, 115200: 5, 250000: 6, 500000: 7, 1000000: 8]
+baudrate:5
+
+#### Default Touch Mode Language
+# Select the language to display on the LCD while in Touch Mode.
+# To add/flash a second language copy the required "language_xx.ini" file from "Language Packs" folder
+# to the SD root folder. Then preset the reset button to load/flash the copied language file.
+# Options: [Primary Language(English): 0, secondary language: 1]
+language:0
+
+#### Default Touch Mode Color Options
+# Options: [ WHITE: 0,  BLACK: 1,  RED: 2,  GREEN: 3,      BLUE: 4,       CYAN: 5,  MAGENTA: 6,    YELLOW: 7,
+#           ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13,    GRAY: 14, DARKGRAY: 15]
+# Or set the color(RGB888 format) hex value directly(start with “0x”).
+# Such as: 0xFF0000 : Red, 0x00FF00 : Green, 0x0000FF : Blue
+# Title background color
+title_back_color:1
+
+# Background color
+background_color:1
+
+# Font foreground color
+font_color:0
+
+# Reminder font color, such as: "No print attached", "Busy processing", etc.
+reminder_color:2
+
+# Volume status/reminder font color, such as: "Card inserted", "Card removed"
+volume_status_color:5
+
+# Backgroud color for X Y Z position display in Status Screen.
+status_xyz_bg_color:15
+
+# List View Border Color
+list_border_color:15
+
+# List View button background color
+list_button_bg_color:15
+
+# Color used by the Mesh Editor for drawing the mesh with the minimun value in the grid
+mesh_min_color:7
+
+# Color used by the Mesh Editor for drawing the mesh with the maximum value in the grid
+mesh_max_color:2
+
+#### Rotate UI 180 degrees
+# Options: [enable: 1, disable: 0]
+rotate_ui:0
+
+#### Show or hide Temperature ACK in Gcode Terminal
+# Options: [Show: 1, Hide: 0]
+terminal_ack:0
+
+#### invert X axis button function in Move menu to match move buttons to actual axis
+# Options: [enable: 1, disable: 0]
+# Invert Axis format      [ X<option> Y<option> Z<option> E<option>]
+invert_axis:X0 Y0 Z0
+
+#### Persistent temperature info
+# show persistent temperature info on all menu screens
+# Options: [enable: 1, disable: 0]
+persistent_info:0
+
+#### File List Mode
+# show file as list
+# Options: [enable: 1, disable: 0]
+files_list_mode:1
+
+#### Notification style for ACK messages
+# Set the notification style to use for displaying the ACK messages which start with 'echo:'
+#
+# NOTE: The OFF value is applied to any ACK message type (e.g. even to known echo ACK).
+#       It means that any kind of ACK message is silently discard
+#
+# Options: [OFF: 0, POPUP: 1, TOAST: 2]
+#   OFF:   No notification. The message is ignored.
+#   POPUP: Display a popup window for user confirmation.
+#   TOAST: A non-blocking Toast notification is displayed for few seconds. No user interaction is needed
+ack_notification:1
+
+#--------------------------------------------------------------------
+# Marlin Mode Settings (Only for TFT24_V1.1 & TFT28/TFT35/TFT43/TFT50/TFT70_V3.0)
+#--------------------------------------------------------------------
+
+#### Default Mode
+# Options: [0: Marlin Mode, 1: Touch Mode]
+default_mode:1
+
+#### Keep Serial Always ON
+# Keep UART (Serial communication) alive in Marlin Mode
+# Allow seamless OctoPrint UART connection to the TFT's UART/serial expansion port no matter which mode the TFT is in.
+# Options: [0: Disabled, 1: Enabled]
+serial_always_on:0
+
+#### Default Marlin Mode Background & Font Color Options
+# Options: [ WHITE: 0,  BLACK: 1,  RED: 2,  GREEN: 3,      BLUE: 4,       CYAN: 5,  MAGENTA: 6,    YELLOW: 7,
+#           ORANGE: 8, PURPLE: 9, LIME: 10, BROWN: 11, DARKBLUE: 12, DARKGREEN: 13,    GRAY: 14, DARKGRAY: 15]
+# Or set the color(RGB888 format) hex value directly(start with “0x”).
+# Such as: 0xFF0000 : Red, 0x00FF00 : Green, 0x0000FF : Blue
+marlin_bg_color:1
+marlin_fn_color:8
+
+#### Marlin Mode show title
+# Options: [enable: 1, disable: 0]
+marlin_show_title:1
+
+# Run Marlin Mode in Fullscreen
+# Options: [enable: 1, disable: 0] [Disabled. RECOMMENDED FOR TFT24]
+marlin_fullscreen:0
+
+# Select marlin type
+# Options: [LCD12864: 1, LCD2004: 0]
+marlin_type:1
+
+#### Text displayed at the top of the TFT in Marlin Mode.
+marlin_title:LCD12864 Simulator
+
+#--------------------------------------------------------------------
+# Printer / Machine Settings
+#--------------------------------------------------------------------
+
+#### Hotend Count
+# Options: [1 to 6]
+hotend_count:1
+
+#### Enable heated Bed
+# Options: [enable: 1, disable: 0]
+heated_bed:1
+
+#### Enable heated chamber
+# The TFT will auto-detect if chamber heating is enabled in marlin firmware.
+# Options: [enable: 1, disable: 0]
+heated_chamber:0
+
+#### Extruder Count
+# Options: [1 to 6]
+ext_count:1
+
+#### Fan Count
+# Options: [1 to 6]
+fan_count:1
+
+#### Fan Controller Count
+# Options: 0 to 2
+fan_ctrl_count:0
+
+#### Bed / Extruder / Chamber Maximum Temperatures
+# format [max_temp: T0:<max temp> T1:<max temp> T2:<max temp> T3:<max temp> T4:<max temp> T5:<max temp> BED:<max temp> CHAMBER:<max temp>]
+max_temp:T0:275 T1:275 T2:275 T3:275 T4:275 T5:275 BED:150 CHAMBER:60
+
+#### Cold Extrusion Minimum Temperature
+min_temp:180
+
+#### Fan Maximum PWM speed (0 to 255)
+# format [fan_max: F0:<max PWM> F1:<max PWM> F2:<max PWM> F3:<max PWM> F4:<max PWM> F5:<max PWM> CtL:<max PWM> CtI:<max PWM>]
+fan_max:F0:255 F1:255 F2:255 F3:255 F4:255 F5:255  CtL:255 CtI:255
+
+#### Machine Size / Build Area (mm)
+# The TFT will auto-detect the machine size in marlin firmware (Requires enabling `M115_GEOMETRY_REPORT`
+# in Configuration_adv.h in Marlin firmware).
+# Options: [X Axis: X, Y Axis: Y, Z Axis: Z]
+# minimum possible value: -2000, maximum possible value: 2000
+# minimum size limit format [size_min: X<minimum distance> Y<minimum distance> Z<minimum distance>]
+# maximum size limit format [size_max: X<maximum distance> Y<maximum distance> Z<maximum distance>]
+size_min:X0 Y0 Z0
+size_max:X235 Y235 Z250
+
+#### default Move Speeds (mm/min)
+# Options: [Slow: S, Normal: N, Fast: F]
+# format   [move_speed: S<feedrate mm/min> N<feedrate mm/min> F<feedrate mm/min>]
+move_speed:S1000 N3000 F5000
+
+#### default Extruder Speeds (mm/min)
+# Options: [Slow: S, Normal: N, Fast: F]
+# format   [ext_speed: S<feedrate mm/min> N<feedrate mm/min> F<feedrate mm/min>]
+ext_speed:S60 N600 F1200
+
+#### Auto Save Load Leveling Data
+# The TFT will auto-detect if Auto Bed Level is available.
+# Enable this will send "M500" after "G29" to store leveling value
+# and send "M420 S1" to enable leveling state after startup
+# Options: [enable: 1, disable: 0]
+auto_load_leveling:1
+
+#### Onboard / Printer SD Card Support
+# On Marlin Firmware, The TFT will auto detect Onboard SD Card
+# Auto-detect is not available for other firmwares like Smoothieware
+# Options: [enable: 1, disable: 0, auto-detect: 2]
+onboard_sd_support:2
+
+#### M27 / Printing status refresh time (this will be used if SD_AUTOREPORT is not detected by the TFT)
+M27_refresh_time:3
+
+#### M27 always active - keep polling M27 even if not printing
+# Options: [enable: 1, disable: 0]
+M27_always_active:1
+
+#### Long File Names Support
+# On Marlin Firmware, The TFT will auto-detect Long File Name supported
+# Auto-detect is not available for other firmwares like Smoothieware
+# Options: [enable: 1, disable: 0, auto-detect: 2]
+long_filename_support:2
+
+#### Show Fan Speed as Percentage
+# Options: [enable: 1, disable: 0]
+fan_speed_percent:1
+
+#### Pause Settings
+# position & Lengths in mm, Feedrates in mm/min
+# minimum possible value: 0, maximum possible value: 2000
+# Pause retract distance format [pause_retract: R<retract length> P<Resume Purge length>]
+# Pause XY position format      [pause_pos: X<position in mm> Y<position in mm>]
+# Pause Z raise format          [pause_z_raise: Z<distance in mm>]
+# Pause feed Rate # format      [ X<feedrate mm/min> Y<feedrate mm/min> Z<feedrate mm/min> E<feedrate mm/min>]
+pause_retract:R15 P16
+pause_pos:X10 Y10
+pause_z_raise:10
+pause_feedrate:X6000 Y6000 Z6000 E600
+
+### Manual Level Points Edge distance (mm)
+# distance in mm, Feedrates in mm/min
+# Leveling Edge distance format  [level_edge_distance: <distance from edge in mm>]
+# Leveling Z Position format     [level_z_pos: Z<position in mm>]
+# Leveling Z raise format        [level_z_raise: Z<distance in mm>]
+# Leveling feed Rate format      [ X<feedrate mm/min> Y<feedrate mm/min> Z<feedrate mm/min>]
+level_edge_distance:20
+level_z_pos:0.2
+level_z_raise:10
+level_feedrate:X6000 Y6000 Z6000
+
+#### Preheat Temperature
+# Maximum Filament name length 7 characters
+# format [T<hotend temp> B<bed temp>]
+preheat_name1:PLA
+preheat_temp1:T200 B60
+
+preheat_name2:PETG
+preheat_temp2:T240 B70
+
+preheat_name3:ABS
+preheat_temp3:T230 B90
+
+preheat_name4:WOOD
+preheat_temp4:T170 B50
+
+preheat_name5:TPU
+preheat_temp5:T220 B50
+
+preheat_name6:NYLON
+preheat_temp6:T250 B90
+
+#--------------------------------------------------------------------
+# Power Supply Settings (if connected to TFT Controller)
+#--------------------------------------------------------------------
+
+#### Default Power Supply Mode
+# Options: [OFF: 0, ON: 1: Auto:2]
+ps_on:0
+
+#### Power Supply Active HIGH Settings
+# Options: [HIGH: 1, LOW: 0]
+ps_on_active_high:1
+
+#### Maximum hot-end temperature of automatic shut down after printing (only if auto power is enabled)
+# wait for the hot-end temperature to be lower than this value, then turn off the power automatically
+auto_shutdown_temp:50
+
+#--------------------------------------------------------------------
+# Filament Runout Settings (if connected to TFT Controller)
+#--------------------------------------------------------------------
+
+#### Default FIlament Sensor
+# Options: [NONE: 0, Normal: 1, SMART: 2]
+fil_runout:0
+
+#### Filament runout inverting - invert the logic of the sensor.
+# Options: [true: 1, false: 0]
+fil_runout_inverting:1
+
+#### filament noise threshold  - Pause print when filament runout is detected for this time period in (ms).
+# time duration in ms
+fil_noise_threshold:100
+
+#### Smart filament runout detection
+# For use with an encoder disc that toggles runout pin as filament moves
+fil_runout_distance:7
+
+#--------------------------------------------------------------------
+# Power Loss Recovery & BTT UPS Settings (if connected to TFT Controller)
+#--------------------------------------------------------------------
+#### Power Loss recovery default enable, disable to reduce the loss of SD card or U disk
+# Options: [enable: 1, disable: 0]
+pl_recovery_en:1
+
+#### Home before Power Loss recovery
+# Options: [enable: 1, disable: 0]
+pl_recovery_home:0
+
+#### Power Loss Z raise (mm)
+# Raise Z axis on resume (on power loss with UPS)
+pl_z_raise:10
+
+#### Enable BTT UPS
+# Options: [enable: 1, disable: 0]
+btt_mini_ups:0
+
+
+#--------------------------------------------------------------------
+# Other device-specific settings
+#--------------------------------------------------------------------
+
+#### Sounds / Buzzer
+# set sounds ON or OFF
+#   touch_sound: enable/disable this to control touch feedback sound
+#   toast_sound: enable/disable this to control all toast notification sounds
+#   alert_sound: enable/disable this to control all popup and alert sounds
+#                 like print finish alert, dialog sound etc.
+# NOTE: Error messages from printer will always play the error sound.
+# Options: [enable: 1, disable: 0]
+touch_sound:1
+toast_sound:1
+alert_sound:1
+
+#### Knob Led Color (only for TFT35 E3.0)
+# Options: [LED_OFF: 0, LED_WHITE: 1, LED_RED: 2, LED_ORANGE: 3, LED_YELLOW: 4, LED_GREEN: 5, LED_BLUE: 6, LED_INDIGO: 7, LED_VIOLET: 8]
+knob_led_color:0
+
+#### Knob idle state
+# Options: [true: 1, false: 0]
+knob_led_idle:1
+
+#### Default LCD Brightness levels (only for TFT35v3.0 & TFT28v3.0)
+# Options: [(off) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 (full)]
+lcd_brightness:11
+lcd_idle_brightness:5
+
+#### Default LCD idle time (only for TFT35v3.0 & TFT28v3.0)
+# Options [Off: 0, 5Sec: 1, 10Sec: 2, 30sec: 3, 1min: 4, 2min: 5, 5min: 6, 10min: 7]
+lcd_idle_delay:4
+
+#### Neopixel sequentialmode
+# With this set to true, the neopixel will change color while heating
+# like they do in marlin mode. (Only while printing)
+# Options: [On: 1, Off: 0]
+event_led_mode:1
+
+#--------------------------------------------------------------------
+# Custom G-Code Commands (up to 15 custom G-code)
+#--------------------------------------------------------------------
+
+#### To enable a custom Command:
+# Remove '#' at the begining custom commands label & gcode.
+
+#### To disable a custom Command:
+# Add '#' at the begining custom commands label & gcode.
+
+# if the values are left blank then default name and G-code will be used
+
+# Options: [Label maximum length: 24 characters, G-code Maximum length 70 characters]
+
+custom_label_1:Disable steppers
+custom_gcode_1:M84\n
+custom_label_2:Init sd card
+custom_gcode_2:M21\n
+custom_label_3:Release sd card
+custom_gcode_3:M22\n
+custom_label_4:Restore leveling
+custom_gcode_4:M420 S1\n
+custom_label_5:Save to EEPROM
+custom_gcode_5:M500\n
+custom_label_6:Restore from EEPROM
+custom_gcode_6:M501\n
+custom_label_7:EEPROM defaults
+custom_gcode_7:M502\n
+#custom_label_8:custom8
+#custom_gcode_8:M105\n
+#custom_label_9:custom9
+#custom_gcode_9:M105\n
+#custom_label_10:custom10
+#custom_gcode_10:M105\n
+#custom_label_11:custom11
+#custom_gcode_11:M105\n
+#custom_label_12:custom12
+#custom_gcode_12:M105\n
+#custom_label_13:custom13
+#custom_gcode_13:M105\n
+#custom_label_14:custom14
+#custom_gcode_14:M105\n
+#custom_label_15:custom15
+#custom_gcode_15:M105\n
+
+#--------------------------------------------------------------------
+# Start, End & Cancel G-codes
+#--------------------------------------------------------------------
+
+#### Default Start Gcode Status
+# Options: [enable: 1, disable: 0]
+start_gcode_enabled:0
+
+#### Default End Gcode Status
+# Options: [enable: 1, disable: 0]
+end_gcode_enabled:0
+
+#### Default Cancel Gcode Status
+# Options: [enable: 1, disable: 0]
+cancel_gcode_enabled:0
+
+#### Start G-code - run this G-code before starting print
+# maximum length 75 characters
+start_gcode:G28 XY R20\n
+
+#### End G-code - run this G-code after finishing print
+# maximum length 75 characters
+end_gcode:M104 S0\nM140 S0\nM18\n
+
+#### Cancel G-code - run this G-code after canceling print
+# maximum length 75 characters
+cancel_gcode:M104 S0\nM140 S0\nG28 XY R10\n
\ No newline at end of file
diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin
index 9ddd951f23..45cc7bbfd0 100644
Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0_E3.26.x.bin differ
diff --git a/Copy to SD Card root directory to update/Language Packs/language_am.ini b/Copy to SD Card root directory to update/Language Packs/language_am.ini
index f0519e9fb4..4a132f5f1d 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_am.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_am.ini	
@@ -1,8 +1,286 @@
 #### Language Code:AM
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Հայերեն
+label_heat:Ջերմություն
+label_move:Շարժել
+label_home:Սկզբնական
+label_disable_steppers:Disarm All
+label_print:Տպել
+label_extrude:Հալել
+label_fan:Հովացնել
+label_settings:Կարգավորումներ
+label_screen_settings:Screen
+label_machine_settings:Machine
+label_feature_settings:Feature
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Shut Down
+label_rgb_settings:LED Color
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Custom
+label_leveling:Leveling
+label_point_1:Point 1
+label_point_2:Point 2
+label_point_3:Point 3
+label_point_4:Point 4
+label_point_5:Point 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Deploy
+label_bltouch_stow:Stow
+label_bltouch_repeat:Repeat
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Save
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Ավելացնել
+label_dec:Նվազեցնել
+label_nozzle:Գլխիկ
+label_bed:Տախտակ
+label_chamber:Chamber
+label_start:Start
+label_stop:Դադարեցնել
+label_back:Հետ
+label_page_up:Վերեւ
+label_page_down:Ներքեւ
+label_pause:Կանգնեցնել
+label_resume:Շարունակել
+label_load:Load
+label_unload:Unload
+label_slow_speed:Դանդաղ
+label_normal_speed:Նորմալ
+label_fast_speed:Արագ
+label_fan_full_speed:Ամբողջը
+label_fan_half_speed:Կիսատ
+label_rotate_ui:Rotate UI
+label_touchscreen_adjust:TSC Adjust
+label_more:More
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:White
+label_black:Black
+label_blue:Blue
+label_red:Red
+label_green:Green
+label_cyan:Cyan
+label_yellow:Yellow
+label_brown:Brown
+label_gray:Gray
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Անջատել
+label_baudrate:BaudRate
+label_percentage:Percentage
+label_babystep:Դանդաղ
+label_percentage_speed:Արագություն
+label_percentage_flow:Flow
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Պատրաստ
+label_busy:Ծանրաբեռնված է
+label_unconnected:Տպիչը կցված չէ
+label_disconnect_info:Now you can control the printer by your computer!
+label_loading:Բեռնում է...
+label_power_failed:Տպելը չի ավարտվել, շարունակե՞լ
+label_continue:Շարունակել
+label_cancel:Չեղարկել
+label_adjust_title:Էկրանի կարգավորում
+label_adjust_info:Please click on the red dot
+label_adjust_ok:Adjustment Success
+label_adjust_failed:Adjustment failed, Please Try Again
+label_warning:Warning
+label_stop_print:Stop printing?
+label_confirm:Confirm
+label_tftsd:TFT SD
+label_read_tftsd_error:TFTSD հիշողության սարքը չկա
+label_tftsd_inserted:Card inserted!
+label_tftsd_removed:Card removed!
+label_u_disk:U Disk
+label_read_u_disk_error:Read U Disk error!
+label_u_disk_inserted:U Disk inserted!
+label_u_disk_removed:U Disk removed!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:OnboardSD հիշողության սարքը չկա
+label_filament_sensor:Filament sensor
+label_filament_runout:Filament runout!
+label_preheat:Preheat
+label_preheat_both:Both
+label_is_pause:Unable to extrude when\nprinting.\nPause printing?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Movement
+label_unifiedheat:Heat&Fan
+label_cooldown:Cool Down
+label_emergencystop:EM. STOP
+label_touch_to_exit:Touch anywhere to exit
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wait for the temperature\nof hotend to be\nlower than %d℃
+label_force_shut_down:Force
+label_shutting_down:Shutting down...
+label_parameter_setting:Պարամետր
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:load settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Հայերեն
 label_heat:Ջերմություն
 label_move:Շարժել
diff --git a/Copy to SD Card root directory to update/Language Packs/language_ca.ini b/Copy to SD Card root directory to update/Language Packs/language_ca.ini
index 8d0882a57b..89dab4dd0d 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_ca.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_ca.ini	
@@ -1,8 +1,286 @@
 #### Language Code:CA
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Català
+label_heat:Escalfar
+label_move:Moure
+label_home:Origen
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extruir
+label_fan:Ventilar
+label_settings:Configura
+label_screen_settings:Pantalla
+label_machine_settings:Màquina
+label_feature_settings:Afegits
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Apagar
+label_rgb_settings:Color LED
+label_rgb_off:Apagar LED
+label_terminal:Terminal
+label_custom:Personalitzar
+label_leveling:Anivellar
+label_point_1:Punt 1
+label_point_2:Punt 2
+label_point_3:Punt 3
+label_point_4:Punt 4
+label_point_5:Punt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Nivellat del llit completat
+label_bl_smart_fill:Falten punts de prova\ns'han omplert de forma intel·ligent.\n \nNota: recordeu guardar!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Nivellament del llit Bilinear
+label_abl_settings_ubl:Nivellament de llit unificat
+label_abl_settings_ubl_save:Desa a la ranura
+label_abl_settings_ubl_load:Carrega des de la ranura
+label_abl_slot0:Ranura 0
+label_abl_slot1:Ranura 1
+label_abl_slot2:Ranura 2
+label_abl_slot3:Ranura 3
+label_abl_slot_eeprom:Recordar la ranura per al proper\nreinici? (Guardar EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Provar
+label_bltouch_deploy:Desplegar
+label_bltouch_stow:Plegar
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Sonda Compensar
+label_home_offset:Home Offset
+label_confirmation:Estàs segur?
+label_down:Avall
+label_up:Amunt
+label_save:Gravar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Augmentar
+label_dec:Disminur
+label_nozzle:Nozzle
+label_bed:Llit
+label_chamber:Cambra
+label_start:Començar
+label_stop:Parar
+label_back:Tornar
+label_page_up:Retrocedir
+label_page_down:Avançar
+label_pause:Pausar
+label_resume:Continuar
+label_load:Carregar
+label_unload:Descarregar
+label_slow_speed:Lent
+label_normal_speed:Normal
+label_fast_speed:Ràpid
+label_fan_full_speed:Màxim
+label_fan_half_speed:Meitat
+label_rotate_ui:Rotar
+label_touchscreen_adjust:Calibrar
+label_more:Més
+label_screen_info:Informar
+label_status:Estat
+label_simulator_bg_color:Color de fons del simulador Marlin
+label_simulator_font_color:Color de lletra de simulador Marlin
+label_white:Blanc
+label_black:Negre
+label_blue:Blau
+label_red:Vermell
+label_green:Verd
+label_cyan:Cian
+label_yellow:groc
+label_brown:marró
+label_gray:Gris
+label_orange:taronja
+label_indigo:Índigo
+label_violet:violeta
+label_magenta:Magenta
+label_purple:Porpra
+label_lime:Llima
+label_darkblue:Blau fosc
+label_darkgreen:Verd fosc
+label_darkgray:Gris fosc
+label_disconnect:Desconnectar
+label_baudrate:Velocitat de transmissió
+label_percentage:Percentatge
+label_babystep:BabyStep
+label_percentage_speed:Velocitat
+label_percentage_flow:Flux
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:+X
+label_y_inc:+Y
+label_z_inc:+Z
+label_x_dec:-X
+label_y_dec:-Y
+label_z_dec:-Z
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:A punt!!
+label_busy:Processament ocupat, si us plau esperi ...
+label_unconnected:No hi ha comunicació amb impressora!
+label_disconnect_info:Ara pot controlar la impressora des del seu ordinador!
+label_loading:Carregant ...
+label_power_failed:¿Continuar imprimint?
+label_continue:Continuar
+label_cancel:Cancel · lar
+label_adjust_title:¡Calibrar la pantalla tàctil
+label_adjust_info:Si us plau feu clic al punt vermell
+label_adjust_ok:Ajust correcte
+label_adjust_failed:Ajust fallit, si us plau intenteu de nou
+label_warning:Advertència
+label_stop_print:Voleu aturar la impressió?
+label_confirm:Confirmar
+label_tftsd:SD TFT
+label_read_tftsd_error:Error a la targeta SD TFT!
+label_tftsd_inserted:¡Targeta inserida!
+label_tftsd_removed:¡Targeta extreta!
+label_u_disk:Pendrive
+label_read_u_disk_error:¡Error al Pendrive!
+label_u_disk_inserted:¡Pendrive inserit!
+label_u_disk_removed:¡Pendrive extret!
+label_onboardsd:SD Placa
+label_read_onboardsd_error:Error a la targeta SD de la placa!
+label_filament_sensor:Sensor de filament
+label_filament_runout:¡Filament esgotat!
+label_preheat:Preescalfar
+label_preheat_both:Tots dos
+label_is_pause:No es pot extruir\nal imprimir,¿\nPausar la impressió?
+label_auto_shut_down:Apag. aut.
+label_unifiedmove:Moviment
+label_unifiedheat:Calor/Ventilador
+label_cooldown:Refredar
+label_emergencystop:PARADA EMERGENCIA
+label_touch_to_exit:Toca qualsevol lloc per sortir
+label_mainmenu:Menú
+label_wait_temp_shut_down:Espereu que la\ntemperatura del hotend\nsigui inferior a %d℃
+label_force_shut_down:Forçar Apagat
+label_shutting_down:Apagant...
+label_parameter_setting:Paràmetre
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Mostra ACK a la terminal
+label_invert_xaxis:Invertir eix X
+label_invert_yaxis:Invertir eix Y
+label_invert_zaxis:Invertir eix Z
+label_move_speed:Velocitat de moviment(X Y Z)
+label_knob_led:Perilla rotativa LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:En pausa per l'ordre M0
+label_send_start_gcode:Enviar Gcode inicial
+label_send_end_gcode:Enviar Gcode final
+label_send_cancel_gcode:Cancel · lar Gcode
+label_persistent_status_info:Informació d'estat persistent
+label_file_listmode:Mode de visualització de fitxers
+label_current_setting:Corrent del Driver (mA)
+label_steps_setting:Passos per MM
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleració
+label_acceleration:Acceleració
+label_print_acceleration:Acceleració Impressió
+label_retract_acceleration:Acceleració Retracció
+label_travel_acceleration:Acceleració Viatge
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:Sensibilitat al topall TMC
+label_fwretract:Retracció de FW
+label_fwrecover:Recuperació de Retracció de FW
+label_lin_advance:Avanç Lineal
+label_reset_settings_info:Restableix tota la configuració a\nvalors predeterminats?
+label_reset_settings_done:Restableix tota la configuració\naconseguit.\nreinicieu el dispositiu.
+label_info:Informació
+label_lcd_brightness:Lluminositat LCD
+label_lcd_brightness_dim:Dim Lluminositat LCD
+label_lcd_dim_idle_timer:Temporitzador inactiu LCD
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Personalitzat
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Mode Marlin a pantalla completa
+label_plr_en:Recuperació de pèrdua d’energia
+label_setting_save:Save settings
+label_setting_reset:Restableix la configuració
+label_setting_restore:Restaura la configuració
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Desa la configuració de la impressora\na la EEPROM?
+label_eeprom_restore_info:Carregar la configuració de\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Velocitat Retracció
+label_retract_length:Longitud Retracció
+label_retract_swap_length:Distància retracció intercanvi
+label_retract_z_lift:Z aixecament a la retracció
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Velocitat recuperació
+label_swap_recover_feedrate:Velocitat recuperació intercanvi
+label_recover_length:Distancia recuperació extra
+label_swap_recover_length:Distancia recuperació intercanvi extra
+label_start_print:Comenceu a imprimir:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Català
 label_heat:Escalfar
 label_move:Moure
diff --git a/Copy to SD Card root directory to update/Language Packs/language_cn.ini b/Copy to SD Card root directory to update/Language Packs/language_cn.ini
index 5e90a5927d..2dce415fad 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_cn.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_cn.ini	
@@ -1,8 +1,286 @@
 #### Language Code:CN
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:简体中文
+label_heat:加热
+label_move:移动
+label_home:回原点
+label_disable_steppers:解锁电机
+label_print:打印
+label_extrude:挤出
+label_fan:风扇
+label_settings:设置
+label_screen_settings:屏幕设置
+label_machine_settings:机器设置
+label_feature_settings:功能设置
+label_sound:声音
+label_touch_sound:按钮声音
+label_toast_sound:Toast 提示声音
+label_alert_sound:弹窗和提示声音
+label_preheatdone_sound:Preheat done notification
+label_shut_down:关闭电源
+label_rgb_settings:灯光颜色
+label_rgb_off:熄灭灯光
+label_terminal:Terminal
+label_custom:自定义
+label_leveling:调平
+label_point_1:第一点
+label_point_2:第二点
+label_point_3:第三点
+label_point_4:第四点
+label_point_5:第五点
+label_bed_leveling:Bed Level
+label_bl_complete:平台调平完成!
+label_bl_smart_fill:部分点未探测,已被自动填充, 需要手动保存!
+label_bl_enable:BL:已开启
+label_bl_disable:BL:已关闭
+label_abl:自动调平
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:BL自检
+label_bltouch_deploy:探针弹出
+label_bltouch_stow:探针收回
+label_bltouch_repeat:精度测试
+label_z_offset:Z-偏移量
+label_probe_offset:探针偏移量
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:降低
+label_up:抬升
+label_save:保存参数
+label_restore:恢复
+label_reset:重置
+label_default:默认
+label_clear:Clear
+label_next:下一个
+label_distance:距离
+label_invalid_value:没有有效的条件!
+label_timeout_reached:已超时!
+label_process_running:正在运行,请稍后
+label_process_completed:处理已完成!
+label_process_aborted:处理已被中断!
+label_inc:增加
+label_dec:减少
+label_nozzle:喷头
+label_bed:热床
+label_chamber:机箱
+label_start:开始
+label_stop:停止
+label_back:返回
+label_page_up:上一页
+label_page_down:下一页
+label_pause:暂停
+label_resume:继续
+label_load:进料
+label_unload:退料
+label_slow_speed:慢速
+label_normal_speed:常速
+label_fast_speed:快速
+label_fan_full_speed:全速
+label_fan_half_speed:半速
+label_rotate_ui:旋转界面
+label_touchscreen_adjust:触屏校准
+label_more:更多
+label_screen_info:关于
+label_status:状态
+label_simulator_bg_color:Marlin模式背景颜色
+label_simulator_font_color:Marlin模式字体颜色
+label_white:白色
+label_black:黑色
+label_blue:蓝色
+label_red:红色
+label_green:绿色
+label_cyan:青色
+label_yellow:黄色
+label_brown:棕色
+label_gray:灰色
+label_orange:橙色
+label_indigo:靛
+label_violet:紫罗兰色
+label_magenta:桃红色
+label_purple:紫色
+label_lime:青柠色
+label_darkblue:暗蓝色
+label_darkgreen:暗绿色
+label_darkgray:暗灰色
+label_disconnect:断开连接
+label_baudrate:波特率
+label_percentage:百分比
+label_babystep:Z-微调
+label_percentage_speed:速度百分比
+label_percentage_flow:流量百分比
+label_value_zero:清零
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:准备打印
+label_busy:系统繁忙,请稍候...
+label_unconnected:未连接到打印机!
+label_disconnect_info:现在可以用电脑控制打印机
+label_loading:加载中...
+label_power_failed:是否继续打印?
+label_continue:继续
+label_cancel:取消
+label_adjust_title:触屏校准
+label_adjust_info:请点击红点中心位置
+label_adjust_ok:校准成功
+label_adjust_failed:校准失败,请重试
+label_warning:警告
+label_stop_print:是否停止打印?
+label_confirm:确定
+label_tftsd:TFT SD
+label_read_tftsd_error:读TFT SD卡出错!
+label_tftsd_inserted:SD卡已插入!
+label_tftsd_removed:SD卡已拔出!
+label_u_disk:U盘
+label_read_u_disk_error:读U盘出错!
+label_u_disk_inserted:U盘已插入!
+label_u_disk_removed:U盘已拔出!
+label_onboardsd:板载SD
+label_read_onboardsd_error:读板载SD卡出错!
+label_filament_sensor:耗材检测传感器
+label_filament_runout:耗材已用尽,请更换耗材!
+label_preheat:一键预热
+label_preheat_both:全部
+label_is_pause:打印中无法挤出耗材, 是否暂停打印?
+label_auto_shut_down:自动关机
+label_unifiedmove:运动
+label_unifiedheat:温度
+label_cooldown:冷却
+label_emergencystop:紧急停止
+label_touch_to_exit:触摸任意点退出当前界面
+label_mainmenu:菜单
+label_wait_temp_shut_down:喷头温度正在降温，等待低于%d℃后自动关机
+label_force_shut_down:强制关机
+label_shutting_down:正在关机...
+label_parameter_setting:参数设置
+label_on:开启
+label_off:关闭
+label_smart:智能
+label_terminal_ack:在G-code终端中显示温度信息
+label_invert_xaxis:翻转X轴
+label_invert_yaxis:翻转Y轴
+label_invert_zaxis:翻转Z轴
+label_move_speed:移动速度(X Y Z)
+label_knob_led:旋钮LED颜色
+label_knob_led_idle:旋钮LED自动睡眠
+label_m0_pause:M0暂停
+label_send_start_gcode:执行打印前起始Gcode
+label_send_end_gcode:执行打印后结束Gcode
+label_send_cancel_gcode:中断打印Gcode
+label_persistent_status_info:顶部温度信息
+label_file_listmode:文件浏览列表模式
+label_current_setting:TMC驱动电流设置
+label_steps_setting:电机每毫米脉冲数(Steps/mm)
+label_maxfeedrate:最大移动速度
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:打印加速度
+label_retract_acceleration:回抽加速度
+label_travel_acceleration:空载加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC堵转检测灵敏度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:所有的设置会被重置为默认值, 是否继续?
+label_reset_settings_done:重置所有参数成功! 重启设备后生效.
+label_info:提示
+label_lcd_brightness:LCD背光亮度
+label_lcd_brightness_dim:LCD睡眠背光亮度
+label_lcd_dim_idle_timer:LCD自动睡眠时间
+label_5_seconds:5秒
+label_10_seconds:10秒
+label_30_seconds:30秒
+label_60_seconds:1分钟
+label_120_seconds:2分钟
+label_300_seconds:5分钟
+label_custom_seconds:自定义
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:全屏显示Marlin模式
+label_plr_en:断电续打
+label_setting_save:保存设置
+label_setting_reset:重置设置
+label_setting_restore:保存设置
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:是否保存打印机设置到EEPROM?
+label_eeprom_restore_info:是否从EEPROM加载设置?
+label_eeprom_reset_info:重置EEPROM到出厂设置?
+label_retract_feedrate:FW回抽速度
+label_retract_length:FW回抽长度
+label_retract_swap_length:换料时回抽的长度
+label_retract_z_lift:回抽时Z轴抬升的高度
+label_retract_auto:FW自动回抽
+label_recover_feedrate:FW挤出速度
+label_swap_recover_feedrate:换料时挤出的速度
+label_recover_length:额外挤出的长度
+label_swap_recover_length:换料时额外挤出的长度
+label_start_print:是否开始打印:\n %s?
+label_ack_notification:ACK 弹窗类型
+label_leveling_edge_distance:手动调平边沿距离
+label_xy_unlock:解锁XY
+label_tuning:调整
+label_pid:PID
+label_pid_title:PID自动整定
+label_pid_start_info:开始PID自动整定,需要几分钟来完成,是否继续?
+label_pid_start_info_2:PID 正在自动整定中!
+label_pid_start_info_3:不要操作触控屏直到整定完成!
+label_tune_extruder:微调E-Steps
+label_tune_ext_extrude_100:挤出100mm
+label_tune_ext_temp:挤出机微调 | 加热
+label_tune_ext_templow:目标温度太低,最低温度为: %d℃
+label_tune_ext_desiredval:实际温度还没达到设定值
+label_tune_ext_mark120mm:在耗材上标记120mm\n标记完成后点击 '%s'\n挤出完成后测量剩余长度
+label_tune_ext_heatoff:关闭加热?
+label_tune_ext_adj_esteps:调整E-Steps
+label_tune_ext_esteps_saved:新的E-Steps已生效,需要手动保存到EEPROM\n新E-Steps: %0.2f
+label_tune_ext_measured:剩余的长度:
+label_tune_ext_old_estep:旧的E-Steps: %0.2f
+label_tune_ext_new_estep:新的E-Steps: %0.2f
+label_connection_settings:连接
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:简体中文
 label_heat:加热
 label_move:移动
diff --git a/Copy to SD Card root directory to update/Language Packs/language_cz.ini b/Copy to SD Card root directory to update/Language Packs/language_cz.ini
index 45d0a5aba6..b27be3b018 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_cz.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_cz.ini	
@@ -1,8 +1,286 @@
 #### Language Code:CZ
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Čeština
+label_heat:Teplota
+label_move:Posunout
+label_home:Domů
+label_disable_steppers:Motory
+label_print:Tisknout
+label_extrude:Filament
+label_fan:Ofuk
+label_settings:Nastavení
+label_screen_settings:Displej
+label_machine_settings:Tiskárna
+label_feature_settings:Vlastnosti
+label_sound:Zvuk
+label_touch_sound:Zvuk při dotyku
+label_toast_sound:Zvuk vytápění
+label_alert_sound:Upozornění, popup okno
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Vypnout
+label_rgb_settings:Barva LED
+label_rgb_off:LED vyp.
+label_terminal:Terminál
+label_custom:Vlastní
+label_leveling:Srovnat
+label_point_1:Bod 1
+label_point_2:Bod 2
+label_point_3:Bod 3
+label_point_4:Bod 4
+label_point_5:Bod 5
+label_bed_leveling:Bed Level
+label_bl_complete:Vyrovnání kompletní
+label_bl_smart_fill:Chybějící body sondy\nbyly vyplněny inteligentně.\n \nPozn: Nezapomeň uložit!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:Vyrovnat
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Ruční vyrovnání
+label_abl_settings:Auto vyrovnání
+label_abl_settings_bbl:Bilineární vyrovnání
+label_abl_settings_ubl:UBL vyrovnání
+label_abl_settings_ubl_save:Uložit do slotu
+label_abl_settings_ubl_load:Nahrát ze slotu
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Zapamatuj si slot\nrestart? (Uložit EEPROM)
+label_abl_z:Z-Slábnutí
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Vysunout
+label_bltouch_stow:Zasunout
+label_bltouch_repeat:Přesnost
+label_z_offset:Z Offset
+label_probe_offset:Offset sondy
+label_home_offset:Home Offset
+label_confirmation:Jste si jistý?
+label_down:Dolů
+label_up:Nahoru
+label_save:Uložit
+label_restore:Obnovit
+label_reset:Reset
+label_default:Výchozí
+label_clear:Vymaž
+label_next:Další
+label_distance:Vzdálenost
+label_invalid_value:Neplatná hodnota/y!
+label_timeout_reached:Časový limit vypršel!
+label_process_running:Probíhá proces!
+label_process_completed:Proces dokončen!
+label_process_aborted:Proces přerušen!
+label_inc:Přidat
+label_dec:Ubrat
+label_nozzle:Tryska
+label_bed:Stolek
+label_chamber:Komora
+label_start:Start
+label_stop:Stop
+label_back:Zpět
+label_page_up:Další
+label_page_down:Předchozí
+label_pause:Pauza
+label_resume:Obnovit
+label_load:Zavést
+label_unload:Vysunout
+label_slow_speed:Pomalu
+label_normal_speed:Normál
+label_fast_speed:Rychle
+label_fan_full_speed:Plný
+label_fan_half_speed:Poloviční
+label_rotate_ui:Otočit UI
+label_touchscreen_adjust:Kalibrovat
+label_more:Více
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin - Barva pozadí
+label_simulator_font_color:Marlin - Barva písma
+label_white:Bílá
+label_black:Černá
+label_blue:Modrá
+label_red:Červená
+label_green:Zelená
+label_cyan:Tyrkys
+label_yellow:Žlutá
+label_brown:Hnědá
+label_gray:Šedá
+label_orange:Oranžová
+label_indigo:Indigo
+label_violet:Fialová
+label_magenta:Purpurová
+label_purple:Nachová
+label_lime:Limetková
+label_darkblue:Tmavá Modrá
+label_darkgreen:Tmavá Červená
+label_darkgray:Tmavá Šedá
+label_disconnect:Odpojit
+label_baudrate:Serial Port
+label_percentage:Procenta
+label_babystep:BabyStep
+label_percentage_speed:Rychlost
+label_percentage_flow:Průtok
+label_value_zero:Vynulovat
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0,01mm
+label_01_mm:0,1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Připraven
+label_busy:Zpracovávám, čekejte prosím...
+label_unconnected:Tiskárna není připojena!
+label_disconnect_info:Nyní můžete tiskárnu ovládat z počítače!
+label_loading:Nahrávám...
+label_power_failed:Obnovit tisk?
+label_continue:Pokračovat
+label_cancel:Zrušit
+label_adjust_title:Kalibrace dotykové obrazovky
+label_adjust_info:Dotkněte se postupně všech bodů
+label_adjust_ok:Kalibrace úspěšná
+label_adjust_failed:Kalibrace selhala, zopakujte znovu
+label_warning:Varování
+label_stop_print:Zastavit tisk?
+label_confirm:Potvrdit
+label_tftsd:TFT SD
+label_read_tftsd_error:Chyba při čtení SD karty!
+label_tftsd_inserted:SD karta vložena!
+label_tftsd_removed:SD karta vyjmuta!
+label_u_disk:USB Disk
+label_read_u_disk_error:Chyba při čtení USB disku!
+label_u_disk_inserted:USB disk  vložen!
+label_u_disk_removed:USB disk vyjmut!
+label_onboardsd:Onboard SD
+label_read_onboardsd_error:Chyba při čtení Onboard SD!
+label_filament_sensor:Senzor filamentu
+label_filament_runout:Došel filament!
+label_preheat:Zahřát
+label_preheat_both:Vše
+label_is_pause:Během tisku nelze\nextrudovat,\nmám pozastavit tisk?
+label_auto_shut_down:Auto.vypnutí
+label_unifiedmove:Pohyb
+label_unifiedheat:Teplota
+label_cooldown:Zchladit
+label_emergencystop:!!STOP!!
+label_touch_to_exit:Pro návrat se dotkněte obrazovky...
+label_mainmenu:Menu
+label_wait_temp_shut_down:Čekám na zchladnutí\nextruderu pod %d℃
+label_force_shut_down:Vynutit
+label_shutting_down:Vypínám se...
+label_parameter_setting:Parametry
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:zobrazit ACK Terminálu
+label_invert_xaxis:Otočit osu X
+label_invert_yaxis:Otočit osu Y
+label_invert_zaxis:Otočit osu Z
+label_move_speed:Rychlost pohybu X Y Z
+label_knob_led:Rotační knob LED
+label_knob_led_idle:Rotační knob LED idle
+label_m0_pause:Pauza po příkazu M0
+label_send_start_gcode:Spustit Gcode před tiskem
+label_send_end_gcode:Spustit Gcode po tisku
+label_send_cancel_gcode:Přerušení tisku
+label_persistent_status_info:Trvalé zobrazení stavu
+label_file_listmode:Zobrazit soub.jako seznam
+label_current_setting:Proud motorů (mA)
+label_steps_setting:Kroků/mm
+label_maxfeedrate:Max rychlost
+label_maxacceleration:Max zrychlení
+label_acceleration:Zrychlení
+label_print_acceleration:Zrychlení při tisku
+label_retract_acceleration:Zrychlení retrakcí
+label_travel_acceleration:Zrychlení při přesunu
+label_jerk:Jerk-trhnutí
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:Citlivost nárazu TMC
+label_fwretract:FW Zatažení
+label_fwrecover:FW Obnovení
+label_lin_advance:Linear Advance
+label_reset_settings_info:Všechna nastavení budou\nobnovena na výchozí\nhodnoty. Pokračovat?
+label_reset_settings_done:Resetování všech nastavení\nbylo úspěšně provedeno.\nRestartujte zařízení.
+label_info:Info
+label_lcd_brightness:LCD Jas
+label_lcd_brightness_dim:LCD snížení jasu
+label_lcd_dim_idle_timer:LCD snížení jasu po
+label_5_seconds:5 sec.
+label_10_seconds:10 sec.
+label_30_seconds:30 sec.
+label_60_seconds:1 min.
+label_120_seconds:2 min.
+label_300_seconds:5 min.
+label_custom_seconds:Vlastní
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Celoobrazovkový režim Marlin
+label_plr_en:Obnova po ztrátě napájení
+label_setting_save:Uložení nastavení
+label_setting_reset:Reset nastavení
+label_setting_restore:Obnovení nastavení
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Uložit nastavení tiskárny\ndo EEPROM?
+label_eeprom_restore_info:Obnovit nastavení \nz EEPROM?
+label_eeprom_reset_info:Reset EEPROM na výchozí hodnoty?
+label_retract_feedrate:Rychlost zatažení
+label_retract_length:Délka zatažení
+label_retract_swap_length:Délka zatažení Swap
+label_retract_z_lift:Z zvýšení při zatažení
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Rychlost obnovení
+label_swap_recover_feedrate:Rychlost obnovení Swap
+label_recover_length:Délka obnovení
+label_swap_recover_length:Délka obnovení Swap
+label_start_print:Spustit tisk:\n %s?
+label_ack_notification:Styl oznámení ACK
+label_leveling_edge_distance:Vzdálenost nivelačních bodů\n stolku od kraje
+label_xy_unlock:Uvolnit XY
+label_tuning:Kalibrace
+label_pid:PID
+label_pid_title:PID autokalibrace
+label_pid_start_info:PID autokalibrace bude spuštěna.\n Bude to cvíli trvat. Pokračovat?
+label_pid_start_info_2:PID autokalibrace probíhá!
+label_pid_start_info_3:NEDOTÝKEJ se displeje dokud není dokončeno\n (Zelená LED svítí)!
+label_tune_extruder:E-Krok
+label_tune_ext_extrude_100:100mm Vysunutí
+label_tune_ext_temp:Kalibrace extruderu, ohřev
+label_tune_ext_templow:Požadovaná teplota je příliš nízká!\nMinimální teplota: %d C
+label_tune_ext_desiredval:Teplota ještě není na požadované hodnotě
+label_tune_ext_mark120mm:Označ 120mm on fillamentu\nStlač '%s' pokud jsi připraven.\nZměř zbývající délku\npo vytlačení.
+label_tune_ext_heatoff:Vypnout topení?
+label_tune_ext_adj_esteps:Nastavení E-Kroků
+label_tune_ext_esteps_saved:Nové E-kroky uloženy!\nNezapmeň \nuložit do EEPROM.\nNová hodnota: %0.2f
+label_tune_ext_measured:Zbývající délka:
+label_tune_ext_old_estep:Původní E-kroky: %0.2f
+label_tune_ext_new_estep:Nový E-kroky: %0.2f
+label_connection_settings:Připojení
+label_offset_tool:Offset 2.trysky
+label_hybrid_threshold:TMC Hybridní práh
+label_notifications:Oznámení
+label_mesh_editor:Mesh síť
+label_mesh_tuner:Mesh nastavení
+label_case_light:Case light
 label_language:Čeština
 label_heat:Teplota
 label_move:Posunout
diff --git a/Copy to SD Card root directory to update/Language Packs/language_de.ini b/Copy to SD Card root directory to update/Language Packs/language_de.ini
index 1dfbc283ed..121cbd0179 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_de.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_de.ini	
@@ -1,8 +1,286 @@
 #### Language Code:DE
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Deutsch
+label_heat:heizen
+label_move:bewegen
+label_home:Home XYZ
+label_disable_steppers:alle lösen
+label_print:drucken
+label_extrude:Extruder
+label_fan:Lüfter
+label_settings:Einstellungen
+label_screen_settings:Bildschirm
+label_machine_settings:Drucker
+label_feature_settings:Andere
+label_sound:Töne
+label_touch_sound:Eingabe
+label_toast_sound:Toasts
+label_alert_sound:Popups & Alarme
+label_preheatdone_sound:Preheat done notification
+label_shut_down:auschalten (PS_ON)
+label_rgb_settings:LED Farbe
+label_rgb_off:LED aus
+label_terminal:Terminal
+label_custom:Extras
+label_leveling:justieren
+label_point_1:Punkt 1
+label_point_2:Punkt 2
+label_point_3:Punkt 3
+label_point_4:Punkt 4
+label_point_5:Punkt 5
+label_bed_leveling:vermessen
+label_bl_complete:Bett-Vermessung ausgeführt
+label_bl_smart_fill:Fehlende Messpunkte\nwurden berechent.\n \nHinweis: Bitte speichern!
+label_bl_enable:BL: an
+label_bl_disable:BL: aus
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Bett Vermessung (Raster)
+label_abl_settings:Bett Vermessung (auto)
+label_abl_settings_bbl:Bett Vermessung (bilinear)
+label_abl_settings_ubl:Bett Vermessung (Unified)
+label_abl_settings_ubl_save:im Slot speichern
+label_abl_settings_ubl_load:aus Slot laden
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Slot für den nächsten\nNeustart merken?(Im EEPROM speichern)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:testen
+label_bltouch_deploy:ausfahren
+label_bltouch_stow:einziehen
+label_bltouch_repeat:widerholen
+label_z_offset:Delta Z
+label_probe_offset:Delta Fühler
+label_home_offset:Home Offset
+label_confirmation:Sicher?
+label_down:ab
+label_up:auf
+label_save:speichern
+label_restore:laden
+label_reset:zurücksetzen
+label_default:Standard
+label_clear:löschen
+label_next:nächster
+label_distance:Abstand
+label_invalid_value:Ungültige(r) Wert(e)
+label_timeout_reached:Timeout erreicht!
+label_process_running:Prozess läuft bereits!
+label_process_completed:Prozess fertiggestellt!
+label_process_aborted:Prozess abgebrochen!
+label_inc:erhöhen
+label_dec:verringern
+label_nozzle:Düse
+label_bed:Heizbett
+label_chamber:Kammer
+label_start:Start
+label_stop:Stop
+label_back:zurück
+label_page_up:Seite hoch
+label_page_down:Seite runter
+label_pause:Pause
+label_resume:Wiederaufnahme
+label_load:laden
+label_unload:entladen
+label_slow_speed:langsam
+label_normal_speed:normal
+label_fast_speed:schnell
+label_fan_full_speed:alles
+label_fan_half_speed:halb
+label_rotate_ui:UI drehen
+label_touchscreen_adjust:TSC kalib.
+label_more:mehr
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Hintergrundfarbe Marlin
+label_simulator_font_color:Schriftfarbe Marlin
+label_white:weiß
+label_black:schwarz
+label_blue:blau
+label_red:rot
+label_green:grün
+label_cyan:cyan
+label_yellow:gelb
+label_brown:braun
+label_gray:grau
+label_orange:orange
+label_indigo:indigo
+label_violet:violet
+label_magenta:magenta
+label_purple:lila
+label_lime:grüngelb
+label_darkblue:dunkelblau
+label_darkgreen:dunkelgrün
+label_darkgray:dunkelgrau
+label_disconnect:trennen
+label_baudrate:Baudrate
+label_percentage:Prozent
+label_babystep:BabyStep
+label_percentage_speed:Geschw.
+label_percentage_flow:Fluss
+label_value_zero:0
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:bereit
+label_busy:Bitte warten ...
+label_unconnected:Keine Verbindung zum Drucker!
+label_disconnect_info:Verbindung getrennt!
+label_loading:Lade ...
+label_power_failed:Druck fortsetzen?
+label_continue:fortsetzen
+label_cancel:Abbruch
+label_adjust_title:Touchscreen kalibrieren
+label_adjust_info:roten Punkt antippen
+label_adjust_ok:erfolgreich kalibriert
+label_adjust_failed:Kalibrierung fehlgeschlagen, erneut versuchen.
+label_warning:Warnung
+label_stop_print:Druck abbrechen?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SD Lesefehler!
+label_tftsd_inserted:SD-Karte eingesteckt!
+label_tftsd_removed:SD-Karte entfernt!
+label_u_disk:USB-Stick
+label_read_u_disk_error:USB-Stick Lesefehler!
+label_u_disk_inserted:USB-Stick eingesteckt!
+label_u_disk_removed:USB-Stick entfernt!
+label_onboardsd:Onboard SD
+label_read_onboardsd_error:Onboard SD Lesefehler!
+label_filament_sensor:Filament Sensor
+label_filament_runout:Filament alle!
+label_preheat:vorheizen
+label_preheat_both:beide
+label_is_pause:Extrudieren während\nDruckvorgang nicht\nmöglich!\nDruck pausieren?
+label_auto_shut_down:Automatisch AUS (PS_ON)
+label_unifiedmove:Bewegung
+label_unifiedheat:Heiz.Lüft.
+label_cooldown:abkühlen
+label_emergencystop:NOT AUS!
+label_touch_to_exit:Zum Verlassen, Bildschirm berühren.
+label_mainmenu:Menü
+label_wait_temp_shut_down:Warte bis Hotend-\nTemperatur unter\n %d℃ fällt.
+label_force_shut_down:erzwinge
+label_shutting_down:Fahre herunter...
+label_parameter_setting:Parameter
+label_on:AN
+label_off:AUS
+label_smart:SMART
+label_terminal_ack:Zeige ACK im Terminal
+label_invert_xaxis:Invertiere X-Achse
+label_invert_yaxis:Invertiere Y-Achse
+label_invert_zaxis:Invertiere Z-Achse
+label_move_speed:Geschwindigkeit (XYZ)
+label_knob_led:Drehknopf LED Farbe
+label_knob_led_idle:Drehknopf LED idle Farbe
+label_m0_pause:Pause durch M0 Befehl
+label_send_start_gcode:Gcode vor Druck
+label_send_end_gcode:Gcode nach Druck
+label_send_cancel_gcode:Gcode bei Abbruch
+label_persistent_status_info:Speicherungs-Status
+label_file_listmode:Datein als Liste
+label_current_setting:Treiber Strom (mA)
+label_steps_setting:Steps pro mm
+label_maxfeedrate:max. Geschwindigkeit
+label_maxacceleration:max. Beschleunigung
+label_acceleration:Beschleunigung
+label_print_acceleration:Beschleunigung (Druck)
+label_retract_acceleration:Beschleunigung (Rückzug)
+label_travel_acceleration:Beschleunigung (Fahrt)
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC Empfindlichkeit
+label_fwretract:FW Rückzug
+label_fwrecover:FW Rückeinschub
+label_lin_advance:Linear Advance
+label_reset_settings_info:Hiermit werden alle\nEinstellungen zurückgesetzt. Fortfahren?
+label_reset_settings_done:Einstellungen wurden\nerfolgreich zurückgesetzt.\nBitte neustarten.
+label_info:Info
+label_lcd_brightness:LCD Helligkeit
+label_lcd_brightness_dim:LCD Helligkeit (Standby)
+label_lcd_dim_idle_timer:LCD Timer Standby
+label_5_seconds:5 Sek.
+label_10_seconds:10 Sek.
+label_30_seconds:30 Sek.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Benutz.
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin Modus im Vollbild
+label_plr_en:Wiederherstellung nach Stromausfall
+label_setting_save:Einstellungen speichern
+label_setting_reset:Einstellungen zurücksetzten
+label_setting_restore:Einstellungen wiederherstellen
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Einstellungen im\nEEPROM speichern?
+label_eeprom_restore_info:Einstellungen aus\nEEPROM laden?
+label_eeprom_reset_info:Standardeinstellungen des Druckers wiederherstellen?
+label_retract_feedrate:Rückzugsgeschwindigkeit
+label_retract_length:Rückzugslänge
+label_retract_swap_length:Rückzugslänge (Wechsel)
+label_retract_z_lift:Z-Anhebung bei Rückzug
+label_retract_auto:Auto-Rückzug über Firmware
+label_recover_feedrate:Geschw. Rückeinschub
+label_swap_recover_feedrate:Geschw. Rückeinschub (Wechsel)
+label_recover_length:zus. Länge Rückeinschub
+label_swap_recover_length:zus. Länge Rückeinschub (Wechsel)
+label_start_print:Druck starten:\n %s?
+label_ack_notification:ACK Benachrichtigungs-Stil
+label_leveling_edge_distance:Bettecken-Abstand
+label_xy_unlock:löse XY
+label_tuning:Justage
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune benötigt\neinige Zeit.\nWeitermachen?
+label_pid_start_info_2:PID autotune läuft!
+label_pid_start_info_3:Berühren Sie den Bildschirm erst bei Fertigstellung (Grüne LED)!
+label_tune_extruder:Steps anp.
+label_tune_ext_extrude_100:100mm ext.
+label_tune_ext_temp:Ext. Kalib. Temp.
+label_tune_ext_templow:Temparatur zu niedrig!\nMinimale Temparatur: %d C
+label_tune_ext_desiredval:Temparatur hat gewünschten Wert noch nicht erreicht
+label_tune_ext_mark120mm:Filament 120 mm über Einlass markieren,\ndann '%s' drücken & nach Extrusion\nerneut messen
+label_tune_ext_heatoff:Heizung abschalten?
+label_tune_ext_adj_esteps:E-Steps einstellen
+label_tune_ext_esteps_saved:Neue E-Steps gespeichert!\nBitte auch im EEPROM speichern.\nNeuer Wert: %0.2f
+label_tune_ext_measured:Restliche Länge:
+label_tune_ext_old_estep:Alte E-Steps: %0.2f
+label_tune_ext_new_estep:Neue E-Steps: %0.2f
+label_connection_settings:Verbindung
+label_offset_tool:Abstand 2te Düse
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Benachrichtigungen
+label_mesh_editor:Mesh edit.
+label_mesh_tuner:Mesh anp.
+label_case_light:Case light
 label_language:Deutsch
 label_heat:heizen
 label_move:bewegen
diff --git a/Copy to SD Card root directory to update/Language Packs/language_du.ini b/Copy to SD Card root directory to update/Language Packs/language_du.ini
old mode 100755
new mode 100644
index a58bce2066..6951df141d
--- a/Copy to SD Card root directory to update/Language Packs/language_du.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_du.ini	
@@ -1,5 +1,5 @@
 #### Language Code:DU
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
diff --git a/Copy to SD Card root directory to update/Language Packs/language_en.ini b/Copy to SD Card root directory to update/Language Packs/language_en.ini
index d45bd972d5..a19d590938 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_en.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_en.ini	
@@ -1,5 +1,5 @@
 #### Language Code:EN
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
@@ -19,11 +19,13 @@ label_sound:Sound
 label_touch_sound:Touch sounds
 label_toast_sound:Toast Notifications
 label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
 label_shut_down:Shut Down
 label_rgb_settings:LED Color
 label_rgb_off:LED Off
 label_terminal:Terminal
 label_custom:Custom
+label_event_led_mode:Event led mode
 label_leveling:Leveling
 label_point_1:Point 1
 label_point_2:Point 2
diff --git a/Copy to SD Card root directory to update/Language Packs/language_es.ini b/Copy to SD Card root directory to update/Language Packs/language_es.ini
index ad87cfa8ef..e15a3ad944 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_es.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_es.ini	
@@ -1,8 +1,286 @@
 #### Language Code:ES
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Español
+label_heat:Calentar
+label_move:Mover
+label_home:Origen
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extruir
+label_fan:Ventilar
+label_settings:Configurar
+label_screen_settings:Pantalla
+label_machine_settings:Máquina
+label_feature_settings:Añadidos
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Apagar
+label_rgb_settings:Color LED
+label_rgb_off:Apagar LED
+label_terminal:Terminal
+label_custom:Personalizar
+label_leveling:Nivelar
+label_point_1:Punto 1
+label_point_2:Punto 2
+label_point_3:Punto 3
+label_point_4:Punto 4
+label_point_5:Punto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Probar
+label_bltouch_deploy:Desplegar
+label_bltouch_stow:Plegar
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Sonda Compensar
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Grabar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Aumentar
+label_dec:Disminur
+label_nozzle:Punta
+label_bed:Cama
+label_chamber:Chamber
+label_start:Start
+label_stop:Parar
+label_back:Volver
+label_page_up:Retroceder
+label_page_down:Avanzar
+label_pause:Pausar
+label_resume:Continuar
+label_load:Cargar
+label_unload:Descargar
+label_slow_speed:Despacio
+label_normal_speed:Normal
+label_fast_speed:Rápido
+label_fan_full_speed:Todo
+label_fan_half_speed:Mitad
+label_rotate_ui:Rotar
+label_touchscreen_adjust:Calibrar
+label_more:Más
+label_screen_info:Informar
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Blanco
+label_black:Negro
+label_blue:Azul
+label_red:Rojo
+label_green:Verde
+label_cyan:Cyan
+label_yellow:Amarillo
+label_brown:Marrón
+label_gray:Gris
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Desconectar
+label_baudrate:BaudRate
+label_percentage:Porcentaje
+label_babystep:BabyStep
+label_percentage_speed:Velocidad
+label_percentage_flow:Flujo
+label_value_zero:Cero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:+X
+label_y_inc:+Y
+label_z_inc:+Z
+label_x_dec:-X
+label_y_dec:-Y
+label_z_dec:-Z
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Preparado
+label_busy:Procesamiento ocupado, por favor espere...
+label_unconnected:¡No hay comunicación con impresora!
+label_disconnect_info:¡Ahora puede controlar la impresora desde su ordenador!
+label_loading:Cargando...
+label_power_failed:¿Continuar imprimiendo?
+label_continue:Continuar
+label_cancel:Cancelar
+label_adjust_title:¡Calibrar la pantalla táctil
+label_adjust_info:Por favor haga clic en el punto rojo
+label_adjust_ok:Ajuste correcto
+label_adjust_failed:Ajuste fallido, por favor intentelo de nuevo
+label_warning:Advertencia
+label_stop_print:¿Desea parar la impresión?
+label_confirm:Confirmar
+label_tftsd:SD TFT
+label_read_tftsd_error:¡Error en la tarjeta SD TFT!
+label_tftsd_inserted:¡Tarjeta insertada!
+label_tftsd_removed:¡Tarjeta extraida!
+label_u_disk:Pendrive
+label_read_u_disk_error:¡Error en el Pendrive!
+label_u_disk_inserted:¡Pendrive insertado!
+label_u_disk_removed:¡Pendrive extraido!
+label_onboardsd:SD Placa
+label_read_onboardsd_error:¡Error en la tarjeta SD de la placa!
+label_filament_sensor:Filament sensor
+label_filament_runout:¡Filamento agotado!
+label_preheat:Precalentar
+label_preheat_both:Ambos
+label_is_pause:No se puede extruir\nal imprimir,¿\nPausar la impresión?
+label_auto_shut_down:Apag. aut.
+label_unifiedmove:Movimiento
+label_unifiedheat:Calor/Ventilador
+label_cooldown:Enfriarse
+label_emergencystop:PARADA EMERGENCIA
+label_touch_to_exit:Toca cualquier lugar para salir
+label_mainmenu:Menu
+label_wait_temp_shut_down:Espere a que la\ntemperatura del hotend\nsea inferior a %d℃
+label_force_shut_down:Forzar Apagado
+label_shutting_down:Apagando...
+label_parameter_setting:Parámetro
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Desbloquear XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Español
 label_heat:Calentar
 label_move:Mover
diff --git a/Copy to SD Card root directory to update/Language Packs/language_fr.ini b/Copy to SD Card root directory to update/Language Packs/language_fr.ini
index a2ce087e69..d40ab1f35c 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_fr.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_fr.ini	
@@ -1,8 +1,286 @@
 #### Language Code:FR
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Français
+label_heat:Chauffer
+label_move:Déplacer
+label_home:Home
+label_disable_steppers:Moteurs
+label_print:Imprimer
+label_extrude:Extruder
+label_fan:Ventiler
+label_settings:Options
+label_screen_settings:Écran
+label_machine_settings:Machine
+label_feature_settings:Paramètres
+label_sound:Son
+label_touch_sound:Son des touches
+label_toast_sound:Notifications
+label_alert_sound:Popups et alertes
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Eteindre
+label_rgb_settings:LED
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Gcode
+label_leveling:Niveaux
+label_point_1:Point 1
+label_point_2:Point 2
+label_point_3:Point 3
+label_point_4:Point 4
+label_point_5:Point 5
+label_bed_leveling:ABL
+label_bl_complete:Nivellement terminé
+label_bl_smart_fill:Les points de sonde manquants\nont été intelligemment remplis.\n \nNote : n'oubliez pas de sauvegarder !
+label_bl_enable:BL On
+label_bl_disable:BL Off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Nivellement Mesh
+label_abl_settings:Nivellement Automatique
+label_abl_settings_bbl:Nivellement bilinéaire
+label_abl_settings_ubl:Nivellement unifié
+label_abl_settings_ubl_save:Enregistrer dans l'emplacement
+label_abl_settings_ubl_load:Charger depuis l'emplacement
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Se souvenir de l'emplacement\nau prochain redémarrage ?\n(Sauvegarde EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Tester
+label_bltouch_deploy:Déployer
+label_bltouch_stow:Rentrer
+label_bltouch_repeat:Répéter
+label_z_offset:Z Offset
+label_probe_offset:Décalage Palpeur
+label_home_offset:Home Offset
+label_confirmation:Êtes-vous sûr ?
+label_down:Descendre
+label_up:Monter
+label_save:Sauver
+label_restore:Restaurer
+label_reset:Reset
+label_default:Défaut
+label_clear:Effacer
+label_next:Suivant
+label_distance:Distance
+label_invalid_value:Aucune valeur valide fournie !
+label_timeout_reached:Délai d'attente dépassé !
+label_process_running:Processus en cours ! Veuillez patienter
+label_process_completed:Processus terminé !
+label_process_aborted:Processus annulé !
+label_inc:Plus
+label_dec:Moins
+label_nozzle:Buse
+label_bed:Plateau
+label_chamber:Caisson
+label_start:Démarrer
+label_stop:Stopper
+label_back:Retour
+label_page_up:Précédent
+label_page_down:Suivant
+label_pause:Pause
+label_resume:Reprendre
+label_load:Charger
+label_unload:Décharger
+label_slow_speed:Lent
+label_normal_speed:Normal
+label_fast_speed:Rapide
+label_fan_full_speed:Max
+label_fan_half_speed:Moitié
+label_rotate_ui:Rotation
+label_touchscreen_adjust:Ajuster
+label_more:Plus
+label_screen_info:Infos
+label_status:Statut
+label_simulator_bg_color:Couleur de l'arrière-plan Marlin
+label_simulator_font_color:Couleur de la police Marlin
+label_white:Blanc
+label_black:Noir
+label_blue:Bleu
+label_red:Rouge
+label_green:Vert
+label_cyan:Cyan
+label_yellow:Jaune
+label_brown:Marron
+label_gray:Gris
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violette
+label_magenta:Magenta
+label_purple:Violet
+label_lime:Lime
+label_darkblue:Bleu Foncé
+label_darkgreen:Vert Foncé
+label_darkgray:Gris Foncé
+label_disconnect:Libérer
+label_baudrate:Vitesse
+label_percentage:Avancement
+label_babystep:BabyStep
+label_percentage_speed:Vitesse
+label_percentage_flow:Débit
+label_value_zero:Zéro
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Prête
+label_busy:Occupée, veuillez patienter...
+label_unconnected:Aucune imprimante connectée !
+label_disconnect_info:Vous pouvez maintenant contrôler l'imprimante depuis votre ordinateur !
+label_loading:Chargement...
+label_power_failed:Continuer l'impression ?
+label_continue:Continuer
+label_cancel:Annuler
+label_adjust_title:Calibration écran tactile
+label_adjust_info:Veuillez toucher le point rouge
+label_adjust_ok:Succès de l'ajustement
+label_adjust_failed:Ajustement incorrect, veuillez réessayer
+label_warning:Attention
+label_stop_print:Arrêter l'impression ?
+label_confirm:Confirmer
+label_tftsd:SD TFT
+label_read_tftsd_error:Erreur de lecture de la carte SD TFT !
+label_tftsd_inserted:Carte insérée !
+label_tftsd_removed:Carte retirée !
+label_u_disk:Clé USB
+label_read_u_disk_error:Erreur de lecture de la clé USB !
+label_u_disk_inserted:Clé USB insérée !
+label_u_disk_removed:Clé USB retirée !
+label_onboardsd:SD interne
+label_read_onboardsd_error:Erreur de lecture de la carte SD interne !
+label_filament_sensor:Capteur de filament
+label_filament_runout:Fin de Filament !
+label_preheat:Préparer
+label_preheat_both:Global
+label_is_pause:Extrusion impossible quand\nl'impression est en cours.\nMettre l'impression en pause ?
+label_auto_shut_down:Extinction automatique
+label_unifiedmove:Mouvement
+label_unifiedheat:Chauffer
+label_cooldown:Refroidir
+label_emergencystop:Arrêt
+label_touch_to_exit:Toucher n'importe où pour quitter
+label_mainmenu:Menu
+label_wait_temp_shut_down:Attendez que la température de la buse\nsoit inférieure à %d℃
+label_force_shut_down:Forcer l'extinction
+label_shutting_down:Extinction en cours...
+label_parameter_setting:Réglages
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Afficher ACK sur Terminal
+label_invert_xaxis:Inverser l'axe X
+label_invert_yaxis:Inverser l'axe Y
+label_invert_zaxis:Inverser l'axe Z
+label_move_speed:Vitesse de déplacement (X Y Z)
+label_knob_led:LED du bouton rotatif
+label_knob_led_idle:Veille du bouton rotatif
+label_m0_pause:Suspendu par la commande M0
+label_send_start_gcode:Gcode avant l'impression
+label_send_end_gcode:Gcode après l'impression
+label_send_cancel_gcode:Gcode d'annulation
+label_persistent_status_info:Temp. toujours affichées
+label_file_listmode:Fichiers en mode liste
+label_current_setting:Courant Driver (mA)
+label_steps_setting:Steps par mm
+label_maxfeedrate:Débit maximum
+label_maxacceleration:Accélération maximale
+label_acceleration:Accélération
+label_print_acceleration:Impression
+label_retract_acceleration:Rétraction
+label_travel_acceleration:Déplacements
+label_jerk:Jerk
+label_junction_deviation:Ecart de jonction
+label_bump_sensitivity:Sensibilité TMC
+label_fwretract:Rétraction FW
+label_fwrecover:Récupération FW
+label_lin_advance:Linear Advance
+label_reset_settings_info:Réinitialiser tous les\nparamètres aux valeurs\npar défaut ?
+label_reset_settings_done:Réinitialisation des paramètres\nréalisé avec succès.\nVeuillez redémarrer l'imprimante.
+label_info:Infos
+label_lcd_brightness:Luminosité LCD
+label_lcd_brightness_dim:Diminution luminosité
+label_lcd_dim_idle_timer:Durée avant diminution
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Mode Marlin plein écran
+label_plr_en:Reprise après coupure
+label_setting_save:Sauvegarder les paramètres
+label_setting_reset:RAZ des paramètres
+label_setting_restore:Restaurer les paramètres
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Enregistrer les paramètres\ndans l'EEPROM ?
+label_eeprom_restore_info:Restaurer les paramètres\nde l'EEPROM ?
+label_eeprom_reset_info:Réinitialiser l'EEPROM\naux paramètres d'origine\nde l'imprimante ?
+label_retract_feedrate:Vitesse
+label_retract_length:Longueur
+label_retract_swap_length:Longueur de swap
+label_retract_z_lift:Décalage en Z
+label_retract_auto:Rétraction Firmware auto
+label_recover_feedrate:Vitesse
+label_swap_recover_feedrate:Vitesse de swap
+label_recover_length:Longueur
+label_swap_recover_length:Longueur de swap
+label_start_print:Démarrer l'impression :\n%s ?
+label_ack_notification:Style de notification ACK
+label_leveling_edge_distance:Distance au bord du plateau
+label_xy_unlock:Moteurs XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:Autocalibrage PID
+label_pid_start_info:L'autocalibrage PID va être\nlancé. Cela peut prendre\nquelques minutes. Continuer ?
+label_pid_start_info_2:Autocalibrage PID en cours !
+label_pid_start_info_3:Ne touchez pas l'écran avant la fin (LED verte allumée) !
+label_tune_extruder:Extrudeur
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Réglage de l'extrudeur
+label_tune_ext_templow:Température souhaitée\ntrop basse !\nTempérature minimum : %d C
+label_tune_ext_desiredval:La température n'est pas\nencore à la valeur souhaitée
+label_tune_ext_mark120mm:Marquer 120 mm sur le filament\nAppuyer ensuite sur '%s'\nMesurer la longueur restante
+label_tune_ext_heatoff:Arrêter la chauffe ?
+label_tune_ext_adj_esteps:Ajustement E-Steps
+label_tune_ext_esteps_saved:Nouveau E-steps\nenregistré !
+label_tune_ext_measured:Longueur restante
+label_tune_ext_old_estep:Ancien : %0.2f
+label_tune_ext_new_estep:Nouveau : %0.2f
+label_connection_settings:Connexion
+label_offset_tool:Offset 2ème Buse
+label_hybrid_threshold:Seuil Hybride TMC
+label_notifications:Notifications
+label_mesh_editor:Maillage
+label_mesh_tuner:Edition du maillage
+label_case_light:Case light
 label_language:Français
 label_heat:Chauffer
 label_move:Déplacer
diff --git a/Copy to SD Card root directory to update/Language Packs/language_gr.ini b/Copy to SD Card root directory to update/Language Packs/language_gr.ini
index a02fb4e3fe..9b56f017c6 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_gr.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_gr.ini	
@@ -1,8 +1,286 @@
 #### Language Code:GR
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Ελληνικά
+label_heat:Θέρμανση
+label_move:Μετακίνηση
+label_home:Αυτο-Κατεύθυνση
+label_disable_steppers:Disarm All
+label_print:Εκτύπωση
+label_extrude:Εκβολή
+label_fan:Ανεμιστήρας
+label_settings:Ρυθμίσεις
+label_screen_settings:Οθόνη
+label_machine_settings:Μηχανήματος
+label_feature_settings:Χαρακτηριστικών
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Απενεργοποίηση
+label_rgb_settings:Χρώμα LED
+label_rgb_off:Απενεργοποίηση LED
+label_terminal:Τερματικό
+label_custom:Τροποποιημένο
+label_leveling:Ισοπέδωση
+label_point_1:Σημείο 1
+label_point_2:Σημείο 2
+label_point_3:Σημείο 3
+label_point_4:Σημείο 4
+label_point_5:Σημείο 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Δοκιμή
+label_bltouch_deploy:Επέκταση
+label_bltouch_stow:Aπόσυρση
+label_bltouch_repeat:Επανάληψη
+label_z_offset:Αντιστάθμιση Z
+label_probe_offset:Αντιστάθμιση Καθετήρας
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Αποθήκευση
+label_restore:Restore
+label_reset:Επαναφορά
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Αύξηση
+label_dec:Μείωση
+label_nozzle:Στόμιο
+label_bed:Θερμή Βάση
+label_chamber:Chamber
+label_start:Start
+label_stop:Τερμάτιση
+label_back:Πίσω
+label_page_up:Σελίδα πάνω
+label_page_down:Σελίδα κάτω
+label_pause:Παύση
+label_resume:Ξαναρχίσει
+label_load:Φόρτωση
+label_unload:Ξεφόρτωση
+label_slow_speed:Αργά
+label_normal_speed:Κανονικά
+label_fast_speed:Γρήγορα
+label_fan_full_speed:Ολοταχώς
+label_fan_half_speed:Μισή ταχύτητα
+label_rotate_ui:Περιστροφή UI
+label_touchscreen_adjust:Προσαρμογή TOUCH
+label_more:Περισσότερα
+label_screen_info:Πληροφορίες
+label_status:ΚΑΤΑΣΤΑΣΗ
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Άσπρο
+label_black:Μάυρο
+label_blue:Μπλέ
+label_red:Κόκκινο
+label_green:Πράσινο
+label_cyan:Κυανό
+label_yellow:Κίτρινο
+label_brown:Καφέ
+label_gray:Γκρί
+label_orange:Πορτοκάλι
+label_indigo:Ινδικό
+label_violet:Βιολετί
+label_magenta:Πορφύρα
+label_purple:Μωβ
+label_lime:Πρασινοκίτρινο
+label_darkblue:Σκούρο μπλε
+label_darkgreen:Σκούρο πράσινο
+label_darkgray:Σκούρο γκρίζο
+label_disconnect:Αποσυνδέσει
+label_baudrate:BaudRate
+label_percentage:Ποσοστό
+label_babystep:Μικροβήμα
+label_percentage_speed:Ταχύτητα
+label_percentage_flow:Ροή
+label_value_zero:Μηδέν
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01χιλ
+label_01_mm:0.1χιλ
+label_1_mm:1χιλ
+label_5_mm:5χιλ
+label_10_mm:10χιλ
+label_100_mm:100χιλ
+label_200_mm:200χιλ
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Έτοιμο
+label_busy:Απασχολημένη επεξεργασία, παρακάλω περιμένετε ...
+label_unconnected:Δεν υπάρχει συνδεδεμένος εκτυπωτής!
+label_disconnect_info:Τώρα μπορείτε να ελέγξετε τον εκτυπωτή από τον υπολογιστή σας!
+label_loading:Φόρτωση...
+label_power_failed:Συνέχεια εκτύπωσης;
+label_continue:Συνέχεια
+label_cancel:Ματαίωση
+label_adjust_title:Βαθμονόμηση οθόνης αφής
+label_adjust_info:Κάντε κλικ στην κόκκινη κουκκίδα
+label_adjust_ok:Επιτυχία προσαρμογής
+label_adjust_failed:Η προσαρμογή απέτυχε. Δοκιμάστε ξανά
+label_warning:Προειδοποίηση
+label_stop_print:Διακοπή εκτύπωσης?
+label_confirm:Εντάξει
+label_tftsd:TFT SD
+label_read_tftsd_error:Σφάλμα ανάγνωσης κάρτας SD οθόνης!
+label_tftsd_inserted:Η κάρτα έχει εισαχθεί!
+label_tftsd_removed:Η κάρτα αφαιρέθηκε!
+label_u_disk:USB Δίσκος
+label_read_u_disk_error:Σφάλμα ανάγνωσης USB Δίσκου!
+label_u_disk_inserted:Ο USB Δίσκος έχει εισαχθεί!
+label_u_disk_removed:Ο USB Δίσκος αφαιρέθηκε!
+label_onboardsd:Ενσωματωμένη κάρτα SD
+label_read_onboardsd_error:Σφάλμα ανάγνωσης ενσωματωμένης κάρτας SD!
+label_filament_sensor:Αισθητήρας νήματος
+label_filament_runout:τελείωσε το νημά!
+label_preheat:Προθέρμανση
+label_preheat_both:Και τα δυο
+label_is_pause:Δεν είναι δυνατή η εξώθηση κατα τη δυάρκεια\nεκτύπωσης.\nΠαύση εκτύπωσης?
+label_auto_shut_down:Αυτόματη απενεργοποίηση
+label_unifiedmove:Κίνηση
+label_unifiedheat:Θέρμανση/Ανεμιστήρας
+label_cooldown:Κρυώσει
+label_emergencystop:Σταμάτημα έκτακτης ανάγκης
+label_touch_to_exit:Αγγίξτε οπουδήποτε για έξοδο
+label_mainmenu:Μενού
+label_wait_temp_shut_down:Περιμένετε για την \nθερμοκρασία του hotend να πέσει \nχαμηλότερα απο %d ℃
+label_force_shut_down:Αναγκαστική απενεργοποίηση
+label_shutting_down:Απενεργοποίηση...
+label_parameter_setting:Ρυθμίσεις παραμέτρων
+label_on:Ενεργό
+label_off:Σβηστό
+label_smart:ΈΞΥΠΝΟ
+label_terminal_ack:Εμφάνιση ACK στο τερματικό
+label_invert_xaxis:Αντιστρέψει X άξονα
+label_invert_yaxis:Αντιστρέψει Y άξονα
+label_invert_zaxis:Αντιστρέψει Z άξονα
+label_move_speed:Ταχύτητα κίνησης(X Y Z)
+label_knob_led:LED περιστροφικού κουμπιού
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Διακόπηκε λόγω M0 εντολής
+label_send_start_gcode:Αρχικό Gcode προ εκτύπωσης
+label_send_end_gcode:Τερματικό Gcode εφότου εκτύπωσης
+label_send_cancel_gcode:Ματαίωση Gcode
+label_persistent_status_info:Πληροφορίες μόνιμης κατάστασης
+label_file_listmode:Λειτουργία λίστας προβολής αρχείων
+label_current_setting:Ένταση η. ρεύ. οδηγού(mA)
+label_steps_setting:Βήματα ανά χιλ
+label_maxfeedrate:Μέγιστο ποσοστό τροφοδοσίας
+label_maxacceleration:Μέγιστη επιτάχυνση
+label_acceleration:Eπιτάχυνση
+label_print_acceleration:Επιτάχυνση εκτύπωσης
+label_retract_acceleration:Eπιτάχυνση ανάκλησης
+label_travel_acceleration:Επιτάχυνση ταξιδιού
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC ευαισθησία χτυπήματος
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Όλες οι ρυθμίσεις θα \nεπαναφερθούν στις προεπιλεγμένες \nτιμές. Συνεχίσει?
+label_reset_settings_done:Η επαναφορά όλων των ρυθμίσεων \nολοκληρώθηκε με επιτυχία. \nΓια πλήρη εφαρμογή,\nπαρακάλω επανεκκινήστε τη συσκευή σας.
+label_info:Πληροφορίες
+label_lcd_brightness:Φωτεινότητα οθόνης
+label_lcd_brightness_dim:Φωτεινότητα LCD σκοτεινή
+label_lcd_dim_idle_timer:Xρονομετρητής αδράνειας οθόνης
+label_5_seconds:5 Δευτ.
+label_10_seconds:10 Δευτ.
+label_30_seconds:30 Δευτ.
+label_60_seconds:1 Λεπτό
+label_120_seconds:2 Λεπτά
+label_300_seconds:5 Λεπτά
+label_custom_seconds:Τροποποιημένες ρυθμίσεις
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Λειτουργία Marlin σε πλήρη οθόνη
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Ελληνικά
 label_heat:Θέρμανση
 label_move:Μετακίνηση
diff --git a/Copy to SD Card root directory to update/Language Packs/language_hu.ini b/Copy to SD Card root directory to update/Language Packs/language_hu.ini
index 48bedd9014..f9bc59c8a6 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_hu.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_hu.ini	
@@ -1,8 +1,286 @@
 #### Language Code:HU
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Magyar
+label_heat:Fűtés
+label_move:Mozgás
+label_home:Végállás
+label_disable_steppers:Léptetők
+label_print:Nyomtatás
+label_extrude:Adagolás
+label_fan:Hűtés
+label_settings:Opciók
+label_screen_settings:Kijelző
+label_machine_settings:Gép
+label_feature_settings:Funkciók
+label_sound:Hangok
+label_touch_sound:Érintés hangja
+label_toast_sound:Fűtő értesítések
+label_alert_sound:Felugró riasztások
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Leállítás
+label_rgb_settings:LED Szín
+label_rgb_off:LED KI
+label_terminal:Terminál
+label_custom:Egyedi
+label_leveling:Szintezés
+label_point_1:1. pont
+label_point_2:2. pont
+label_point_3:3. pont
+label_point_4:4. pont
+label_point_5:5. pont
+label_bed_leveling:Ágyszint
+label_bl_complete:Ágy Szintezése Sikeres
+label_bl_smart_fill:A hiányzó szonda pontok\nkitöltésre kerültek.\nMegjegyzés: Mentsd el!
+label_bl_enable:BL: be
+label_bl_disable:BL: ki
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Kézi Rács Szintezés
+label_abl_settings:Automata Szintezés
+label_abl_settings_bbl:Bilineáris Szintezés
+label_abl_settings_ubl:Egységes Szintezés
+label_abl_settings_ubl_save:Mentés szlotba
+label_abl_settings_ubl_load:Betöltés szlotból
+label_abl_slot0:Szlot 0
+label_abl_slot1:Szlot 1
+label_abl_slot2:Szlot 2
+label_abl_slot3:Szlot 3
+label_abl_slot_eeprom:Emlékezzen a következő\nújraindításnál? (EEPROM Mentése)
+label_abl_z:Z Áttűnés
+label_bltouch:BLTouch
+label_bltouch_test:Teszt
+label_bltouch_deploy:Telepítés
+label_bltouch_stow:Elhelyezés
+label_bltouch_repeat:Ismétlés
+label_z_offset:Z Eltolás
+label_probe_offset:Szonda Eltolás
+label_home_offset:Home Offset
+label_confirmation:Biztos vagy benne?
+label_down:Le
+label_up:Fel
+label_save:Mentés
+label_restore:Betöltés
+label_reset:Újratölt
+label_default:Alapért.
+label_clear:Tiszta
+label_next:Tovább
+label_distance:Távolság
+label_invalid_value:Nincs érvényes érték/s megadva
+label_timeout_reached:Időkorlát elérve!
+label_process_running:Folyamat fut!
+label_process_completed:Folyamat befejezve!
+label_process_aborted:Folyamat megszakítva!
+label_inc:Növel
+label_dec:Csökkent
+label_nozzle:Fej
+label_bed:Ágy
+label_chamber:Kamra
+label_start:Kezdés
+label_stop:Állj
+label_back:Vissza
+label_page_up:Fel
+label_page_down:Le
+label_pause:Szünet
+label_resume:Folytatás
+label_load:Betöltés
+label_unload:Kiadás
+label_slow_speed:Lassú
+label_normal_speed:Normál
+label_fast_speed:Gyors
+label_fan_full_speed:Teljes
+label_fan_half_speed:Fél
+label_rotate_ui:Forgatás
+label_touchscreen_adjust:Igazítás
+label_more:Több
+label_screen_info:Infó
+label_status:Státusz
+label_simulator_bg_color:Marlin mód háttérszín
+label_simulator_font_color:Marlin mód betűszín
+label_white:Fehér
+label_black:Fekete
+label_blue:Kék
+label_red:Piros
+label_green:Zöld
+label_cyan:Cián
+label_yellow:Sárga
+label_brown:Barna
+label_gray:Szürke
+label_orange:Narancs
+label_indigo:Indigó
+label_violet:Viola
+label_magenta:Bíborvörös
+label_purple:Lila
+label_lime:Mész
+label_darkblue:Sötétkék
+label_darkgreen:Sötétzöld
+label_darkgray:Sötétszürke
+label_disconnect:Leválaszt
+label_baudrate:Kapcsolat
+label_percentage:Százalék
+label_babystep:Mikrolépés
+label_percentage_speed:Sebesség
+label_percentage_flow:Folyás
+label_value_zero:Nulla
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Kész
+label_busy:Feldolgozás alatt, kérlek várj...
+label_unconnected:Nincs nyomtató csatlakoztatva!
+label_disconnect_info:Most a számítógépéről vezérelheted a nyomtatót!
+label_loading:Betöltés...
+label_power_failed:Folytatod a nyomtatást?
+label_continue:Folytatás
+label_cancel:Mégse
+label_adjust_title:Érintőképernyő kalibrálása.
+label_adjust_info:Kattints a piros pontra.
+label_adjust_ok:Kalibrálás sikeres.
+label_adjust_failed:A kalibrálás sikertelen, próbáld újra
+label_warning:Figyelem!
+label_stop_print:Megállítod a nyomtatást?
+label_confirm:Igen
+label_tftsd:TFT-SD
+label_read_tftsd_error:TFT-SD olvasási hiba!
+label_tftsd_inserted:SD-Kártya behelyezve!
+label_tftsd_removed:SD-Kártya eltávolítva!
+label_u_disk:USB Tár
+label_read_u_disk_error:USB olvasási hiba!
+label_u_disk_inserted:USB behelyezve!
+label_u_disk_removed:USB eltávolítva!
+label_onboardsd:Lap-SD
+label_read_onboardsd_error:Alaplap-SD olvasási hiba!
+label_filament_sensor:Filament érzékelő
+label_filament_runout:Filament kifutás!
+label_preheat:Előfűtés
+label_preheat_both:Mindkettő
+label_is_pause:Nem sikerült az adagolás\na nyomtatás alatt.\nSzünetelteted a nyomtatást?
+label_auto_shut_down:Automata kikapcsolás
+label_unifiedmove:Mozgás
+label_unifiedheat:Fűt/Hűt
+label_cooldown:Lehűtés
+label_emergencystop:VészSTOP
+label_touch_to_exit:Érintsd meg a kilépéshez.
+label_mainmenu:Főmenü
+label_wait_temp_shut_down:Várd meg a fej\nvisszahűlését.%d℃
+label_force_shut_down:Kényszerítés
+label_shutting_down:Leállítás...
+label_parameter_setting:Tényezők
+label_on:BE
+label_off:KI
+label_smart:OKOS
+label_terminal_ack:ACK Megjelenítése
+label_invert_xaxis:X megfordítása
+label_invert_yaxis:Y megfordítása
+label_invert_zaxis:Z megfordítása
+label_move_speed:Mozg.Sebesség (X-Y-Z)
+label_knob_led:Forgatógomb LED
+label_knob_led_idle:Forgatógomb tétlen
+label_m0_pause:Szünetelés M0 parancsal
+label_send_start_gcode:Kezdő G-Kód
+label_send_end_gcode:Befejező G-Kód
+label_send_cancel_gcode:Leállító G-Kód
+label_persistent_status_info:Perzisztens állapotinfó
+label_file_listmode:Fájlnéző listamód
+label_current_setting:Motoráramok Beállítása
+label_steps_setting:Lépés Beállítás
+label_maxfeedrate:Max Előtolási Sebesség
+label_maxacceleration:Max Gyorsulás
+label_acceleration:Gyorsulás
+label_print_acceleration:Nyomtatás Gyorsulás
+label_retract_acceleration:Adagoló Gyorsulása
+label_travel_acceleration:Utazási Gyorsulás
+label_jerk:Rántás
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC ütközés érzékenység
+label_fwretract:FW Visszahúzás
+label_fwrecover:FW Visszahúzás helyreáll.
+label_lin_advance:Lineáris Haladás
+label_reset_settings_info:Minden beállítás vissza\nfog állni alapértelmezett\nértékre. Folytatod?
+label_reset_settings_done:A beállítások visszaállítása\nsikeresen megtörtént.\nAz aktiváláshoz indítsd\nújra az eszközt.
+label_info:Infó
+label_lcd_brightness:LCD Fényerősség
+label_lcd_brightness_dim:LCD Halványítás
+label_lcd_dim_idle_timer:LCD Halványítási idő
+label_5_seconds:5 Mp.
+label_10_seconds:10 Mp.
+label_30_seconds:30 Mp.
+label_60_seconds:1 Perc.
+label_120_seconds:2 Perc.
+label_300_seconds:5 Perc.
+label_custom_seconds:Egyedi
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Nagyképernyős Marlin mód
+label_plr_en:Áramkiesés helyreálítása
+label_setting_save:Beállítások mentése
+label_setting_reset:Beállítás visszaállítása
+label_setting_restore:Beállítások újratöltése
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Menti a megváltozott\nbeállításokat az EEPROM-ba?
+label_eeprom_restore_info:Betöltöd a beállításokat az\nEEPROM-ból?
+label_eeprom_reset_info:Visszaállítod az EEPROM-ot a\ngyári beállításokra?
+label_retract_feedrate:Visszahúzás előtol.
+label_retract_length:Visszahúzás hossz
+label_retract_swap_length:Csere hossz vissza.
+label_retract_z_lift:Z emelése visszahú.
+label_retract_auto:Automata Visszahúzás
+label_recover_feedrate:Előtolás javítás
+label_swap_recover_feedrate:Csere előtolás jav.
+label_recover_length:Hossz javítás
+label_swap_recover_length:Cserehossz javítás
+label_start_print:Elindítod a %s\nfájl nyomtatását?
+label_ack_notification:ACK egyéb típus
+label_leveling_edge_distance:Ágy szélének távolsága
+label_xy_unlock:Felold XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID Automatikus Hangolás
+label_pid_start_info:A PID önhangolása elindul.\nPercekig is eltarthat.\nFolytatod?
+label_pid_start_info_2:PID Automatikus hangolása zajlik!
+label_pid_start_info_3:NE ÉRINTSD meg a kijelzőt míg nincs kész! (zöld LED jelzi)!
+label_tune_extruder:Lépés hangolás
+label_tune_ext_extrude_100:Kiad 100mm
+label_tune_ext_temp:Adagoló hangolás | Fűt
+label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d C
+label_tune_ext_desiredval:A hőfok még nem érte el a kívánt értéket
+label_tune_ext_mark120mm:A 120mm-t jelöld be a szálon\nNyomd '%s' ha kész\nMérd meg a hátralévő hosszt\nadagolás után.
+label_tune_ext_heatoff:Kikapcsolod a fűtést?
+label_tune_ext_adj_esteps:Állítható E-lépés
+label_tune_ext_esteps_saved:Új E-lépés mentve!\nNe felejtsd el\nmenteni EEPROM-ba.\nÚj érték: %0.2f
+label_tune_ext_measured:Fennmaradó Hossz:
+label_tune_ext_old_estep:Régi e-lépés: %0.2f
+label_tune_ext_new_estep:Új e-lépés: %0.2f
+label_connection_settings:Kapcsolat
+label_offset_tool:Második fej eltolása
+label_hybrid_threshold:TMC Hibrid Küszöbérték
+label_notifications:Értesítések
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Magyar
 label_heat:Fűtés
 label_move:Mozgás
diff --git a/Copy to SD Card root directory to update/Language Packs/language_it.ini b/Copy to SD Card root directory to update/Language Packs/language_it.ini
index f7a01fd4c8..1a04b37118 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_it.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_it.ini	
@@ -1,8 +1,286 @@
 #### Language Code:IT
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Italiano
+label_heat:Riscalda
+label_move:Muovi
+label_home:Home
+label_disable_steppers:Spegni mot
+label_print:Stampa
+label_extrude:Estrudi
+label_fan:Ventola
+label_settings:Opzioni
+label_screen_settings:Schermo
+label_machine_settings:Stampante
+label_feature_settings:Extra
+label_sound:Suono
+label_touch_sound:Suono touch
+label_toast_sound:Notifiche Toast
+label_alert_sound:Popup e Avvisi
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Spegni
+label_rgb_settings:RGB LED
+label_rgb_off:Spegni
+label_terminal:Terminale
+label_custom:Custom
+label_leveling:Livella
+label_point_1:Punto 1
+label_point_2:Punto 2
+label_point_3:Punto 3
+label_point_4:Punto 4
+label_point_5:Punto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Livellamento Bed Completato
+label_bl_smart_fill:Punti di test mancanti\nsono stati scelti automaticamente.\n \nNote: ricorda di salvare!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Salva in slot
+label_abl_settings_ubl_load:Carica da slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Ricorda lo slot per il prossimo\nriavvio? (Salva EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Estrai
+label_bltouch_stow:Ritrai
+label_bltouch_repeat:Ripeti
+label_z_offset:Z Offset
+label_probe_offset:Offset Sonda
+label_home_offset:Home Offset
+label_confirmation:Sei sicuro?
+label_down:Giù
+label_up:Su
+label_save:Salva
+label_restore:Ripristina
+label_reset:Reset
+label_default:Default
+label_clear:Cancella
+label_next:Avanti
+label_distance:Distanza
+label_invalid_value:Valore invalido
+label_timeout_reached:Timeout raggiunto!
+label_process_running:Processo già in esecuzione!
+label_process_completed:Processo completato!
+label_process_aborted:Processo interrotto!
+label_inc:Aumenta
+label_dec:Diminuisci
+label_nozzle:Ugello
+label_bed:Piatto
+label_chamber:Camera
+label_start:Avvia
+label_stop:Stop
+label_back:Indietro
+label_page_up:Pagina Su
+label_page_down:Pagina Giu
+label_pause:Pausa
+label_resume:Riprendi
+label_load:Carica
+label_unload:Estrai
+label_slow_speed:Lento
+label_normal_speed:Normale
+label_fast_speed:Veloce
+label_fan_full_speed:Massimo
+label_fan_half_speed:Metà
+label_rotate_ui:Ruota UI
+label_touchscreen_adjust:Calibra
+label_more:Altro
+label_screen_info:Info
+label_status:Stato
+label_simulator_bg_color:Marlin simulator colore sfondo
+label_simulator_font_color:Marlin simulator colore scritte
+label_white:Bianco
+label_black:Nero
+label_blue:Blu
+label_red:Rosso
+label_green:Verde
+label_cyan:Ciano
+label_yellow:Giallo
+label_brown:Marrone
+label_gray:Grigio
+label_orange:Arancione
+label_indigo:Indaco
+label_violet:Viola
+label_magenta:Magenta
+label_purple:Viola
+label_lime:Lime
+label_darkblue:Blu Scuro
+label_darkgreen:Vrde Scuro
+label_darkgray:Grigio Scuro
+label_disconnect:Scollega
+label_baudrate:BaudRate
+label_percentage:Percentuale
+label_babystep:BabyStep
+label_percentage_speed:Velocità
+label_percentage_flow:Flusso
+label_value_zero:Zero
+label_1_degree:1°
+label_5_degree:5°
+label_10_degree:10°
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pronto
+label_busy:Caricamento,attendi...
+label_unconnected:Stampante non connessa
+label_disconnect_info:Puoi controllare la stampante dal PC!
+label_loading:Caricamento...
+label_power_failed:Vuoi continuare la stampa?
+label_continue:Continua
+label_cancel:Cancella
+label_adjust_title:Calibrazione Touch Screen
+label_adjust_info:Premi sui punti rossi
+label_adjust_ok:Regolazione Completata!
+label_adjust_failed:Regolazione Fallita. Riprova!
+label_warning:Attenzione
+label_stop_print:Vuoi fermare la stampa?
+label_confirm:Conferma
+label_tftsd:SD Schermo
+label_read_tftsd_error:Errore lettura SD!
+label_tftsd_inserted:SD Inserita
+label_tftsd_removed:SD Rimossa
+label_u_disk:USB Disk
+label_read_u_disk_error:Errore lettura U Disk
+label_u_disk_inserted:U Disk inserita!
+label_u_disk_removed:U Disk rimossa!
+label_onboardsd:Micro SD
+label_read_onboardsd_error:Errore lettura Micro SD!
+label_filament_sensor:Sensore Filamento
+label_filament_runout:Filamento finito!
+label_preheat:Prepara
+label_preheat_both:Entrambi
+label_is_pause:Impossibile estrudere\ndurante la stampa,\nvuoi sospendere?
+label_auto_shut_down:Auto Spegnimento
+label_unifiedmove:Movimento
+label_unifiedheat:Scalda
+label_cooldown:Raffredda
+label_emergencystop:EMERGENZA
+label_touch_to_exit:Premi ovunque per uscire
+label_mainmenu:Menu
+label_wait_temp_shut_down:Attendi che la temperatura\ndell'hotend scenda\nsotto %d℃
+label_force_shut_down:Forza
+label_shutting_down:Spegnimento...
+label_parameter_setting:Parametri
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Mostra ACK nel terminale
+label_invert_xaxis:Inverti Asse X
+label_invert_yaxis:Inverti Asse Y
+label_invert_zaxis:Inverti Asse Z
+label_move_speed:Vel. Movimenti (X Y Z)
+label_knob_led:LED Manopola 
+label_knob_led_idle:LED Manopola inattivo
+label_m0_pause:Messo in pausa dal comando M0
+label_send_start_gcode:Gcode prima di stampare
+label_send_end_gcode:Gcode dopo la stampa
+label_send_cancel_gcode:Gcode Cancella
+label_persistent_status_info:Info/Stato Permanenti
+label_file_listmode:Files in modalità lista
+label_current_setting:Corrente Motori(mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Avanzamento
+label_maxacceleration:Max Accelerazione
+label_acceleration:Accelerazione
+label_print_acceleration:Accel. Stampa
+label_retract_acceleration:Accel. Ritrazione
+label_travel_acceleration:Accel. Spostamenti
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC Sensibilità Urto
+label_fwretract:FW Retrazione
+label_fwrecover:FW Recupero Retrazione
+label_lin_advance:Linear Advance
+label_reset_settings_info:Ripristinare tutte le\nimpostazioni\nai valori predefiniti?
+label_reset_settings_done:Ripristino di tutte le impostazioni\navvenuto con successo.\nperfavore riavvia il dispositivo.
+label_info:Info
+label_lcd_brightness:Luminosità LCD
+label_lcd_brightness_dim:Lumin. LCD ridotta
+label_lcd_dim_idle_timer:Riduzione lumin. dopo
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode schermo pieno
+label_plr_en:Recupero mancanza corrente
+label_setting_save:Salva le impostazioni
+label_setting_reset:Ripristina impost standard
+label_setting_restore:Ripristina impost precedenti
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Salvare le impostazioni di\nstampa nella EEPROM?
+label_eeprom_restore_info:Carica le impostazioni \ndalla EEPROM?
+label_eeprom_reset_info:Ripristino EEPROM alle \nimpostazioni di fabbrica?
+label_retract_feedrate:Avanzamento retraz
+label_retract_length:Lunghezza retraz
+label_retract_swap_length:Lunghezza cambio fil.
+label_retract_z_lift:Alza Z al cambio
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Avanzamento ripristino
+label_swap_recover_feedrate:Avanzamento cambio fil
+label_recover_length:Lunghezza extra al ripr.
+label_swap_recover_length:Lunghezza extra al cambio
+label_start_print:Inizia a stampare:\n %s?
+label_ack_notification:ACK stile notifica
+label_leveling_edge_distance:Distanza dai bordi
+label_xy_unlock:Sblocca XY
+label_tuning:Regola
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune potrebbe\nrichiedere un po' di tempo.\nContinuare?
+label_pid_start_info_2:PID autotune in corso!
+label_pid_start_info_3:Non toccare lo schermo prima del completamento (LED verde Acceso)!
+label_tune_extruder:Step E
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Temperatura desisderata troppo bassa!\nTemperatura minima: %d C
+label_tune_ext_desiredval:La temperatura non è ancora al valore desiderato
+label_tune_ext_mark120mm:Segna 120 mm sul filamento\nPremi '%s' quando pronto\nMisura lunghezza rimanente\ndopo l'estrusione
+label_tune_ext_heatoff:Spegnere il riscaldamento?
+label_tune_ext_adj_esteps:Regola E-Steps
+label_tune_ext_esteps_saved:Nuovi E-steps salvati!\nNon dimenticare di\nsalvarli nellaEEPROM\nNuovo valore: %0.2f
+label_tune_ext_measured:Lunghezza rimanente:
+label_tune_ext_old_estep:Vecchi e-steps: %0.2f
+label_tune_ext_new_estep:Nuovi e-steps: %0.2f
+label_connection_settings:Imp.Conn.
+label_offset_tool:Offset 2nd Ugello
+label_hybrid_threshold:TMC Soglia Modo Ibrido
+label_notifications:Notifiche
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Italiano
 label_heat:Riscalda
 label_move:Muovi
diff --git a/Copy to SD Card root directory to update/Language Packs/language_jp.ini b/Copy to SD Card root directory to update/Language Packs/language_jp.ini
index f63500be57..47defc954f 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_jp.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_jp.ini	
@@ -1,8 +1,286 @@
 #### Language Code:JP
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:日本語
+label_heat:あたため
+label_move:移動
+label_home:ゼロにする
+label_disable_steppers:Disarm All
+label_print:プリント
+label_extrude:押出
+label_fan:ファン
+label_settings:設定
+label_screen_settings:画面
+label_machine_settings:マシン
+label_feature_settings:機能
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:シャットダウン
+label_rgb_settings:LED カラー
+label_rgb_off:LED オフ
+label_terminal:端末
+label_custom:カスタム
+label_leveling:レベリング
+label_point_1:ポイント1
+label_point_2:ポイント2
+label_point_3:ポイント3
+label_point_4:ポイント4
+label_point_5:ポイント5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:自動調整
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:テスト
+label_bltouch_deploy:展開
+label_bltouch_stow:収納
+label_bltouch_repeat:繰り返す
+label_z_offset:Zオフセット
+label_probe_offset:プローブオフセット
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:保存
+label_restore:Restore
+label_reset:リセット
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:増え
+label_dec:減る
+label_nozzle:ノズル
+label_bed:ベッド
+label_chamber:Chamber
+label_start:Start
+label_stop:停止
+label_back:戻る
+label_page_up:前ページ
+label_page_down:次ページ
+label_pause:一時停止
+label_resume:続ける
+label_load:増え
+label_unload:減る
+label_slow_speed:ゆっくり
+label_normal_speed:正常速度
+label_fast_speed:早め
+label_fan_full_speed:全速
+label_fan_half_speed:50%速さ
+label_rotate_ui:回転UI
+label_touchscreen_adjust:校正する
+label_more:詳細
+label_screen_info:ついて
+label_status:状態
+label_simulator_bg_color:Marlin シミュレータの背景色
+label_simulator_font_color:Marlinシミュレータフォントの色
+label_white:白色
+label_black:黒色
+label_blue:青色
+label_red:赤色
+label_green:緑色
+label_cyan:シアン
+label_yellow:黄色
+label_brown:茶色
+label_gray:灰色
+label_orange:オレンジ
+label_indigo:インディゴ
+label_violet:バイオレット
+label_magenta:赤紫色
+label_purple:紫
+label_lime:ライム
+label_darkblue:濃紺
+label_darkgreen:ダークグリーン
+label_darkgray:暗灰色
+label_disconnect:データ接続
+label_baudrate:ポートレート
+label_percentage:パーセント
+label_babystep:ベビーステップ
+label_percentage_speed:スビード
+label_percentage_flow:押出
+label_value_zero:ゼロ
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:準備中
+label_busy:ビジー状態、しばらくお待ちください...
+label_unconnected:プリンターに連続していない!
+label_disconnect_info:SDカード　PC両用
+label_loading:ロッド中...
+label_power_failed:プリントを継続しますか?
+label_continue:継続
+label_cancel:キャンセル
+label_adjust_title:タッチスクリーン較正
+label_adjust_info:赤星をタッチ
+label_adjust_ok:校正が成功しました
+label_adjust_failed:校正が失敗しました、も一度お試して下さい
+label_warning:注意
+label_stop_print:プリントを中止しますか?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SDカードの読み取りがエラー発生しました!
+label_tftsd_inserted:SDカード入りました!
+label_tftsd_removed:SDカード出しました!
+label_u_disk:USBメモリー
+label_read_u_disk_error:USBメモリー読み込みエラー!
+label_u_disk_inserted:U Diskカード入りました!
+label_u_disk_removed:U Diskカード出しました!
+label_onboardsd:内部 mSDカード
+label_read_onboardsd_error:内部 mSDカードの読み取りがエラー発生しました!
+label_filament_sensor:フィラメントセンサ
+label_filament_runout:フィラメントランアウト!
+label_preheat:予熱する
+label_preheat_both:両方
+label_is_pause:印刷時に押し出すことができない。印刷を中止しますか？
+label_auto_shut_down:オートパワー
+label_unifiedmove:移動
+label_unifiedheat:ヒート&ファン
+label_cooldown:クールダウン
+label_emergencystop:EM.停止
+label_touch_to_exit:クリックして終了します
+label_mainmenu:メニュー
+label_wait_temp_shut_down:ホットエンドの温度が%d℃未満になるまで待ちます。
+label_force_shut_down:フォース
+label_shutting_down:シャットダウン...
+label_parameter_setting:パラメータ
+label_on:ON
+label_off:OFF
+label_smart:スマート
+label_terminal_ack:端末でACKを表示する
+label_invert_xaxis:X軸を反転
+label_invert_yaxis:Y軸を反転
+label_invert_zaxis:Z軸を反転
+label_move_speed:移動速度(X Y Z)
+label_knob_led:回転ノブLED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:MOコマンドで一時停止
+label_send_start_gcode:印刷前にGコードを開始する
+label_send_end_gcode:印刷後にGコードを終了する
+label_send_cancel_gcode:Gコードをキャンセルする
+label_persistent_status_info:永続的なステータス情報
+label_file_listmode:ファイルビューアリストモード
+label_current_setting:ドライバー電流 (mA)
+label_steps_setting:MMあたりのステップ
+label_maxfeedrate:マックスフィード率
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:印刷加速度
+label_retract_acceleration:引き戻し加速度
+label_travel_acceleration:空振り加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC バンプ感度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:すべての設定をデフォルト値にリセットしますか?
+label_reset_settings_done:すべての設定が正常にリセットされました。デバイスを再起動してください。
+label_info:情報
+label_lcd_brightness:LCD明るさ
+label_lcd_brightness_dim:LCDの輝度が薄暗い
+label_lcd_dim_idle_timer:LCD調光アイドルタイマー
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:カスタム
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:フルスクリーンでマーリンモード
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:設定をリセットする
+label_setting_restore:設定を復元する
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:プリンタの設定をEEPROMに保存しますか?
+label_eeprom_restore_info:EEPROMから設定を再読み込み?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:引き戻し速度
+label_retract_length:引き戻し長さ
+label_retract_swap_length:交換時の引き戻し長さ
+label_retract_z_lift:引き戻し時のz軸上げの高さ
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:押出速度
+label_swap_recover_feedrate:交換時の押出速度
+label_recover_length:余分な押し出し長さ
+label_swap_recover_length:交換時の余分な押し出し長さ
+label_start_print:印刷を開始する:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:日本語
 label_heat:あたため
 label_move:移動
diff --git a/Copy to SD Card root directory to update/Language Packs/language_nl.ini b/Copy to SD Card root directory to update/Language Packs/language_nl.ini
new file mode 100644
index 0000000000..bf793f4ea1
--- /dev/null
+++ b/Copy to SD Card root directory to update/Language Packs/language_nl.ini	
@@ -0,0 +1,284 @@
+#### Language Code:NL
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Dutch
+label_heat:Verwarm
+label_move:Verplaats
+label_home:Thuis
+label_disable_steppers:Disarm All
+label_print:Print
+label_extrude:Extrudeer
+label_fan:Ventilator
+label_settings:Instellingen
+label_screen_settings:Scherm
+label_machine_settings:Machine
+label_feature_settings:Kenmerk
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Uitschakelen
+label_rgb_settings:LED Kleur
+label_rgb_off:LED Uit
+label_terminal:Terminal
+label_custom:Aangepast
+label_leveling:Nivelleren
+label_point_1:Punt 1
+label_point_2:Punt 2
+label_point_3:Punt 3
+label_point_4:Punt 4
+label_point_5:Punt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling voltooid
+label_bl_smart_fill:Missende probe punten\nzijn slim opgevuld.\n \nNote: Vergeet niet op te slaan!
+label_bl_enable:BL: aan
+label_bl_disable:BL: uit
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Sla op naar sleuf
+label_abl_settings_ubl_load:Laad van sleuf
+label_abl_slot0:Sleuf 0
+label_abl_slot1:Sleuf 1
+label_abl_slot2:Sleuf 2
+label_abl_slot3:Sleuf 3
+label_abl_slot_eeprom:Onthoud sleuf voor\nvolgende reboot?\n(sla op in EEPROM)
+label_abl_z:Z vervagen
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Gebruiken
+label_bltouch_stow:Inzetten
+label_bltouch_repeat:Herhaal
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Weet u het zeker?
+label_down:Omlaag
+label_up:Omhoog
+label_save:Bewaren
+label_restore:Herstellen
+label_reset:Reset
+label_default:Standaard
+label_clear:Clear
+label_next:Volgende
+label_distance:Afstand
+label_invalid_value:Geen correcte waarde/s voorzien!
+label_timeout_reached:Time-out bereikt!
+label_process_running:Process bezig!
+label_process_completed:Process voltooid!
+label_process_aborted:Process geannuleerd!
+label_inc:Verhogen
+label_dec:Verlagen
+label_nozzle:Spuitneus
+label_bed:Verwarmd bed
+label_chamber:Kamer
+label_start:Start
+label_stop:Stop
+label_back:Terug
+label_page_up:Blz omhoog
+label_page_down:Blz omlaag
+label_pause:Pauze
+label_resume:Hervatten
+label_load:Laden
+label_unload:Lossen
+label_slow_speed:Traag
+label_normal_speed:Normaal
+label_fast_speed:Snel
+label_fan_full_speed:Volledig
+label_fan_half_speed:Half
+label_rotate_ui:Draai UI
+label_touchscreen_adjust:TSC Aanpassen
+label_more:Meer
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator achtergrond kleur
+label_simulator_font_color:Marlin simulator tekst kleur
+label_white:Wit
+label_black:Zwart
+label_blue:Blauw
+label_red:Rood
+label_green:Groen
+label_cyan:Cyaan
+label_yellow:Geel
+label_brown:Bruin
+label_gray:Grijs
+label_orange:Oranje
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Loskoppelen
+label_baudrate:Baudsnelheid
+label_percentage:Percentage
+label_babystep:BabyStap
+label_percentage_speed:Snelheid
+label_percentage_flow:Stromen
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Gereed
+label_busy:In verwerking ,wacht aub...
+label_unconnected:Geen printer gekoppeld!
+label_disconnect_info:De printer kan nu door de computer bestuurd worden!
+label_loading:Opladen...
+label_power_failed:Verder met printen?
+label_continue:Verder
+label_cancel:Afbreken
+label_adjust_title:Touch Screen Calibratie
+label_adjust_info:Klik op de rode punt
+label_adjust_ok:Calibratie Gelukt
+label_adjust_failed:Calibratie Mislukt, Probeer Opnieuw aub
+label_warning:Waarschuwing
+label_stop_print:Stop afdruk?
+label_confirm:Bevestig
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SD leesfout!
+label_tftsd_inserted:Kaart geplaatst!
+label_tftsd_removed:Kaart verwijdert!
+label_u_disk:U Disk
+label_read_u_disk_error:U Disk Leesfout!
+label_u_disk_inserted:U Disk geplaatst!
+label_u_disk_removed:U Disk verwijdert!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:Onboard SD-kaart leesfout!
+label_filament_sensor:Filament sensor
+label_filament_runout:filament op!
+label_preheat:Voorverwarmen
+label_preheat_both:Beide
+label_is_pause:Kan niet extruderen\ntijdens printen,\nPauzeer printen?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Beweging
+label_unifiedheat:Verwarm/Ventilator
+label_cooldown:Afkoelen
+label_emergencystop:NOODSTOP
+label_touch_to_exit:Aanraken om te verlaten
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wacht tot de temperatuur\nvan de spuitkop\nlager dan %d℃ is
+label_force_shut_down:Forceer Afsluiten
+label_shutting_down:Afsluiten...
+label_parameter_setting:Parameter
+label_on:AAN
+label_off:UIT
+label_smart:SLIM
+label_terminal_ack:Laat ACK in Terminal zien
+label_invert_xaxis:Inverteer X Axis
+label_invert_yaxis:Inverteer Y Axis
+label_invert_zaxis:Inverteer Z Axis
+label_move_speed:Bewegingssnelheid(X Y Z)
+label_knob_led:Draaiknop LED
+label_knob_led_idle:Draaiknop LED inactief
+label_m0_pause:Gepauseerd door M0 commando
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Aanhoudende statusinfo
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver stroom (mA)
+label_steps_setting:Stappen permm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleratie
+label_acceleration:Acceleratie
+label_print_acceleration:Afdruk Acceleratie
+label_retract_acceleration:Retract Acceleratie
+label_travel_acceleration:Travel Acceleratie
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitiviteit
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset alle instellingen \naar de standaard waardes?
+label_reset_settings_done:Reset van alle instellingen\nis succesvol gelukt.\nHerstart alstublieft het apparaat.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset instellingen
+label_setting_restore:Herstel instellingen
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Sla printer instellingen\nop naar EEPROM?
+label_eeprom_restore_info:Herlaad instellingen van \nde EEPROM?
+label_eeprom_reset_info:Reset EEPROM naar de standaard printer instellingen?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start afdruk:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Ontgrendel XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune zal starten.\nDit kan een paar minuten duren.\nDoorgaan?
+label_pid_start_info_2:PID autotune is bezig!
+label_pid_start_info_3:Raak het scherm NIET aan totdat deze klaar is (groene LED aan)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connecties
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+
diff --git a/Copy to SD Card root directory to update/Language Packs/language_pl.ini b/Copy to SD Card root directory to update/Language Packs/language_pl.ini
index 1560e27c7c..14ab40edcf 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_pl.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_pl.ini	
@@ -1,8 +1,286 @@
 #### Language Code:PL
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Polski
+label_heat:Temp.
+label_move:Ruch
+label_home:Powrót
+label_disable_steppers:Disarm All
+label_print:Druk
+label_extrude:Extrude
+label_fan:Wentylator
+label_settings:Ustawienia
+label_screen_settings:Ekran
+label_machine_settings:Drukarka
+label_feature_settings:Opcje
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Wyłącz
+label_rgb_settings:Kolor LED
+label_rgb_off:Wyłącz LED
+label_terminal:Terminal
+label_custom:Własne
+label_leveling:Poziomowanie
+label_point_1:Punkt 1
+label_point_2:Punkt 2
+label_point_3:Punkt 3
+label_point_4:Punkt 4
+label_point_5:Punkt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Wysuń
+label_bltouch_stow:Schowaj
+label_bltouch_repeat:Powtórz
+label_z_offset:Z Offset
+label_probe_offset:Przesunięcie
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Zapisz
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Więcej
+label_dec:Mniej
+label_nozzle:Głowica
+label_bed:Stół
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Powrót
+label_page_up:Dalej
+label_page_down:Wstecz
+label_pause:Wstrzymaj
+label_resume:Wznów
+label_load:Load
+label_unload:Unload
+label_slow_speed:Wolno
+label_normal_speed:Normalnie
+label_fast_speed:Szybko
+label_fan_full_speed:Max
+label_fan_half_speed:Połowa
+label_rotate_ui:Obrót
+label_touchscreen_adjust:Kalibracja
+label_more:Więcej
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Biały
+label_black:Czarny
+label_blue:Niebieski
+label_red:Czerwony
+label_green:Zielony
+label_cyan:Turkusowy
+label_yellow:Żółty
+label_brown:Brązowy
+label_gray:Szary
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Odłącz
+label_baudrate:BaudRate
+label_percentage:Procent
+label_babystep:BabyStep
+label_percentage_speed:Prędkość
+label_percentage_flow:Flow
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Gotowy
+label_busy:Trwa przetwarzanie, proszę czekać...
+label_unconnected:Drukarka nie podłączona!
+label_disconnect_info:Teraz możesz kontrolować drukarkę z komputera!
+label_loading:Loading...
+label_power_failed:Kontynuować drukowanie?
+label_continue:Kontynuuj
+label_cancel:Anuluj
+label_adjust_title:Kalibracja ekranu dotykowego
+label_adjust_info:Dotykaj czerwoną kropkę
+label_adjust_ok:Kalibracja poprawna
+label_adjust_failed:Kalibracja niepoprawna, spróbuj ponownie
+label_warning:Uwaga
+label_stop_print:Zatrzymać drukowanie?
+label_confirm:Potwierdź
+label_tftsd:SD TFT
+label_read_tftsd_error:Błąd odczytu karty SD wyświetlacza!
+label_tftsd_inserted:Karta włożona!
+label_tftsd_removed:Karta wyjęta!
+label_u_disk:U Disk
+label_read_u_disk_error:Błąd odczytu U Disk!
+label_u_disk_inserted:U Disk włożony!
+label_u_disk_removed:U Disk wyjęty!
+label_onboardsd:SD płyta
+label_read_onboardsd_error:Błąd odczytu karty SD na płycie!
+label_filament_sensor:Filament sensor
+label_filament_runout:brak filamentu!
+label_preheat:Rozgrzew.
+label_preheat_both:Wszystko
+label_is_pause:Operacja niedostępna\nw trakcie drukowania,\nwstrzymać drukowanie?
+label_auto_shut_down:Auto Wył.
+label_unifiedmove:Ruch
+label_unifiedheat:Temperatura
+label_cooldown:Chłodzenie
+label_emergencystop:ZATRZYMAJ
+label_touch_to_exit:Dotkij aby wyjść
+label_mainmenu:Menu
+label_wait_temp_shut_down:Czekam na schłodzenie\ndo %d℃
+label_force_shut_down:Wymuś
+label_shutting_down:Wyłączanie...
+label_parameter_setting:Parametr
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Odblokuj XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Polski
 label_heat:Temp.
 label_move:Ruch
diff --git a/Copy to SD Card root directory to update/Language Packs/language_pt.ini b/Copy to SD Card root directory to update/Language Packs/language_pt.ini
index bb68b35dc4..9edd33206a 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_pt.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_pt.ini	
@@ -1,8 +1,286 @@
 #### Language Code:PT
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Portugues
+label_heat:Aquecer
+label_move:Mover
+label_home:Inicio
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extrudir
+label_fan:Ventoinha
+label_settings:Configurar
+label_screen_settings:Ecra
+label_machine_settings:Impressora
+label_feature_settings:Extras
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Desligar
+label_rgb_settings:LED cor
+label_rgb_off:Desligar
+label_terminal:Terminal
+label_custom:Custom
+label_leveling:Nivelar
+label_point_1:Ponto 1
+label_point_2:Ponto 2
+label_point_3:Ponto 3
+label_point_4:Ponto 4
+label_point_5:Ponto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Testar
+label_bltouch_deploy:Abrir
+label_bltouch_stow:Encolher
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Gravar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Aumentar
+label_dec:Diminuir
+label_nozzle:Nozzle
+label_bed:Hotbed
+label_chamber:Chamber
+label_start:Start
+label_stop:Parar
+label_back:Voltar
+label_page_up:Subir pagina
+label_page_down:Pagina abaixo
+label_pause:Pausar
+label_resume:Resumir
+label_load:Carregar
+label_unload:Descarregar
+label_slow_speed:Lento
+label_normal_speed:Normal
+label_fast_speed:Rapido
+label_fan_full_speed:Full
+label_fan_half_speed:Half
+label_rotate_ui:Rodar
+label_touchscreen_adjust:Ajustar
+label_more:Mais
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Branco
+label_black:Preto
+label_blue:Azul
+label_red:Vermelho
+label_green:Verde
+label_cyan:Turquesa
+label_yellow:Amarelo
+label_brown:Castanho
+label_gray:Cinzento
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Desconectar
+label_baudrate:BaudRate
+label_percentage:Percentagem
+label_babystep:BabyStep
+label_percentage_speed:Rapidez
+label_percentage_flow:Fluxo
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pronto
+label_busy:Em processamento, aguarde...
+label_unconnected:Nenhuma impressora conectada!
+label_disconnect_info:Agora podes controlar a impressora com o computador!
+label_loading:Carregando...
+label_power_failed:Continuar a imprimir?
+label_continue:Continuar
+label_cancel:Cancelar
+label_adjust_title:Calibracao do Touch Screen
+label_adjust_info:Por favor, clique no ponto vermelho
+label_adjust_ok:Ajustado com sucesso
+label_adjust_failed:Ajuste falhou, tente novamente
+label_warning:Aviso
+label_stop_print:Parar de imprimir?
+label_confirm:Confirme
+label_tftsd:TFT SD
+label_read_tftsd_error:Erro a ler TFT SD!
+label_tftsd_inserted:Cartao inserido!
+label_tftsd_removed:Cartao removido!
+label_u_disk:U Disk
+label_read_u_disk_error:Erro a ler U Disk!
+label_u_disk_inserted:U Disk inserido!
+label_u_disk_removed:U Disk removido!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:Erro a ler Onboard SD card!
+label_filament_sensor:Filament sensor
+label_filament_runout:Filamento runout!
+label_preheat:Aquecer
+label_preheat_both:Ambos
+label_is_pause:Nao e possível a extrusão\ndurante a impressao,\npausar a impressao?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Movimento
+label_unifiedheat:Heat/Fan
+label_cooldown:Arrefecer
+label_emergencystop:EMERGENCIA STOP
+label_touch_to_exit:Toque em qualquer lugar para sair
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wait for the hotend\ntemperature to be\nlower than %d ℃
+label_force_shut_down:Force
+label_shutting_down:Shutting down...
+label_parameter_setting:Parâmetro
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Desbloquear XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Portugues
 label_heat:Aquecer
 label_move:Mover
diff --git a/Copy to SD Card root directory to update/Language Packs/language_ru.ini b/Copy to SD Card root directory to update/Language Packs/language_ru.ini
index 926f5736bc..4ccf8f648e 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_ru.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_ru.ini	
@@ -1,8 +1,286 @@
 #### Language Code:RU
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Русский
+label_heat:Нагрев
+label_move:Движение
+label_home:Домой
+label_disable_steppers:Двигатели
+label_print:Печать
+label_extrude:Экструзия
+label_fan:Вентилятор
+label_settings:Настройки
+label_screen_settings:Экран
+label_machine_settings:Принтер
+label_feature_settings:Опции
+label_sound:Звуки
+label_touch_sound:Звуки нажатий
+label_toast_sound:Звуки инфостроки
+label_alert_sound:Предупреждения
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Выключить
+label_rgb_settings:Цвет LED
+label_rgb_off:LED выкл
+label_terminal:Терминал
+label_custom:Своё меню
+label_leveling:Стол вруч.
+label_point_1:Точка 1
+label_point_2:Точка 2
+label_point_3:Точка 3
+label_point_4:Точка 4
+label_point_5:Точка 5
+label_bed_leveling:Стол равнен.
+label_bl_complete:Выравнивание стола окончено
+label_bl_smart_fill:Отсутствующие точки\nзамера были атоматически\nзаполнены.\nЗапомните для сохраниения!
+label_bl_enable:BL: вкл
+label_bl_disable:BL: выкл
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Равнение по сетке
+label_abl_settings:Автовыравнивание
+label_abl_settings_bbl:Билинейная калибровка
+label_abl_settings_ubl:Универсальная калибровка
+label_abl_settings_ubl_save:Сохранить в ячейку
+label_abl_settings_ubl_load:Загрузить из ячейки
+label_abl_slot0:Ячейка 0
+label_abl_slot1:Ячейка 1
+label_abl_slot2:Ячейка 2
+label_abl_slot3:Ячейка 3
+label_abl_slot_eeprom:Восстановить из ячейки\nпри перезагрузке?\n(Сохранить в EEPROM)
+label_abl_z:Z затухание
+label_bltouch:BLTouch
+label_bltouch_test:BLT тест
+label_bltouch_deploy:BLT вниз
+label_bltouch_stow:BLT вверх
+label_bltouch_repeat:Точность Z
+label_z_offset:Отступ Z
+label_probe_offset:Смещение датчика
+label_home_offset:Home Offset
+label_confirmation:Вы уверены?
+label_down:Вниз
+label_up:Вверх
+label_save:Сохранить
+label_restore:Вернуть
+label_reset:Сброс
+label_default:По умолчанию
+label_clear:Очистить
+label_next:Следующий
+label_distance:Отступы
+label_invalid_value:Остутствуют правильные значения!
+label_timeout_reached:Время истекло!
+label_process_running:Идёт процесс!
+label_process_completed:Процесс завершён!
+label_process_aborted:Процесс прерван!
+label_inc:Увеличить
+label_dec:Уменьшить
+label_nozzle:Сопло
+label_bed:Стол
+label_chamber:Камера
+label_start:Начать
+label_stop:Стоп
+label_back:Назад
+label_page_up:Стр.
+label_page_down:Стр. 
+label_pause:Пауза
+label_resume:Продолжить
+label_load:Загрузка
+label_unload:Выгрузка
+label_slow_speed:Медленно
+label_normal_speed:Обычно
+label_fast_speed:Быстро
+label_fan_full_speed:Максимум
+label_fan_half_speed:50%
+label_rotate_ui:Переворот
+label_touchscreen_adjust:Калибровка
+label_more:Больше
+label_screen_info:Инфо
+label_status:Статус
+label_simulator_bg_color:Задний фон Marlin режима
+label_simulator_font_color:Передний фон Marlin режима
+label_white:Белый
+label_black:Чёрный
+label_blue:Синий
+label_red:Красный
+label_green:Зелёный
+label_cyan:Голубой
+label_yellow:Жёлтый
+label_brown:Коричневый
+label_gray:Серый
+label_orange:Оранжевый
+label_indigo:Индиго
+label_violet:Фиолетовый
+label_magenta:Маджента
+label_purple:Пурпурный
+label_lime:Лаймовый
+label_darkblue:Тёмно-синий
+label_darkgreen:Тёмно-зелёный
+label_darkgray:Тёмно-серый
+label_disconnect:Отключить
+label_baudrate:Скорость
+label_percentage:Подстройки
+label_babystep:Микрошаг Z
+label_percentage_speed:Скорость
+label_percentage_flow:Поток
+label_value_zero:Обнулить
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01мм
+label_01_mm:0.1мм
+label_1_mm:1мм
+label_5_mm:5мм
+label_10_mm:10мм
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Готов
+label_busy:Занято процессом, подождите...
+label_unconnected:Нет подключения!
+label_disconnect_info:Управление принтером через компьютер
+label_loading:Загрузка...
+label_power_failed:Продолжить печать?
+label_continue:Продолжение
+label_cancel:Отмена
+label_adjust_title:Калибровка экрана
+label_adjust_info:Нажмите на красную точку
+label_adjust_ok:Успешная калибровка
+label_adjust_failed:Неудачная калибровка, попробуйте снова
+label_warning:Внимание
+label_stop_print:Остановить печать?
+label_confirm:OK
+label_tftsd:SD экрана
+label_read_tftsd_error:Ошибка чтения SD карты!
+label_tftsd_inserted:SD карта вставлена!
+label_tftsd_removed:SD карта извлечена!
+label_u_disk:Флеш карта
+label_read_u_disk_error:Ошибка чтения флеш карты!
+label_u_disk_inserted:Флеш карта вставлена!
+label_u_disk_removed:Флеш карта извлечена!
+label_onboardsd:SD платы
+label_read_onboardsd_error:Ошибка чтения SD карты!
+label_filament_sensor:Сенсор прутка
+label_filament_runout:Пруток закончился
+label_preheat:Преднагрев
+label_preheat_both:Оба
+label_is_pause:Невозможна экструзия\nпри печати, поставить\nна паузу?
+label_auto_shut_down:Автовыключение
+label_unifiedmove:Движение
+label_unifiedheat:Нагрев
+label_cooldown:Охладить
+label_emergencystop:Экст.стоп
+label_touch_to_exit:Нажмите для возврата
+label_mainmenu:Меню
+label_wait_temp_shut_down:Дождитесь температуры\nсопла не ниже чем %d℃
+label_force_shut_down:Принудительно выкл
+label_shutting_down:Выключаю...
+label_parameter_setting:Параметры
+label_on:Вкл
+label_off:Выкл
+label_smart:Умный
+label_terminal_ack:ACK терминала (C°)
+label_invert_xaxis:Инверсия оси X
+label_invert_yaxis:Инверсия оси Y
+label_invert_zaxis:Инверсия оси Z
+label_move_speed:Скорость (X Y Z)
+label_knob_led:Подсветка энкодера
+label_knob_led_idle:Простой подсветки энкодера
+label_m0_pause:Пауза по команде M0
+label_send_start_gcode:G-код перед печатью
+label_send_end_gcode:G-код после печати
+label_send_cancel_gcode:G-код отмены печати
+label_persistent_status_info:Нагрев в инфостроке
+label_file_listmode:Файлы в режиме строк
+label_current_setting:Настройка TMC драйверов
+label_steps_setting:Настройка шагов на мм
+label_maxfeedrate:MAX скорость подачи
+label_maxacceleration:MAX ускорение
+label_acceleration:Ускорение
+label_print_acceleration:Печати
+label_retract_acceleration:Ретракта
+label_travel_acceleration:Перемещения
+label_jerk:Рывок
+label_junction_deviation:Отклонение узла
+label_bump_sensitivity:TMC чувствительность удара
+label_fwretract:M207 ретракт
+label_fwrecover:M208 восстановление ретракта
+label_lin_advance:К-фактор
+label_reset_settings_info:Все настройки будут\nсброшены по умолчанию.\nПродолжить?
+label_reset_settings_done:Успешный сброс настроек\nэкрана. Для полного\nвступления в силу,\nперегрузите устройство.
+label_info:Информация
+label_lcd_brightness:Яркость LCD
+label_lcd_brightness_dim:Регулировка яркости LCD
+label_lcd_dim_idle_timer:Время до гашения LCD
+label_5_seconds:5 сек.
+label_10_seconds:10 сек.
+label_30_seconds:30 сек.
+label_60_seconds:1 мин.
+label_120_seconds:2 мин.
+label_300_seconds:5 мин.
+label_custom_seconds:Своё
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin на весь экран
+label_plr_en:Работа после потери питания
+label_setting_save:Сохранить настройки
+label_setting_reset:Сбросить настройки
+label_setting_restore:Восстановить настройки
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Сохранить настройки\nпринтера в EEPROM?
+label_eeprom_restore_info:Загрузить настройки\nиз EEPROM?
+label_eeprom_reset_info:Сбрость EEPROM настройки\nпринтера на начальные?
+label_retract_feedrate:Скорость
+label_retract_length:Длина
+label_retract_swap_length:Длина при смене сопла
+label_retract_z_lift:Подъём по Z
+label_retract_auto:Авто FW ретракт
+label_recover_feedrate:Скорость
+label_swap_recover_feedrate:Скорость при смене сопла
+label_recover_length:Длина
+label_swap_recover_length:Длина при смене сопла
+label_start_print:Начать печать:\n %s?
+label_ack_notification:ACK стиль уведомления
+label_leveling_edge_distance:Отступы от краёв стола
+label_xy_unlock:Моторы выкл
+label_tuning:Наладка
+label_pid:PID
+label_pid_title:PID автонастройка
+label_pid_start_info:Сейчас будет запущена PID\nавтонастройка, это займёт\nнекоторое время. Продолжить?
+label_pid_start_info_2:Автонастройка PID в работе!
+label_pid_start_info_3:Не трогайте экран до\nокончания настройки\n(загориться зелёным LED)!
+label_tune_extruder:Настройка шагов
+label_tune_ext_extrude_100:100mm экст.
+label_tune_ext_temp:Настройка экструдера/Нагрев
+label_tune_ext_templow:Требуемая температура\nслишком низкая!\nМинимальная температура: %d℃
+label_tune_ext_desiredval:Температура еще не достигла требуемого значения
+label_tune_ext_mark120mm:Отметьте 120 мм на филаменте\nНажмите '%s' по говности\nИзмерьте полученную длину/nпосле экструдирования
+label_tune_ext_heatoff:Отключить нагрев?
+label_tune_ext_adj_esteps:Подстройка E-шагов
+label_tune_ext_esteps_saved:E-шаги установлены!\nНе забудьте сохранить\nих в EEPROM\nНовое значение: %0.2f
+label_tune_ext_measured:Оставшаяся длина:
+label_tune_ext_old_estep:Старые E-шаги: %0.2f
+label_tune_ext_new_estep:Новые E-шаги: %0.2f
+label_connection_settings:Соединение
+label_offset_tool:Смещение 2-го сопла
+label_hybrid_threshold:TMC гибридный порог
+label_notifications:Уведомления
+label_mesh_editor:Сетка ред.
+label_mesh_tuner:Сетка настр.
+label_case_light:Case light
 label_language:Русский
 label_heat:Нагрев
 label_move:Движение
diff --git a/Copy to SD Card root directory to update/Language Packs/language_sk.ini b/Copy to SD Card root directory to update/Language Packs/language_sk.ini
index ffd62d08c0..4e494e65cf 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_sk.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_sk.ini	
@@ -1,8 +1,286 @@
 #### Language Code:SK
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Slovensky
+label_heat:Teplota
+label_move:Posunúť
+label_home:Domov
+label_disable_steppers:Disarm All
+label_print:Tlačiť
+label_extrude:Extrúder
+label_fan:Ofuk
+label_settings:Nastavenia
+label_screen_settings:Obrazovka
+label_machine_settings:Tlačiareň
+label_feature_settings:Funkcie
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Vypnúť
+label_rgb_settings:Farba LED
+label_rgb_off:Vypnúť LED
+label_terminal:Terminál
+label_custom:Vlastné
+label_leveling:Vyrovnanie
+label_point_1:Bod 1
+label_point_2:Bod 2
+label_point_3:Bod 3
+label_point_4:Bod 4
+label_point_5:Bod 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Vystrčiť
+label_bltouch_stow:Stiahnuť
+label_bltouch_repeat:Opakovať
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Uložiť
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Pridať
+label_dec:Ubrať
+label_nozzle:Tryska
+label_bed:Podložka
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Naspäť
+label_page_up:Ďalej
+label_page_down:Naspäť
+label_pause:Pauza
+label_resume:Pokračovať
+label_load:Zaviesť
+label_unload:Vysunúť
+label_slow_speed:Pomaly
+label_normal_speed:Normálne
+label_fast_speed:Rýchlo
+label_fan_full_speed:Naplno
+label_fan_half_speed:Polovičná
+label_rotate_ui:Otočiť
+label_touchscreen_adjust:Kalibrácia
+label_more:Viacej
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Biela
+label_black:Čierna
+label_blue:Modrá
+label_red:Červená
+label_green:Zelená
+label_cyan:Tyrkysová
+label_yellow:Žltá
+label_brown:Hnedá
+label_gray:Šedá
+label_orange:Oranžová
+label_indigo:Indigo
+label_violet:Fialová
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Odpojiť
+label_baudrate:BaudRate
+label_percentage:Percentá
+label_babystep:BabyStep
+label_percentage_speed:Rýchlosť
+label_percentage_flow:Prietok
+label_value_zero:Vypnúť
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pripravená
+label_busy:Počkajte prosím...
+label_unconnected:Tlačiareň odpojená!
+label_disconnect_info:Teraz môžete tlačiareň ovládať z počítača!
+label_loading:Načítavam...
+label_power_failed:Pokračovať v tlači?
+label_continue:Pokračovať
+label_cancel:Zrušiť
+label_adjust_title:Kalibrácia
+label_adjust_info:Dotknite sa postupne všetkých bodov
+label_adjust_ok:Kalibrácia úspešná
+label_adjust_failed:Kalibrácia zlyhala, opakovať
+label_warning:Varovanie
+label_stop_print:Zastaviť tlač?
+label_confirm:Potvrdiť
+label_tftsd:TFT SD
+label_read_tftsd_error:Chyba pri načítaní SD karty!
+label_tftsd_inserted:SD karta vložená!
+label_tftsd_removed:SD karta odstránená!
+label_u_disk:USB kľúč
+label_read_u_disk_error:Chyba pri načítaní USB kľúča!
+label_u_disk_inserted:USB kľúč vložený!
+label_u_disk_removed:USB disk odstránený!
+label_onboardsd:SD karta na doske
+label_read_onboardsd_error:Chyba pri načítaní SD karty na doske!
+label_filament_sensor:Filament senzor
+label_filament_runout:Chýba filament!
+label_preheat:Nahriať
+label_preheat_both:Tryska/Podložka
+label_is_pause:Nemožno extrudovať\npočas tlače,\npozastaviť tlač?
+label_auto_shut_down:Auto vyp.
+label_unifiedmove:Pohyb
+label_unifiedheat:Nahriať
+label_cooldown:Ochladiť
+label_emergencystop:STOP
+label_touch_to_exit:Dotknite sa obrazovky pre ukončenie
+label_mainmenu:Menu
+label_wait_temp_shut_down:Počkať na teplotu\ntrysky menej ako %d℃
+label_force_shut_down:Vynútené vypnutie
+label_shutting_down:Vypínanie...
+label_parameter_setting:Parametre
+label_on:ZAP
+label_off:VYP
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invertovať os X
+label_invert_yaxis:Invertovať os Y
+label_invert_zaxis:Invertovať os Z
+label_move_speed:Rýchlosť pohybu XYZ
+label_knob_led:LED otočného tlačidla
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Pauza príkazom M0
+label_send_start_gcode:Začiatočný Gcode
+label_send_end_gcode:Koncový Gcode
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Trvalé info o stave
+label_file_listmode:Zobraziť súbory ako zoznam
+label_current_setting:Prúd ovládača (mA)
+label_steps_setting:Počet krokov na MM
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Maximálna akcelerácia
+label_acceleration:Akcelerácia
+label_print_acceleration:Akcelerácia pri tlači
+label_retract_acceleration:Akcelerácia retrakcie
+label_travel_acceleration:Akcelerácia presunu
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump citlivosť
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Resetovať všetky nastavenia.
+label_reset_settings_done:Reset všetkých nastavení\nvykonaný. Pre správne\nfungovanie, prosím,\nreštartovať zariadenie.
+label_info:Info
+label_lcd_brightness:Jas LCD
+label_lcd_brightness_dim:Zníženie jasu LCD
+label_lcd_dim_idle_timer:Zníženie jasu LCD po
+label_5_seconds:5 sek.
+label_10_seconds:10 sek.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Odomknite XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Slovensky
 label_heat:Teplota
 label_move:Posunúť
diff --git a/Copy to SD Card root directory to update/Language Packs/language_sl.ini b/Copy to SD Card root directory to update/Language Packs/language_sl.ini
index 0bcec9a8fd..b4de290e0e 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_sl.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_sl.ini	
@@ -1,8 +1,286 @@
 #### Language Code:SL
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Slovenski
+label_heat:Gretje
+label_move:Pomik
+label_home:Domov
+label_disable_steppers:Disarm All
+label_print:Tisk
+label_extrude:Filament
+label_fan:Hlajenje
+label_settings:Nastavitve
+label_screen_settings:Zaslon
+label_machine_settings:Naprava
+label_feature_settings:Funkcije
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Izklop
+label_rgb_settings:Barva LED
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Po meri
+label_leveling:Niveliraj
+label_point_1:Točka 1
+label_point_2:Točka 2
+label_point_3:Točka 3
+label_point_4:Točka 4
+label_point_5:Točka 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Postavi
+label_bltouch_stow:Skrij
+label_bltouch_repeat:Ponovi
+label_z_offset:Z odmik
+label_probe_offset:Odmik sonde
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Shrani
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Več
+label_dec:Manj
+label_nozzle:Šoba
+label_bed:Miza
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Nazaj
+label_page_up:Stran gor
+label_page_down:Stran dol
+label_pause:Pavza
+label_resume:Nadaljuj
+label_load:Naloži
+label_unload:Izvrzi
+label_slow_speed:Počasi
+label_normal_speed:Normalo
+label_fast_speed:Hitro
+label_fan_full_speed:100% moč
+label_fan_half_speed:50% moč
+label_rotate_ui:Obrni UI
+label_touchscreen_adjust:Umeri
+label_more:Več
+label_screen_info:Info
+label_status:Info
+label_simulator_bg_color:Barva ozadja Marlin simulatorja
+label_simulator_font_color:Barva pisave Marlin simulatorja
+label_white:Belo
+label_black:Črno
+label_blue:Mordo
+label_red:Rdeče
+label_green:Zeleno
+label_cyan:Modrozelena
+label_yellow:Rumena
+label_brown:Rjana
+label_gray:Siva
+label_orange:Oranžna
+label_indigo:Indigo
+label_violet:Vijolična
+label_magenta:Magenta
+label_purple:Temno vijolična
+label_lime:Limeta
+label_darkblue:Temno morda
+label_darkgreen:Temno zelena
+label_darkgray:Temno siva
+label_disconnect:Odklopi
+label_baudrate:Baud hitr.
+label_percentage:Procent
+label_babystep:BabyStep
+label_percentage_speed:Hitrost
+label_percentage_flow:Pretok
+label_value_zero:Nič
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pripravljen
+label_busy:Zaseden s procesiranjem, prosim počakaj...
+label_unconnected:Nobenega tiskalnika priključenega!
+label_disconnect_info:Zdaj lahko upravljaš tiskalnik z računalnikom!
+label_loading:Nalagam...
+label_power_failed:Nadaljuj s tiskanjem?
+label_continue:Nadaljuj
+label_cancel:Prekliči
+label_adjust_title:Kalibracija zaslona na dotik
+label_adjust_info:Pritisni na rdečo piko
+label_adjust_ok:Nastavitev uspešna
+label_adjust_failed:Nastavitev neuspešna, prosim poskusi ponovno
+label_warning:Opozorilo
+label_stop_print:Ustavim tisk?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:Napaka branja TFT SD kartice!
+label_tftsd_inserted:Kartica vstavljena!
+label_tftsd_removed:Kartica odstranjena!
+label_u_disk:USB disk
+label_read_u_disk_error:Napaka branja USB diska!
+label_u_disk_inserted:USB disk vstavljen!
+label_u_disk_removed:USB disk odstranjen!
+label_onboardsd:SKR SD
+label_read_onboardsd_error:Napaka branja SKR SD kartice!
+label_filament_sensor:Senzor filamenta
+label_filament_runout:Ni več filamenta!
+label_preheat:Predgretje
+label_preheat_both:Oboje
+label_is_pause:Ne morem estrudirat\nmed tiskanjem.\nPavziram tisk?
+label_auto_shut_down:Samodejni izklop
+label_unifiedmove:Vodenje
+label_unifiedheat:Gretje
+label_cooldown:Ohlajanje
+label_emergencystop:EM. STOP
+label_touch_to_exit:Klikni kjerkoli za izhod
+label_mainmenu:Meni
+label_wait_temp_shut_down:Čakam, da se šoba\nohladi pod %d °C
+label_force_shut_down:Prisilni izklop
+label_shutting_down:Ugašam...
+label_parameter_setting:Parametri
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Pokaži ACK v terminalu
+label_invert_xaxis:Invertiraj X os
+label_invert_yaxis:Invertiraj Y os
+label_invert_zaxis:Invertiraj Z os
+label_move_speed:Hitr. pomika (X Y Z)
+label_knob_led:LED enkoder gumba
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Pavza (M0 ukaz)
+label_send_start_gcode:Zaženi startno G-kodo
+label_send_end_gcode:Zaženi končno G-kodo
+label_send_cancel_gcode:Zaženi G-kodo preklica
+label_persistent_status_info:Stalno prikazuj status
+label_file_listmode:Prikaz datotek v seznamu
+label_current_setting:Tok driverja mot. (mA)
+label_steps_setting:Št. korakov na MM
+label_maxfeedrate:Max hitr. dovajanja fil.
+label_maxacceleration:Max pospešek
+label_acceleration:Pospešek
+label_print_acceleration:Pospešek tiska
+label_retract_acceleration:Pospešek privleka fil.
+label_travel_acceleration:Pospešek pomika
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC občutljivost trka
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset vseh nastavitev na\nprivzete vrednosti?
+label_reset_settings_done:Reset vseh nastavitev\nuspešna.\nPonovno zaženi napravo.
+label_info:Info
+label_lcd_brightness:Svetilnost LCD
+label_lcd_brightness_dim:Zatemnitev LCD
+label_lcd_dim_idle_timer:Zatemnitev po času
+label_5_seconds:5 sek.
+label_10_seconds:10 sek.
+label_30_seconds:30 sek.
+label_60_seconds:1 min.
+label_120_seconds:2 min.
+label_300_seconds:5 min.
+label_custom_seconds:Po meri
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin čez cel zaslon
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset nastavitev
+label_setting_restore:Obnovi nastavitve
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Shrani nastavitve tiskalnika\nv EEPROM?
+label_eeprom_restore_info:Naloži nastavitve iz\nEEPROM-a?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start tiska:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Slovenski
 label_heat:Gretje
 label_move:Pomik
diff --git a/Copy to SD Card root directory to update/Language Packs/language_tc.ini b/Copy to SD Card root directory to update/Language Packs/language_tc.ini
index 8995082308..80eeae72c8 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_tc.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_tc.ini	
@@ -1,8 +1,286 @@
 #### Language Code:TC
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:正體中文
+label_heat:加熱
+label_move:移動
+label_home:回原點
+label_disable_steppers:解鎖電機
+label_print:列印
+label_extrude:擠出
+label_fan:風扇
+label_settings:設定
+label_screen_settings:螢幕設定
+label_machine_settings:機器設定
+label_feature_settings:功能設定
+label_sound:聲音
+label_touch_sound:按鈕聲音
+label_toast_sound:Toast 提示聲音
+label_alert_sound:彈窗和提示聲音
+label_preheatdone_sound:Preheat done notification
+label_shut_down:關閉電源
+label_rgb_settings:燈光顏色
+label_rgb_off:關閉燈光
+label_terminal:終端
+label_custom:自定義
+label_leveling:調平
+label_point_1:第一點
+label_point_2:第二點
+label_point_3:第三點
+label_point_4:第四點
+label_point_5:第五點
+label_bed_leveling:Bed Level
+label_bl_complete:平臺調平完成!
+label_bl_smart_fill:部分點未探測，已被自動填充，需要手動保存!
+label_bl_enable:BL:已開啟
+label_bl_disable:BL:已關閉
+label_abl:自動調平
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch 
+label_bltouch_test:BLTouch檢測
+label_bltouch_deploy:探針彈出
+label_bltouch_stow:探針收回
+label_bltouch_repeat:精度測試
+label_z_offset:Z軸偏移
+label_probe_offset:探針偏移
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:降低
+label_up:抬升
+label_save:儲存設定
+label_restore:恢復
+label_reset:重設
+label_default:默認
+label_clear:Clear
+label_next:下一個
+label_distance:距離
+label_invalid_value:沒有有效的條件!
+label_timeout_reached:已超時!
+label_process_running:正在運行,請稍後
+label_process_completed:處理已完成!
+label_process_aborted:處理已被中斷!
+label_inc:增加
+label_dec:減少
+label_nozzle:噴頭
+label_bed:熱床
+label_chamber:機殼
+label_start:開始
+label_stop:停止
+label_back:返回
+label_page_up:上一頁
+label_page_down:下一頁
+label_pause:暫停
+label_resume:繼續
+label_load:進料
+label_unload:退料
+label_slow_speed:慢速
+label_normal_speed:常速
+label_fast_speed:快速
+label_fan_full_speed:全速
+label_fan_half_speed:半速
+label_rotate_ui:顯示方向
+label_touchscreen_adjust:觸控校正
+label_more:更多
+label_screen_info:關於
+label_status:狀態
+label_simulator_bg_color:Marlin模式背景顏色
+label_simulator_font_color:Marlin模式字體顏色
+label_white:白
+label_black:黑
+label_blue:藍
+label_red:紅
+label_green:綠
+label_cyan:青
+label_yellow:黃
+label_brown:棕
+label_gray:灰
+label_orange:橘
+label_indigo:靛藍
+label_violet:藍紫
+label_magenta:桃紅
+label_purple:紫
+label_lime:萊姆
+label_darkblue:暗藍
+label_darkgreen:暗綠
+label_darkgray:深灰
+label_disconnect:中斷連線
+label_baudrate:串列傳輸速率
+label_percentage:百分比
+label_babystep:Z軸微調
+label_percentage_speed:速度百分比
+label_percentage_flow:流量百分比
+label_value_zero:歸零
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:已準備好
+label_busy:系統繁忙請稍等
+label_unconnected:尚未連線到主機板
+label_disconnect_info:電腦控制模式
+label_loading:讀取中
+label_power_failed:要繼續列印嗎？
+label_continue:繼續
+label_cancel:取消
+label_adjust_title:觸控校正
+label_adjust_info:點擊紅點
+label_adjust_ok:校正成功
+label_adjust_failed:校正失敗
+label_warning:警告
+label_stop_print:要停止列印嗎？
+label_confirm:確定
+label_tftsd:SD卡
+label_read_tftsd_error:SD卡讀取失敗
+label_tftsd_inserted:偵測到SD卡
+label_tftsd_removed:SD卡已拔出
+label_u_disk:隨身碟
+label_read_u_disk_error:隨身碟讀取失敗
+label_u_disk_inserted:偵測到隨身碟
+label_u_disk_removed:隨身碟已拔出
+label_onboardsd:主機板插槽的SD卡
+label_read_onboardsd_error:主機板插槽的SD卡讀取失敗
+label_filament_sensor:耗材感應器
+label_filament_runout:沒偵測到耗材
+label_preheat:預熱
+label_preheat_both:全部
+label_is_pause:列印時無法擠出耗材，要暫停列印嗎？
+label_auto_shut_down:自動關機
+label_unifiedmove:運動
+label_unifiedheat:溫度
+label_cooldown:冷卻
+label_emergencystop:立刻停止
+label_touch_to_exit:觸控任意位置退出頁面
+label_mainmenu:選單
+label_wait_temp_shut_down:噴頭降溫中，直到%d ℃時自動關機
+label_force_shut_down:強制關機
+label_shutting_down:關機中
+label_parameter_setting:參數設定
+label_on:開啟
+label_off:關閉
+label_smart:自動
+label_terminal_ack:在G-code終端顯示溫度
+label_invert_xaxis:X軸反向運轉
+label_invert_yaxis:Y軸反向運轉
+label_invert_zaxis:Z軸反向運轉
+label_move_speed:移動速度(X Y Z)
+label_knob_led:旋鈕LED顏色
+label_knob_led_idle:旋鈕LED自動睡眠
+label_m0_pause:M0暫停
+label_send_start_gcode:執行起始G-code
+label_send_end_gcode:執行結尾G-code
+label_send_cancel_gcode:中斷執行G-code
+label_persistent_status_info:頂部溫度訊息
+label_file_listmode:文件預覽列表模式
+label_current_setting:驅動晶片電流設定 (mA)
+label_steps_setting:電機每毫米步數Steps/mm
+label_maxfeedrate:最大移動速度
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:列印加速度
+label_retract_acceleration:回抽加速度
+label_travel_acceleration:空跑加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:堵料檢測靈敏度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:所有設定都會恢復預設值，確定嗎?
+label_reset_settings_done:重設成功，請重新開機
+label_info:提示
+label_lcd_brightness:螢幕亮度
+label_lcd_brightness_dim:睡眠狀態螢幕亮度
+label_lcd_dim_idle_timer:螢幕進入睡眠時間
+label_5_seconds:5秒.
+label_10_seconds:10秒.
+label_30_seconds:30秒.
+label_60_seconds:1分鐘
+label_120_seconds:2分鐘
+label_300_seconds:5分鐘
+label_custom_seconds:自訂
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:全螢幕Marlin模式
+label_plr_en:断电续打
+label_setting_save:保存设置
+label_setting_reset:重置设置
+label_setting_restore:保存设置
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:是否保存打印机设置到EEPROM?
+label_eeprom_restore_info:是否从EEPROM加载设置?
+label_eeprom_reset_info:重置EEPROM到出厂设置?
+label_retract_feedrate:FW回抽速度
+label_retract_length:FW回抽长度
+label_retract_swap_length:换料时回抽的长度
+label_retract_z_lift:回抽时Z轴抬升的高度
+label_retract_auto:FW自动回抽
+label_recover_feedrate:FW挤出速度
+label_swap_recover_feedrate:换料时挤出的速度
+label_recover_length:额外挤出的长度
+label_swap_recover_length:换料时额外挤出的长度
+label_start_print:是否开始打印:\n %s?
+label_ack_notification:ACK 弹窗类型
+label_leveling_edge_distance:手动调平边沿距离
+label_xy_unlock:解锁XY
+label_tuning:调整
+label_pid:PID
+label_pid_title:PID自动整定
+label_pid_start_info:开始PID自动整定,需要几分钟来完成,是否继续?
+label_pid_start_info_2:PID 正在自动整定中!
+label_pid_start_info_3:不要操作触控屏直到整定完成!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:挤出100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:连接
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:正體中文
 label_heat:加熱
 label_move:移動
diff --git a/Copy to SD Card root directory to update/Language Packs/language_tr.ini b/Copy to SD Card root directory to update/Language Packs/language_tr.ini
index 68b47631ac..b7b2bd0dfd 100755
--- a/Copy to SD Card root directory to update/Language Packs/language_tr.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_tr.ini	
@@ -1,8 +1,286 @@
 #### Language Code:TR
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
+label_language:Türkçe
+label_heat:Isıt
+label_move:Hareket
+label_home:Sıfırla
+label_disable_steppers:Disarm All
+label_print:Yazdır
+label_extrude:Filament
+label_fan:Fan
+label_settings:Ayarlar
+label_screen_settings:Ekran
+label_machine_settings:Makine
+label_feature_settings:Özellik
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Kapat
+label_rgb_settings:LED Rengi
+label_rgb_off:LED'i Kapat
+label_terminal:Terminal
+label_custom:Diğer
+label_leveling:Kalibrasyon
+label_point_1:1.Nokta
+label_point_2:2.Nokta
+label_point_3:3.Nokta
+label_point_4:4.Nokta
+label_point_5:5.Nokta
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Deploy
+label_bltouch_stow:Stow
+label_bltouch_repeat:Repeat
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Kaydet
+label_restore:Restore
+label_reset:Sıfırla
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Arttır
+label_dec:Azalt
+label_nozzle:Nozül
+label_bed:Tabla
+label_chamber:Chamber
+label_start:Start
+label_stop:Durdur
+label_back:Geri
+label_page_up:Yukarı
+label_page_down:Aşağı
+label_pause:Duraklat
+label_resume:Devam
+label_load:Yükle
+label_unload:Çıkar
+label_slow_speed:Yavaş
+label_normal_speed:Normal
+label_fast_speed:Hızlı
+label_fan_full_speed:Tam
+label_fan_half_speed:Yarım
+label_rotate_ui:Döndür
+label_touchscreen_adjust:Kalibre
+label_more:Daha
+label_screen_info:Bilgi
+label_status:Bilgi
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Beyaz
+label_black:Siyah
+label_blue:Mavi
+label_red:Kırmızı
+label_green:Yeşil
+label_cyan:Camgöbeği
+label_yellow:Sarı
+label_brown:Kahverengi
+label_gray:Gri
+label_orange:Turuncu
+label_indigo:Çivit Mavisi
+label_violet:Menekşe
+label_magenta:Eflatun
+label_purple:Mor
+label_lime:Çim Rengi
+label_darkblue:Koyu Mavi
+label_darkgreen:Koyu Yeşil
+label_darkgray:Koyu Gri
+label_disconnect:Bağlt. Kes
+label_baudrate:BaudRate
+label_percentage:Yüzde
+label_babystep:BabyStep
+label_percentage_speed:Hız
+label_percentage_flow:Akış
+label_value_zero:Sıfır
+label_1_degree:1°C
+label_5_degree:5°C
+label_10_degree:10°C
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%
+label_ready:Hazır
+label_busy:İşlem devam ediyor, lütfen bekleyiniz...
+label_unconnected:Yazıcı bağlı değil!
+label_disconnect_info:Artık yazıcıyı\nbilgisayarınızdan kontrol\nedebilirsiniz!
+label_loading:Yükleniyor...
+label_power_failed:Yazdırmaya devam edilsin mi?
+label_continue:Devam et
+label_cancel:İptal
+label_adjust_title:Dokunmatik Ekran Kalibrasyonu
+label_adjust_info:Lütfen kırmızı noktaya\ntıklayın
+label_adjust_ok:Kalibrasyon başarılı.
+label_adjust_failed:Kalibrasyon başarısız,\nlütfen tekrar deneyiniz.
+label_warning:Uyarı
+label_stop_print:Baskı durdurulsun mu?
+label_confirm:Tamam
+label_tftsd:SD Kart
+label_read_tftsd_error:SD kart okunamadı!
+label_tftsd_inserted:SD Kart Takıldı!
+label_tftsd_removed:SD Kart Çıkarıldı!
+label_u_disk:USB Disk
+label_read_u_disk_error:USB disk okunamadı!
+label_u_disk_inserted:USB Disk Takıldı!
+label_u_disk_removed:USB Disk Çıkarıldı!
+label_onboardsd:Dahili SD
+label_read_onboardsd_error:Dahili SD Okunamadı!
+label_filament_sensor:Filament sensörü
+label_filament_runout:Filament Bitti!
+label_preheat:Ön Isıtma
+label_preheat_both:Birlikte
+label_is_pause:Ekstrüde edilemiyor\nyazdırırken,\nNbaskı duraklatılsın mı?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Hareket
+label_unifiedheat:Isıtma/Fan
+label_cooldown:Soğutma
+label_emergencystop:AcilDurdur
+label_touch_to_exit:Çıkmak için herhangi bir yere dokunun
+label_mainmenu:Menü
+label_wait_temp_shut_down:Wait for the hotend\ntemperature to be\nlower than %d℃
+label_force_shut_down:Zorlamak
+label_shutting_down:Kapatılıyor...
+label_parameter_setting:Parametre Ayarları
+label_on:Açık
+label_off:Kapalı
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:X Eksenini Tersine Çevir
+label_invert_yaxis:Y Eksenini Tersine Çevir
+label_invert_zaxis:Z Eksenini Tersine Çevir
+label_move_speed:Hareket Hızı(X Y Z)
+label_knob_led:Döner Düğme LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Gcode'u iptal et
+label_persistent_status_info:Dosyaları Liste Şeklinde
+label_file_listmode:Dosya Görüntüleyici Liste Modu
+label_current_setting:Sürücü Akımı (mA)
+label_steps_setting:MM başına adım sayısı
+label_maxfeedrate:Maks. İlerleme Hızı
+label_maxacceleration:Maks. İvmelenme
+label_acceleration:İvmelenme
+label_print_acceleration:Baskı İvmelenmesi
+label_retract_acceleration:Geriçekme İvmelenmesi
+label_travel_acceleration:Gezinti İvmelenmesi
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC çarpma hassasiyeti
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Tüm ayarlar varsayılana\nsıfırlanacak değerler.\nDevam edilsin mi?
+label_reset_settings_done:Tüm ayarları başarıyla\nsıfırlama tamamlandı. Tam\nolarak etkili olması için\nlütfen cihazı yeniden\nbaşlatın.
+label_info:Bilgi
+label_lcd_brightness:Ekran Parlaklığı
+label_lcd_brightness_dim:Ekran Parlaklığı Kısılma Oranı
+label_lcd_dim_idle_timer:Ekran Parlaklığı Kısılma Süresi
+label_5_seconds:5 Sn.
+label_10_seconds:10 Sn.
+label_30_seconds:30 Sn.
+label_60_seconds:1 Dak.
+label_120_seconds:2 Dak.
+label_300_seconds:5 Dak.
+label_custom_seconds:Kişisel
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
 label_language:Türkçe
 label_heat:Isıt
 label_move:Hareket
diff --git a/Copy to SD Card root directory to update/Language Packs/language_uk.ini b/Copy to SD Card root directory to update/Language Packs/language_uk.ini
index 343d638f4e..1a44b47dfb 100644
--- a/Copy to SD Card root directory to update/Language Packs/language_uk.ini	
+++ b/Copy to SD Card root directory to update/Language Packs/language_uk.ini	
@@ -1,5 +1,5 @@
 #### Language Code:UK
-## Language Version:20201007
+## Language Version:20201115
 ## Maximum byte per keyword is 250 Bytes.
 ## Escape characters are not supported except newline '\n'
 
diff --git a/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/Language Packs/language_nl.ini b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/Language Packs/language_nl.ini
new file mode 100755
index 0000000000..6c6dd813a7
--- /dev/null
+++ b/Copy to SD Card root directory to update/THEME_Unified Menu Material theme/Language Packs/language_nl.ini	
@@ -0,0 +1,292 @@
+#### Language Code:NL
+## Language Version:20201115
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Dutch
+label_heat:Verwarm
+label_move:Verplaats
+label_home:Thuis
+label_disable_steppers:Disarm All
+label_print:Print
+label_extrude:Extrudeer
+label_fan:Ventilator
+label_settings:Instellingen
+label_screen_settings:Scherm
+label_machine_settings:Machine
+label_feature_settings:Kenmerk
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_preheatdone_sound:Preheat done notification
+label_shut_down:Uitschakelen
+label_rgb_settings:LED Kleur
+label_rgb_off:LED Uit
+label_terminal:Terminal
+label_custom:Aangepast
+label_leveling:Nivelleren
+label_point_1:Punt 1
+label_point_2:Punt 2
+label_point_3:Punt 3
+label_point_4:Punt 4
+label_point_5:Punt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling voltooid
+label_bl_smart_fill:Missende probe punten\nzijn slim opgevuld.\n \nNote: Vergeet niet op te slaan!
+label_bl_enable:BL: aan
+label_bl_disable:BL: uit
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Sla op naar sleuf
+label_abl_settings_ubl_load:Laad van sleuf
+label_abl_slot0:Sleuf 0
+label_abl_slot1:Sleuf 1
+label_abl_slot2:Sleuf 2
+label_abl_slot3:Sleuf 3
+label_abl_slot_eeprom:Onthoud sleuf voor\nvolgende reboot?\n(sla op in EEPROM)
+label_abl_z:Z vervagen
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Gebruiken
+label_bltouch_stow:Inzetten
+label_bltouch_repeat:Herhaal
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_home_offset:Home Offset
+label_confirmation:Weet u het zeker?
+label_down:Omlaag
+label_up:Omhoog
+label_save:Bewaren
+label_restore:Herstellen
+label_reset:Reset
+label_default:Standaard
+label_clear:Clear
+label_next:Volgende
+label_distance:Afstand
+label_invalid_value:Geen correcte waarde/s voorzien!
+label_timeout_reached:Time-out bereikt!
+label_process_running:Process bezig!
+label_process_completed:Process voltooid!
+label_process_aborted:Process geannuleerd!
+label_inc:Verhogen
+label_dec:Verlagen
+label_nozzle:Spuitneus
+label_bed:Verwarmd bed
+label_chamber:Kamer
+label_start:Start
+label_stop:Stop
+label_back:Terug
+label_page_up:Blz omhoog
+label_page_down:Blz omlaag
+label_pause:Pauze
+label_resume:Hervatten
+label_load:Laden
+label_unload:Lossen
+label_load_unload:Load/Unload
+label_load_unload_short:(Un)Load
+label_slow_speed:Traag
+label_normal_speed:Normaal
+label_fast_speed:Snel
+label_fan_full_speed:Volledig
+label_fan_half_speed:Half
+label_rotate_ui:Draai UI
+label_touchscreen_adjust:TSC Aanpassen
+label_more:Meer
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator achtergrond kleur
+label_simulator_font_color:Marlin simulator tekst kleur
+label_white:Wit
+label_black:Zwart
+label_blue:Blauw
+label_red:Rood
+label_green:Groen
+label_cyan:Cyaan
+label_yellow:Geel
+label_brown:Bruin
+label_gray:Grijs
+label_orange:Oranje
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Loskoppelen
+label_baudrate:Baudsnelheid
+label_percentage:Percentage
+label_babystep:BabyStap
+label_percentage_speed:Snelheid
+label_percentage_flow:Stromen
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Gereed
+label_busy:In verwerking ,wacht aub...
+label_unconnected:Geen printer gekoppeld!
+label_disconnect_info:De printer kan nu door de computer bestuurd worden!
+label_loading:Opladen...
+label_power_failed:Verder met printen?
+label_continue:Verder
+label_cancel:Afbreken
+label_adjust_title:Touch Screen Calibratie
+label_adjust_info:Klik op de rode punt
+label_adjust_ok:Calibratie Gelukt
+label_adjust_failed:Calibratie Mislukt, Probeer Opnieuw aub
+label_warning:Waarschuwing
+label_stop_print:Stop afdruk?
+label_confirm:Bevestig
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SD leesfout!
+label_tftsd_inserted:Kaart geplaatst!
+label_tftsd_removed:Kaart verwijdert!
+label_u_disk:U Disk
+label_read_u_disk_error:U Disk Leesfout!
+label_u_disk_inserted:U Disk geplaatst!
+label_u_disk_removed:U Disk verwijdert!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:Onboard SD-kaart leesfout!
+label_filament_sensor:Filament sensor
+label_filament_runout:filament op!
+label_preheat:Voorverwarmen
+label_preheat_both:Beide
+label_is_pause:Kan niet extruderen\ntijdens printen,\nPauzeer printen?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Beweging
+label_unifiedheat:Verwarm/Ventilator
+label_cooldown:Afkoelen
+label_emergencystop:NOODSTOP
+label_touch_to_exit:Aanraken om te verlaten
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wacht tot de temperatuur\nvan de spuitkop\nlager dan %d℃ is
+label_force_shut_down:Forceer Afsluiten
+label_shutting_down:Afsluiten...
+label_parameter_setting:Parameter
+label_on:AAN
+label_off:UIT
+label_smart:SLIM
+label_terminal_ack:Laat ACK in Terminal zien
+label_invert_xaxis:Inverteer X Axis
+label_invert_yaxis:Inverteer Y Axis
+label_invert_zaxis:Inverteer Z Axis
+label_move_speed:Bewegingssnelheid(X Y Z)
+label_knob_led:Draaiknop LED
+label_knob_led_idle:Draaiknop LED inactief
+label_m0_pause:Gepauseerd door M0 commando
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Aanhoudende statusinfo
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver stroom (mA)
+label_steps_setting:Stappen permm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleratie
+label_acceleration:Acceleratie
+label_print_acceleration:Afdruk Acceleratie
+label_retract_acceleration:Retract Acceleratie
+label_travel_acceleration:Travel Acceleratie
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitiviteit
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset alle instellingen \naar de standaard waardes?
+label_reset_settings_done:Reset van alle instellingen\nis succesvol gelukt.\nHerstart alstublieft het apparaat.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset instellingen
+label_setting_restore:Herstel instellingen
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Sla printer instellingen\nop naar EEPROM?
+label_eeprom_restore_info:Herlaad instellingen van \nde EEPROM?
+label_eeprom_reset_info:Reset EEPROM naar de standaard printer instellingen?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start afdruk:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Ontgrendel XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune zal starten.\nDit kan een paar minuten duren.\nDoorgaan?
+label_pid_start_info_2:PID autotune is bezig!
+label_pid_start_info_3:Raak het scherm NIET aan totdat deze klaar is (groene LED aan)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connecties
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
+<<<<<<< HEAD:Copy to SD Card root directory to update/THEME_Unified Menu Material theme/Language Packs/language_nl.ini
+=======
+label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by.
+label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by.
+label_heaters_on:Some heaters are still ON.\nDo you want to stop them?
+>>>>>>> upstream/master:Copy to SD Card root directory to update/Language Packs/language_du.ini
+
diff --git a/Copy to SD Card root directory to update/config.ini b/Copy to SD Card root directory to update/config.ini
index c49636d4cb..8c6eb88732 100755
--- a/Copy to SD Card root directory to update/config.ini	
+++ b/Copy to SD Card root directory to update/config.ini	
@@ -384,6 +384,12 @@ lcd_idle_brightness:5
 # Options [Off: 0, 5Sec: 1, 10Sec: 2, 30sec: 3, 1min: 4, 2min: 5, 5min: 6, 10min: 7]
 lcd_idle_delay:4
 
+#### Neopixel sequentialmode
+# With this set to true, the neopixel will change color while heating
+# like they do in marlin mode. (Only while printing)
+# Options: [On: 1, Off: 0]
+event_led_mode:1
+
 
 #--------------------------------------------------------------------
 # Custom G-Code Commands (up to 15 custom G-code)
diff --git a/TFT/src/User/API/BabystepControl.h b/TFT/src/User/API/BabystepControl.h
index 36a7e6d8e9..fe9f450b51 100644
--- a/TFT/src/User/API/BabystepControl.h
+++ b/TFT/src/User/API/BabystepControl.h
@@ -1,5 +1,4 @@
-#ifndef _BABYSTEP_CONTROL_H_
-#define _BABYSTEP_CONTROL_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,5 +27,3 @@ float babystepUpdateValueByEncoder(float unit, int8_t direction);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Colors.h b/TFT/src/User/API/Colors.h
index f827505c0e..7e12454471 100644
--- a/TFT/src/User/API/Colors.h
+++ b/TFT/src/User/API/Colors.h
@@ -1,6 +1,4 @@
-
-#ifndef _COLORS_H_
-#define _COLORS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,5 +54,3 @@ extern const LABEL lcd_color_names[LCD_COLOR_COUNT];
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/FanControl.c b/TFT/src/User/API/FanControl.c
index 967bacfb41..1fce4e31a8 100644
--- a/TFT/src/User/API/FanControl.c
+++ b/TFT/src/User/API/FanControl.c
@@ -15,9 +15,11 @@ static bool fanQueryEnable = false;
 static uint32_t nextSendTime = 0;
 #define nextSendWait  500  // 1 second is 1000 
 
-uint8_t fanGetTypID(uint8_t startIndex, uint8_t type) {
-  for(uint8_t i = startIndex; i < MAX_FAN_COUNT; i++) {
-    if(fanType[i] == type) return i;
+uint8_t fanGetTypID(uint8_t startIndex, uint8_t type)
+{
+  for(uint8_t i = startIndex; i < MAX_FAN_COUNT; i++)
+  {
+    if (fanType[i] == type) return i;
   }
   return FAN_TYPE_UNKNOWN;
 }
@@ -30,11 +32,19 @@ void fanBuildList(void)
 
   for (uint8_t i = 0, j=0; i < MAX_FAN_COUNT; i++,j++)
   {
-    if( infoSettings.fan_count == i ) {
-      if( infoSettings.fan_ctrl_count > 0 ) i= (MAX_FAN_COUNT - MAX_FAN_CTRL_COUNT);
-      else i= MAX_FAN_COUNT;
+    if ( infoSettings.fan_count == i )
+    {
+      if ( infoSettings.fan_ctrl_count > 0 )
+      {
+        i= (MAX_FAN_COUNT - MAX_FAN_CTRL_COUNT);
+      }
+      else
+      {
+        i= MAX_FAN_COUNT;
+      }
     }
-    if(i < MAX_FAN_COUNT) {
+    if (i < MAX_FAN_COUNT)
+    {
       memcpy(fanID+j, fanIDTemp+i, sizeof(fanIDTemp[i]));
       memcpy(fanCmd+j, fanCmdTemp+i, sizeof(fanCmdTemp[i]));
       memcpy(fanType+j, fanTypeTemp+i, sizeof(fanTypeTemp[i]));
@@ -45,11 +55,11 @@ void fanBuildList(void)
 void fanControlInit(void) {
   fanBuildList();
 
-  fanQueryEnable = 
-    ( infoSettings.fan_ctrl_count > 0 && 
-      (fanGetTypID( infoSettings.fan_count -1,FAN_TYPE_CTRL_I ) || 
-       fanGetTypID( infoSettings.fan_count -1,FAN_TYPE_CTRL_S ) ) 
-    );
+  fanQueryEnable = infoSettings.fan_ctrl_count > 0 && 
+                   (
+                     fanGetTypID( infoSettings.fan_count -1,FAN_TYPE_CTRL_I ) || 
+                     fanGetTypID( infoSettings.fan_count -1,FAN_TYPE_CTRL_S )
+                   );
 }
 
 bool fanIsType(uint8_t i, uint8_t type) {
@@ -131,16 +141,21 @@ void loopFan(void)
   {
     if ((newFanSpeed[i] != desiredFanSpeed[i]) && (OS_GetTimeMs() > nextSendTime))
     {
-      if(fan_send_waiting[i] == false)
+      if (fan_send_waiting[i] == false)
       {
-        if(fanIsType(i,FAN_TYPE_F) || fanIsType(i,FAN_TYPE_CTRL_S)) {
+        if (fanIsType(i,FAN_TYPE_F) || fanIsType(i,FAN_TYPE_CTRL_S))
+        {
           fan_send_waiting[i] = storeCmd("%s S%d\n", fanCmd[i],desiredFanSpeed[i]);
         } 
-        else if (fanIsType(i,FAN_TYPE_CTRL_I)) {
+        else if (fanIsType(i,FAN_TYPE_CTRL_I))
+        {
           fan_send_waiting[i] = storeCmd("%s I%d\n", fanCmd[i],desiredFanSpeed[i]);
         }
       }
-      if (fan_send_waiting[i] == true) newFanSpeed[i] = desiredFanSpeed[i];
+      if (fan_send_waiting[i] == true)
+      {
+        newFanSpeed[i] = desiredFanSpeed[i];
+      }
       nextSendTime = OS_GetTimeMs() + nextSendWait; // avoid rapid fire, clogging the queue
     }
   }
@@ -148,8 +163,8 @@ void loopFan(void)
 
 void fanSpeedQuery(void)
 {
-  if( fanQueryEnable && infoHost.connected && 
-      !infoHost.wait && !fanQueryWait )
+  if (fanQueryEnable && infoHost.connected && 
+      !infoHost.wait && !fanQueryWait)
   { 
     storeCmd("M710\n");
     fanQueryWait = true;
diff --git a/TFT/src/User/API/FanControl.h b/TFT/src/User/API/FanControl.h
index 9de1a50564..c2dc0ac5b2 100644
--- a/TFT/src/User/API/FanControl.h
+++ b/TFT/src/User/API/FanControl.h
@@ -1,5 +1,4 @@
-#ifndef _FANCONTROL_H_
-#define _FANCONTROL_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,5 +41,3 @@ void    fanSpeedQuerySetWait(bool wait);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Gcode/gcode.c b/TFT/src/User/API/Gcode/gcode.c
index 8231da2dd9..ea9b71711e 100644
--- a/TFT/src/User/API/Gcode/gcode.c
+++ b/TFT/src/User/API/Gcode/gcode.c
@@ -182,9 +182,12 @@ long request_M23(char *filename)
  **/
 bool request_M24(int pos)
 {
-  if(pos == 0){
+  if (pos == 0)
+  {
     mustStoreCmd("M24\n");
-  } else {
+  }
+  else
+  {
     mustStoreCmd("M24 S%d\n", pos);
   }
   return true;
diff --git a/TFT/src/User/API/Gcode/gcode.h b/TFT/src/User/API/Gcode/gcode.h
index 4e88c9332a..29e8fa34a8 100644
--- a/TFT/src/User/API/Gcode/gcode.h
+++ b/TFT/src/User/API/Gcode/gcode.h
@@ -1,5 +1,5 @@
-#ifndef _GCODE_H_
-#define _GCODE_H_
+#pragma once
+
 #include "stdbool.h"
 #include "interfaceCmd.h"
 
@@ -33,4 +33,3 @@ bool request_M524(void);
 bool request_M24(int pos);
 long request_M23(char *filename);
 
-#endif
diff --git a/TFT/src/User/API/Gcode/mygcodefs.c b/TFT/src/User/API/Gcode/mygcodefs.c
index c51a525b22..9ee5dcc699 100644
--- a/TFT/src/User/API/Gcode/mygcodefs.c
+++ b/TFT/src/User/API/Gcode/mygcodefs.c
@@ -43,7 +43,7 @@ bool scanPrintFilesGcodeFs(void)
   clearRequestCommandInfo();
   char s[3];
 
-  if(strstr(data, "\r\n")) //for smoothieware
+  if (strstr(data, "\r\n")) //for smoothieware
     strcpy(s, "\r\n");
   else //for Marlin
     strcpy(s, "\n");
@@ -123,14 +123,14 @@ bool scanPrintFilesGcodeFs(void)
       bool found = false;
       for(int i=0; i < infoFile.F_num; i++)
       {
-        if(strcmp(folder, infoFile.folder[i]) == 0)
+        if (strcmp(folder, infoFile.folder[i]) == 0)
         {
           found = true;
           break;
         }
       }
 
-      if(!found)
+      if (!found)
       {
         uint16_t len = strlen(folder) + 1;
         infoFile.folder[infoFile.F_num] = malloc(len);
diff --git a/TFT/src/User/API/HomeOffsetControl.h b/TFT/src/User/API/HomeOffsetControl.h
index 031ec79174..5caa55842e 100644
--- a/TFT/src/User/API/HomeOffsetControl.h
+++ b/TFT/src/User/API/HomeOffsetControl.h
@@ -1,5 +1,4 @@
-#ifndef _HOME_OFFSET_CONTROL_H_
-#define _HOME_OFFSET_CONTROL_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,5 +13,3 @@ float homeOffsetGetValue(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/LCD_Encoder.c b/TFT/src/User/API/LCD_Encoder.c
index c798ac81ba..9c23824db4 100644
--- a/TFT/src/User/API/LCD_Encoder.c
+++ b/TFT/src/User/API/LCD_Encoder.c
@@ -45,9 +45,9 @@ bool encoder_ReadBtn(uint16_t intervals)
 {
   static u32 nowTime = 0;
 
-  if(!GPIO_GetLevel(LCD_BTN_PIN))
+  if (!GPIO_GetLevel(LCD_BTN_PIN))
   {
-    if(OS_GetTimeMs() - nowTime > intervals)
+    if (OS_GetTimeMs() - nowTime > intervals)
     {
       return true;
     }
@@ -85,8 +85,8 @@ bool LCD_BtnTouch(uint16_t intervals)
 uint8_t encoder_GetPos(void)
 {
   uint8_t newbutton = 0;
-  if(encoder_ReadStep(LCD_ENCA_PIN)) newbutton |= EN_A;
-  if(encoder_ReadStep(LCD_ENCB_PIN)) newbutton |= EN_B;
+  if (encoder_ReadStep(LCD_ENCA_PIN)) newbutton |= EN_A;
+  if (encoder_ReadStep(LCD_ENCB_PIN)) newbutton |= EN_B;
 
   return newbutton;
 }
@@ -94,7 +94,7 @@ uint8_t encoder_GetPos(void)
 
 bool encoder_CheckState()
 {
- if(encoder_ReadBtn(LCD_BUTTON_INTERVALS) || _encLastBtn != encoder_GetPos())
+ if (encoder_ReadBtn(LCD_BUTTON_INTERVALS) || _encLastBtn != encoder_GetPos())
   {
     _encLastBtn = encoder_GetPos();
     return true;
@@ -145,13 +145,13 @@ void loopCheckEncoderSteps(void)
   static u16 sy;
   static bool MOVE = false;
 
-  if(!XPT2046_Read_Pen() && CTime < OS_GetTimeMs())
+  if (!XPT2046_Read_Pen() && CTime < OS_GetTimeMs())
   {
     TS_Get_Coordinates(&ex, &ey);
     if (!MOVE)
       sy = ey;
 
-    if(ex > LCD_FREE_WIDTH) //stop mode switch if touched in navigation area
+    if (ex > LCD_FREE_WIDTH) //stop mode switch if touched in navigation area
       skipMode = true;
     else
       skipMode = false;
@@ -194,7 +194,7 @@ void loopCheckEncoderSteps(void)
 //Send encoder pulse
 void sendEncoder(uint8_t num)
 {
-  if(num==1 || num==2 || num ==3)
+  if (num==1 || num==2 || num ==3)
   {
     GPIO_InitSet(LCD_BTN_PIN, MGPIO_MODE_OUT_PP, 0);
     GPIO_InitSet(LCD_ENCA_PIN, MGPIO_MODE_OUT_PP, 0);
diff --git a/TFT/src/User/API/LCD_Encoder.h b/TFT/src/User/API/LCD_Encoder.h
index 97a53b1946..40399ab7f9 100644
--- a/TFT/src/User/API/LCD_Encoder.h
+++ b/TFT/src/User/API/LCD_Encoder.h
@@ -1,5 +1,4 @@
-#ifndef _LCD_ENCODER_H_
-#define _LCD_ENCODER_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,5 +41,3 @@ void sendEncoder(uint8_t num);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Language/Language.c b/TFT/src/User/API/Language/Language.c
index 729a71fefd..4a198b63ad 100644
--- a/TFT/src/User/API/Language/Language.c
+++ b/TFT/src/User/API/Language/Language.c
@@ -29,7 +29,7 @@
 #elif DEFAULT_LANGUAGE == SLOVAK
 #include "language_sk.h"
 #elif DEFAULT_LANGUAGE == DUTCH
-#include "language_du.h"
+#include "language_nl.h"
 #elif DEFAULT_LANGUAGE == HUNGARIAN
 #include "language_hu.h"
 #elif DEFAULT_LANGUAGE == TURKISH
@@ -52,7 +52,8 @@
 //
 u8 tempLabelString[MAX_LANG_LABEL_LENGTH];
 
-const char *const default_pack[LABEL_NUM] = {
+const char *const default_pack[LABEL_NUM] =
+{
   #define X_WORD(NAME) STRING_##NAME ,
   #include "Language.inc"
   #undef  X_WORD
@@ -89,10 +90,14 @@ uint32_t getLabelFlashAddr(uint16_t index)
 
 bool loadLabelText(uint8_t* buf, uint16_t index)
 {
-  if(index >= LABEL_NUM) return false;
-  if(infoSettings.language == LANG_FLASH)
+  if (index >= LABEL_NUM) return false;
+  if (infoSettings.language == LANG_FLASH)
+  {
     W25Qxx_ReadBuffer(buf, getLabelFlashAddr(index), MAX_LANG_LABEL_LENGTH);
+  }
   else
+  {
     memcpy(buf, textSelect(index), sizeof(tempLabelString));
+  }
   return true;
 }
diff --git a/TFT/src/User/API/Language/Language.h b/TFT/src/User/API/Language/Language.h
index 74327a8578..3aeb388b9e 100644
--- a/TFT/src/User/API/Language/Language.h
+++ b/TFT/src/User/API/Language/Language.h
@@ -1,5 +1,4 @@
-#ifndef _LANGUAGE_H_
-#define _LANGUAGE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,5 +69,3 @@ bool loadLabelText(uint8_t * buf, uint16_t index);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Language/Language.inc b/TFT/src/User/API/Language/Language.inc
index 100ac59f54..c3b230943e 100644
--- a/TFT/src/User/API/Language/Language.inc
+++ b/TFT/src/User/API/Language/Language.inc
@@ -14,6 +14,7 @@ X_WORD (SOUND)
 X_WORD (TOUCH_SOUND)
 X_WORD (ALERT_SOUND)
 X_WORD (TOAST_SOUND)
+X_WORD (PREHEATDONE_SOUND)
 X_WORD (SHUT_DOWN)
 X_WORD (RGB_SETTINGS)
 X_WORD (RGB_OFF)
@@ -229,6 +230,7 @@ X_WORD (60_SECONDS)
 X_WORD (120_SECONDS)
 X_WORD (300_SECONDS)
 X_WORD (CUSTOM_SECONDS)
+X_WORD (EVENT_LED_MODE)
 X_WORD (ST7920_FULLSCREEN)
 X_WORD (PLR_EN)
 X_WORD (SETTING_SAVE)
diff --git a/TFT/src/User/API/Language/language_am.h b/TFT/src/User/API/Language/language_am.h
index 6f19e06add..cd9638d735 100644
--- a/TFT/src/User/API/Language/language_am.h
+++ b/TFT/src/User/API/Language/language_am.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_AM_H_
-#define _LANGUAGE_AM_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Հայերեն"
+#define STRING_HEAT                   "Ջերմություն"
+#define STRING_MOVE                   "Շարժել"
+#define STRING_HOME                   "Սկզբնական"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Տպել"
+#define STRING_EXTRUDE                "Հալել"
+#define STRING_FAN                    "Հովացնել"
+#define STRING_SETTINGS               "Կարգավորումներ"
+#define STRING_SCREEN_SETTINGS        "Screen"
+#define STRING_MACHINE_SETTINGS       "Machine"
+#define STRING_FEATURE_SETTINGS       "Feature"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Shut Down"
+#define STRING_RGB_SETTINGS           "LED Color"
+#define STRING_RGB_OFF                "LED Off"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Custom"
+#define STRING_LEVELING               "Leveling"
+#define STRING_POINT_1                "Point 1"
+#define STRING_POINT_2                "Point 2"
+#define STRING_POINT_3                "Point 3"
+#define STRING_POINT_4                "Point 4"
+#define STRING_POINT_5                "Point 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Deploy"
+#define STRING_BLTOUCH_STOW           "Stow"
+#define STRING_BLTOUCH_REPEAT         "Repeat"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Probe Offset"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Save"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Ավելացնել"
+#define STRING_DEC                    "Նվազեցնել"
+#define STRING_NOZZLE                 "Գլխիկ"
+#define STRING_BED                    "Տախտակ"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Դադարեցնել"
+#define STRING_BACK                   "Հետ"
+#define STRING_PAGE_UP                "Վերեւ"
+#define STRING_PAGE_DOWN              "Ներքեւ"
+#define STRING_PAUSE                  "Կանգնեցնել"
+#define STRING_RESUME                 "Շարունակել"
+#define STRING_LOAD                   "Load"
+#define STRING_UNLOAD                 "Unload"
+#define STRING_SLOW_SPEED             "Դանդաղ"
+#define STRING_NORMAL_SPEED           "Նորմալ"
+#define STRING_FAST_SPEED             "Արագ"
+#define STRING_FAN_FULL_SPEED         "Ամբողջը"
+#define STRING_FAN_HALF_SPEED         "Կիսատ"
+#define STRING_ROTATE_UI              "Rotate UI"
+#define STRING_TOUCHSCREEN_ADJUST     "TSC Adjust"
+#define STRING_MORE                   "More"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Status"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
+#define STRING_WHITE                  "White"
+#define STRING_BLACK                  "Black"
+#define STRING_BLUE                   "Blue"
+#define STRING_RED                    "Red"
+#define STRING_GREEN                  "Green"
+#define STRING_CYAN                   "Cyan"
+#define STRING_YELLOW                 "Yellow"
+#define STRING_BROWN                  "Brown"
+#define STRING_GRAY                   "Gray"
+#define STRING_ORANGE                 "Orange"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Violet"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Purple"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "DarkBlue"
+#define STRING_DARKGREEN              "DarkGreen"
+#define STRING_DARKGRAY               "DarkGray"
+#define STRING_DISCONNECT             "Անջատել"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Percentage"
+#define STRING_BABYSTEP               "Դանդաղ"
+#define STRING_PERCENTAGE_SPEED       "Արագություն"
+#define STRING_PERCENTAGE_FLOW        "Flow"
+#define STRING_VALUE_ZERO             "Zero"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Պատրաստ"
+#define STRING_BUSY                   "Ծանրաբեռնված է"
+#define STRING_UNCONNECTED            "Տպիչը կցված չէ"
+#define STRING_DISCONNECT_INFO        "Now you can control the printer by your computer!"
+#define STRING_LOADING                "Բեռնում է..."
+#define STRING_POWER_FAILED           "Տպելը չի ավարտվել, շարունակե՞լ"
+#define STRING_CONTINUE               "Շարունակել"
+#define STRING_CANCEL                 "Չեղարկել"
+#define STRING_ADJUST_TITLE           "Էկրանի կարգավորում"
+#define STRING_ADJUST_INFO            "Please click on the red dot"
+#define STRING_ADJUST_OK              "Adjustment Success"
+#define STRING_ADJUST_FAILED          "Adjustment failed, Please Try Again"
+#define STRING_WARNING                "Warning"
+#define STRING_STOP_PRINT             "Stop printing?"
+#define STRING_CONFIRM                "Confirm"
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "TFTSD հիշողության սարքը չկա"
+#define STRING_TFTSD_INSERTED         "Card inserted!"
+#define STRING_TFTSD_REMOVED          "Card removed!"
+#define STRING_U_DISK                 "U Disk"
+#define STRING_READ_U_DISK_ERROR      "Read U Disk error!"
+#define STRING_U_DISK_INSERTED        "U Disk inserted!"
+#define STRING_U_DISK_REMOVED         "U Disk removed!"
+#define STRING_ONBOARDSD              "OnboardSD"
+#define STRING_READ_ONBOARDSD_ERROR   "OnboardSD հիշողության սարքը չկա"
+#define STRING_FILAMENT_SENSOR        "Filament sensor"
+#define STRING_FILAMENT_RUNOUT        "Filament runout!"
+#define STRING_PREHEAT                "Preheat"
+#define STRING_PREHEAT_BOTH           "Both"
+#define STRING_IS_PAUSE               "Unable to extrude when\nprinting.\nPause printing?"
+#define STRING_AUTO_SHUT_DOWN         "Auto Power"
+#define STRING_UNIFIEDMOVE            "Movement"
+#define STRING_UNIFIEDHEAT            "Heat&Fan"
+#define STRING_COOLDOWN               "Cool Down"
+#define STRING_EMERGENCYSTOP          "EM. STOP"
+#define STRING_TOUCH_TO_EXIT          "Touch anywhere to exit"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Wait for the temperature\nof hotend to be\nlower than %d℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Force"
+#define STRING_SHUTTING_DOWN          "Shutting down..."
+#define STRING_PARAMETER_SETTING      "Պարամետր"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Show ACK in Terminal"
+#define STRING_INVERT_XAXIS           "Invert X Axis"
+#define STRING_INVERT_YAXIS           "Invert Y Axis"
+#define STRING_INVERT_ZAXIS           "Invert Z Axis"
+#define STRING_MOVE_SPEED             "Move speed(X Y Z)"
+#define STRING_KNOB_LED               "Rotary Knob LED"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Paused by M0 command"
+#define STRING_SEND_START_GCODE       "Start Gcode before print"
+#define STRING_SEND_END_GCODE         "End Gcode after print"
+#define STRING_SEND_CANCEL_GCODE      "Cancel Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Persistent Status Info"
+#define STRING_FILE_LISTMODE          "Files viewer List Mode"
+#define STRING_CURRENT_SETTING        "Driver Current (mA)"
+#define STRING_STEPS_SETTING          "Steps per mm"
+#define STRING_MAXFEEDRATE            "Max Feed Rate"
+#define STRING_MAXACCELERATION        "Max Acceleration"
+#define STRING_ACCELERATION           "Acceleration"
+#define STRING_PRINT_ACCELERATION     "Print Acceleration"
+#define STRING_RETRACT_ACCELERATION   "Retract Acceleration"
+#define STRING_TRAVEL_ACCELERATION    "Travel Acceleration"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC bump sensitivity"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Reset all settings to\ndefault values?"
+#define STRING_RESET_SETTINGS_DONE    "Reset all settings\nsuccessful.\nplease restart the device."
+#define STRING_INFO                   "Info"
+#define STRING_LCD_BRIGHTNESS         "LCD Brightness"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD Brightness dim"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD dim idle timer"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset default settings"
+#define STRING_SETTING_RESTORE        "load settings"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start Printing:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Disarm XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Հայերեն"
     #define STRING_HEAT                   "Ջերմություն"
     #define STRING_MOVE                   "Շարժել"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_ca.h b/TFT/src/User/API/Language/language_ca.h
index c892315fb2..1fe9ac62d1 100644
--- a/TFT/src/User/API/Language/language_ca.h
+++ b/TFT/src/User/API/Language/language_ca.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_CA_H_
-#define _LANGUAGE_CA_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Català"
+#define STRING_HEAT                   "Escalfar"
+#define STRING_MOVE                   "Moure"
+#define STRING_HOME                   "Origen"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Imprimir"
+#define STRING_EXTRUDE                "Extruir"
+#define STRING_FAN                    "Ventilar"
+#define STRING_SETTINGS               "Configura"
+#define STRING_SCREEN_SETTINGS        "Pantalla"
+#define STRING_MACHINE_SETTINGS       "Màquina"
+#define STRING_FEATURE_SETTINGS       "Afegits"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Apagar"
+#define STRING_RGB_SETTINGS           "Color LED"
+#define STRING_RGB_OFF                "Apagar LED"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Personalitzar"
+#define STRING_LEVELING               "Anivellar"
+#define STRING_POINT_1                "Punt 1"
+#define STRING_POINT_2                "Punt 2"
+#define STRING_POINT_3                "Punt 3"
+#define STRING_POINT_4                "Punt 4"
+#define STRING_POINT_5                "Punt 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Nivellat del llit completat"
+#define STRING_BL_SMART_FILL          "Falten punts de prova\ns'han omplert de forma intel·ligent.\n \nNota: recordeu guardar!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Nivellament del llit Bilinear"
+#define STRING_ABL_SETTINGS_UBL       "Nivellament de llit unificat"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Desa a la ranura"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Carrega des de la ranura"
+#define STRING_ABL_SLOT0              "Ranura 0"
+#define STRING_ABL_SLOT1              "Ranura 1"
+#define STRING_ABL_SLOT2              "Ranura 2"
+#define STRING_ABL_SLOT3              "Ranura 3"
+#define STRING_ABL_SLOT_EEPROM        "Recordar la ranura per al proper\nreinici? (Guardar EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Provar"
+#define STRING_BLTOUCH_DEPLOY         "Desplegar"
+#define STRING_BLTOUCH_STOW           "Plegar"
+#define STRING_BLTOUCH_REPEAT         "Repetir"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Sonda Compensar"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Estàs segur?"
+#define STRING_DOWN                   "Avall"
+#define STRING_UP                     "Amunt"
+#define STRING_SAVE                   "Gravar"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Augmentar"
+#define STRING_DEC                    "Disminur"
+#define STRING_NOZZLE                 "Nozzle"
+#define STRING_BED                    "Llit"
+#define STRING_CHAMBER                "Cambra"
+#define STRING_START                  "Començar"
+#define STRING_STOP                   "Parar"
+#define STRING_BACK                   "Tornar"
+#define STRING_PAGE_UP                "Retrocedir"
+#define STRING_PAGE_DOWN              "Avançar"
+#define STRING_PAUSE                  "Pausar"
+#define STRING_RESUME                 "Continuar"
+#define STRING_LOAD                   "Carregar"
+#define STRING_UNLOAD                 "Descarregar"
+#define STRING_SLOW_SPEED             "Lent"
+#define STRING_NORMAL_SPEED           "Normal"
+#define STRING_FAST_SPEED             "Ràpid"
+#define STRING_FAN_FULL_SPEED         "Màxim"
+#define STRING_FAN_HALF_SPEED         "Meitat"
+#define STRING_ROTATE_UI              "Rotar"
+#define STRING_TOUCHSCREEN_ADJUST     "Calibrar"
+#define STRING_MORE                   "Més"
+#define STRING_SCREEN_INFO            "Informar"
+#define STRING_STATUS                 "Estat"
+#define STRING_SIMULATOR_BG_COLOR     "Color de fons del simulador Marlin"
+#define STRING_SIMULATOR_FONT_COLOR   "Color de lletra de simulador Marlin"
+#define STRING_WHITE                  "Blanc"
+#define STRING_BLACK                  "Negre"
+#define STRING_BLUE                   "Blau"
+#define STRING_RED                    "Vermell"
+#define STRING_GREEN                  "Verd"
+#define STRING_CYAN                   "Cian"
+#define STRING_YELLOW                 "groc"
+#define STRING_BROWN                  "marró"
+#define STRING_GRAY                   "Gris"
+#define STRING_ORANGE                 "taronja"
+#define STRING_INDIGO                 "Índigo"
+#define STRING_VIOLET                 "violeta"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Porpra"
+#define STRING_LIME                   "Llima"
+#define STRING_DARKBLUE               "Blau fosc"
+#define STRING_DARKGREEN              "Verd fosc"
+#define STRING_DARKGRAY               "Gris fosc"
+#define STRING_DISCONNECT             "Desconnectar"
+#define STRING_BAUDRATE               "Velocitat de transmissió"
+#define STRING_PERCENTAGE             "Percentatge"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Velocitat"
+#define STRING_PERCENTAGE_FLOW        "Flux"
+#define STRING_VALUE_ZERO             "Zero"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "+X"
+#define STRING_Y_INC                  "+Y"
+#define STRING_Z_INC                  "+Z"
+#define STRING_X_DEC                  "-X"
+#define STRING_Y_DEC                  "-Y"
+#define STRING_Z_DEC                  "-Z"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "A punt!!"
+#define STRING_BUSY                   "Processament ocupat, si us plau esperi ..."
+#define STRING_UNCONNECTED            "No hi ha comunicació amb impressora!"
+#define STRING_DISCONNECT_INFO        "Ara pot controlar la impressora des del seu ordinador!"
+#define STRING_LOADING                "Carregant ..."
+#define STRING_POWER_FAILED           "¿Continuar imprimint?"
+#define STRING_CONTINUE               "Continuar"
+#define STRING_CANCEL                 "Cancel · lar"
+#define STRING_ADJUST_TITLE           "¡Calibrar la pantalla tàctil"
+#define STRING_ADJUST_INFO            "Si us plau feu clic al punt vermell"
+#define STRING_ADJUST_OK              "Ajust correcte"
+#define STRING_ADJUST_FAILED          "Ajust fallit, si us plau intenteu de nou"
+#define STRING_WARNING                "Advertència"
+#define STRING_STOP_PRINT             "Voleu aturar la impressió?"
+#define STRING_CONFIRM                "Confirmar"
+#define STRING_TFTSD                  "SD TFT"
+#define STRING_READ_TFTSD_ERROR       "Error a la targeta SD TFT!"
+#define STRING_TFTSD_INSERTED         "¡Targeta inserida!"
+#define STRING_TFTSD_REMOVED          "¡Targeta extreta!"
+#define STRING_U_DISK                 "Pendrive"
+#define STRING_READ_U_DISK_ERROR      "¡Error al Pendrive!"
+#define STRING_U_DISK_INSERTED        "¡Pendrive inserit!"
+#define STRING_U_DISK_REMOVED         "¡Pendrive extret!"
+#define STRING_ONBOARDSD              "SD Placa"
+#define STRING_READ_ONBOARDSD_ERROR   "Error a la targeta SD de la placa!"
+#define STRING_FILAMENT_SENSOR        "Sensor de filament"
+#define STRING_FILAMENT_RUNOUT        "¡Filament esgotat!"
+#define STRING_PREHEAT                "Preescalfar"
+#define STRING_PREHEAT_BOTH           "Tots dos"
+#define STRING_IS_PAUSE               "No es pot extruir\nal imprimir,¿\nPausar la impressió?"
+#define STRING_AUTO_SHUT_DOWN         "Apag. aut."
+#define STRING_UNIFIEDMOVE            "Moviment"
+#define STRING_UNIFIEDHEAT            "Calor/Ventilador"
+#define STRING_COOLDOWN               "Refredar"
+#define STRING_EMERGENCYSTOP          "PARADA EMERGENCIA"
+#define STRING_TOUCH_TO_EXIT          "Toca qualsevol lloc per sortir"
+#define STRING_MAINMENU               "Menú"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Espereu que la\ntemperatura del hotend\nsigui inferior a %d℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Forçar Apagat"
+#define STRING_SHUTTING_DOWN          "Apagant..."
+#define STRING_PARAMETER_SETTING      "Paràmetre"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Mostra ACK a la terminal"
+#define STRING_INVERT_XAXIS           "Invertir eix X"
+#define STRING_INVERT_YAXIS           "Invertir eix Y"
+#define STRING_INVERT_ZAXIS           "Invertir eix Z"
+#define STRING_MOVE_SPEED             "Velocitat de moviment(X Y Z)"
+#define STRING_KNOB_LED               "Perilla rotativa LED"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "En pausa per l'ordre M0"
+#define STRING_SEND_START_GCODE       "Enviar Gcode inicial"
+#define STRING_SEND_END_GCODE         "Enviar Gcode final"
+#define STRING_SEND_CANCEL_GCODE      "Cancel · lar Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Informació d'estat persistent"
+#define STRING_FILE_LISTMODE          "Mode de visualització de fitxers"
+#define STRING_CURRENT_SETTING        "Corrent del Driver (mA)"
+#define STRING_STEPS_SETTING          "Passos per MM"
+#define STRING_MAXFEEDRATE            "Max Feed Rate"
+#define STRING_MAXACCELERATION        "Max Acceleració"
+#define STRING_ACCELERATION           "Acceleració"
+#define STRING_PRINT_ACCELERATION     "Acceleració Impressió"
+#define STRING_RETRACT_ACCELERATION   "Acceleració Retracció"
+#define STRING_TRAVEL_ACCELERATION    "Acceleració Viatge"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "Sensibilitat al topall TMC"
+#define STRING_FWRETRACT              "Retracció de FW"
+#define STRING_FWRECOVER              "Recuperació de Retracció de FW"
+#define STRING_LIN_ADVANCE            "Avanç Lineal"
+#define STRING_RESET_SETTINGS_INFO    "Restableix tota la configuració a\nvalors predeterminats?"
+#define STRING_RESET_SETTINGS_DONE    "Restableix tota la configuració\naconseguit.\nreinicieu el dispositiu."
+#define STRING_INFO                   "Informació"
+#define STRING_LCD_BRIGHTNESS         "Lluminositat LCD"
+#define STRING_LCD_BRIGHTNESS_DIM     "Dim Lluminositat LCD"
+#define STRING_LCD_DIM_IDLE_TIMER     "Temporitzador inactiu LCD"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Personalitzat"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Mode Marlin a pantalla completa"
+#define STRING_PLR_EN                 "Recuperació de pèrdua d’energia"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Restableix la configuració"
+#define STRING_SETTING_RESTORE        "Restaura la configuració"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Desa la configuració de la impressora\na la EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Carregar la configuració de\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Velocitat Retracció"
+#define STRING_RETRACT_LENGTH         "Longitud Retracció"
+#define STRING_RETRACT_SWAP_LENGTH    "Distància retracció intercanvi"
+#define STRING_RETRACT_Z_LIFT         "Z aixecament a la retracció"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Velocitat recuperació"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Velocitat recuperació intercanvi"
+#define STRING_RECOVER_LENGTH         "Distancia recuperació extra"
+#define STRING_SWAP_RECOVER_LENGTH    "Distancia recuperació intercanvi extra"
+#define STRING_START_PRINT            "Comenceu a imprimir:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Disarm XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Català"
     #define STRING_HEAT                   "Escalfar"
     #define STRING_MOVE                   "Moure"
@@ -282,5 +561,5 @@
     #define STRING_LOAD_STARTED           "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by."  // translation needed
     #define STRING_UNLOAD_STARTED         "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by."  // translation needed
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
+>>>>>>> upstream/master
 
-#endif
diff --git a/TFT/src/User/API/Language/language_cn.h b/TFT/src/User/API/Language/language_cn.h
index 2c79797baa..de628a41ed 100644
--- a/TFT/src/User/API/Language/language_cn.h
+++ b/TFT/src/User/API/Language/language_cn.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_CN_H_
-#define _LANGUAGE_CN_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "简体中文"
+#define STRING_HEAT                   "加热"
+#define STRING_MOVE                   "移动"
+#define STRING_HOME                   "回原点"
+#define STRING_DISABLE_STEPPERS       "解锁电机"
+#define STRING_PRINT                  "打印"
+#define STRING_EXTRUDE                "挤出"
+#define STRING_FAN                    "风扇"
+#define STRING_SETTINGS               "设置"
+#define STRING_SCREEN_SETTINGS        "屏幕设置"
+#define STRING_MACHINE_SETTINGS       "机器设置"
+#define STRING_FEATURE_SETTINGS       "功能设置"
+#define STRING_SOUND                  "声音"
+#define STRING_TOUCH_SOUND            "按钮声音"
+#define STRING_TOAST_SOUND            "Toast 提示声音"
+#define STRING_ALERT_SOUND            "弹窗和提示声音"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "关闭电源"
+#define STRING_RGB_SETTINGS           "灯光颜色"
+#define STRING_RGB_OFF                "熄灭灯光"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "自定义"
+#define STRING_LEVELING               "调平"
+#define STRING_POINT_1                "第一点"
+#define STRING_POINT_2                "第二点"
+#define STRING_POINT_3                "第三点"
+#define STRING_POINT_4                "第四点"
+#define STRING_POINT_5                "第五点"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "平台调平完成!"
+#define STRING_BL_SMART_FILL          "部分点未探测,已被自动填充, 需要手动保存!"
+#define STRING_BL_ENABLE              "BL:已开启"
+#define STRING_BL_DISABLE             "BL:已关闭"
+#define STRING_ABL                    "自动调平"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "BL自检"
+#define STRING_BLTOUCH_DEPLOY         "探针弹出"
+#define STRING_BLTOUCH_STOW           "探针收回"
+#define STRING_BLTOUCH_REPEAT         "精度测试"
+#define STRING_Z_OFFSET               "Z-偏移量"
+#define STRING_PROBE_OFFSET           "探针偏移量"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "降低"
+#define STRING_UP                     "抬升"
+#define STRING_SAVE                   "保存参数"
+#define STRING_RESTORE                "恢复"
+#define STRING_RESET                  "重置"
+#define STRING_DEFAULT                "默认"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "下一个"
+#define STRING_DISTANCE               "距离"
+#define STRING_INVALID_VALUE          "没有有效的条件!"
+#define STRING_TIMEOUT_REACHED        "已超时!"
+#define STRING_PROCESS_RUNNING        "正在运行,请稍后"
+#define STRING_PROCESS_COMPLETED      "处理已完成!"
+#define STRING_PROCESS_ABORTED        "处理已被中断!"
+#define STRING_INC                    "增加"
+#define STRING_DEC                    "减少"
+#define STRING_NOZZLE                 "喷头"
+#define STRING_BED                    "热床"
+#define STRING_CHAMBER                "机箱"
+#define STRING_START                  "开始"
+#define STRING_STOP                   "停止"
+#define STRING_BACK                   "返回"
+#define STRING_PAGE_UP                "上一页"
+#define STRING_PAGE_DOWN              "下一页"
+#define STRING_PAUSE                  "暂停"
+#define STRING_RESUME                 "继续"
+#define STRING_LOAD                   "进料"
+#define STRING_UNLOAD                 "退料"
+#define STRING_SLOW_SPEED             "慢速"
+#define STRING_NORMAL_SPEED           "常速"
+#define STRING_FAST_SPEED             "快速"
+#define STRING_FAN_FULL_SPEED         "全速"
+#define STRING_FAN_HALF_SPEED         "半速"
+#define STRING_ROTATE_UI              "旋转界面"
+#define STRING_TOUCHSCREEN_ADJUST     "触屏校准"
+#define STRING_MORE                   "更多"
+#define STRING_SCREEN_INFO            "关于"
+#define STRING_STATUS                 "状态"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin模式背景颜色"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin模式字体颜色"
+#define STRING_WHITE                  "白色"
+#define STRING_BLACK                  "黑色"
+#define STRING_BLUE                   "蓝色"
+#define STRING_RED                    "红色"
+#define STRING_GREEN                  "绿色"
+#define STRING_CYAN                   "青色"
+#define STRING_YELLOW                 "黄色"
+#define STRING_BROWN                  "棕色"
+#define STRING_GRAY                   "灰色"
+#define STRING_ORANGE                 "橙色"
+#define STRING_INDIGO                 "靛"
+#define STRING_VIOLET                 "紫罗兰色"
+#define STRING_MAGENTA                "桃红色"
+#define STRING_PURPLE                 "紫色"
+#define STRING_LIME                   "青柠色"
+#define STRING_DARKBLUE               "暗蓝色"
+#define STRING_DARKGREEN              "暗绿色"
+#define STRING_DARKGRAY               "暗灰色"
+#define STRING_DISCONNECT             "断开连接"
+#define STRING_BAUDRATE               "波特率"
+#define STRING_PERCENTAGE             "百分比"
+#define STRING_BABYSTEP               "Z-微调"
+#define STRING_PERCENTAGE_SPEED       "速度百分比"
+#define STRING_PERCENTAGE_FLOW        "流量百分比"
+#define STRING_VALUE_ZERO             "清零"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "准备打印"
+#define STRING_BUSY                   "系统繁忙,请稍候..."
+#define STRING_UNCONNECTED            "未连接到打印机!"
+#define STRING_DISCONNECT_INFO        "现在可以用电脑控制打印机"
+#define STRING_LOADING                "加载中..."
+#define STRING_POWER_FAILED           "是否继续打印?"
+#define STRING_CONTINUE               "继续"
+#define STRING_CANCEL                 "取消"
+#define STRING_ADJUST_TITLE           "触屏校准"
+#define STRING_ADJUST_INFO            "请点击红点中心位置"
+#define STRING_ADJUST_OK              "校准成功"
+#define STRING_ADJUST_FAILED          "校准失败,请重试"
+#define STRING_WARNING                "警告"
+#define STRING_STOP_PRINT             "是否停止打印?"
+#define STRING_CONFIRM                "确定"
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "读TFT SD卡出错!"
+#define STRING_TFTSD_INSERTED         "SD卡已插入!"
+#define STRING_TFTSD_REMOVED          "SD卡已拔出!"
+#define STRING_U_DISK                 "U盘"
+#define STRING_READ_U_DISK_ERROR      "读U盘出错!"
+#define STRING_U_DISK_INSERTED        "U盘已插入!"
+#define STRING_U_DISK_REMOVED         "U盘已拔出!"
+#define STRING_ONBOARDSD              "板载SD"
+#define STRING_READ_ONBOARDSD_ERROR   "读板载SD卡出错!"
+#define STRING_FILAMENT_SENSOR        "耗材检测传感器"
+#define STRING_FILAMENT_RUNOUT        "耗材已用尽,请更换耗材!"
+#define STRING_PREHEAT                "一键预热"
+#define STRING_PREHEAT_BOTH           "全部"
+#define STRING_IS_PAUSE               "打印中无法挤出耗材, 是否暂停打印?"
+#define STRING_AUTO_SHUT_DOWN         "自动关机"
+#define STRING_UNIFIEDMOVE            "运动"
+#define STRING_UNIFIEDHEAT            "温度"
+#define STRING_COOLDOWN               "冷却"
+#define STRING_EMERGENCYSTOP          "紧急停止"
+#define STRING_TOUCH_TO_EXIT          "触摸任意点退出当前界面"
+#define STRING_MAINMENU               "菜单"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "喷头温度正在降温，等待低于%d℃后自动关机" // 喷头温度正在降温，等待低于50℃后自动关机
+#define STRING_FORCE_SHUT_DOWN        "强制关机"
+#define STRING_SHUTTING_DOWN          "正在关机..."
+#define STRING_PARAMETER_SETTING      "参数设置"
+#define STRING_ON                     "开启"
+#define STRING_OFF                    "关闭"
+#define STRING_SMART                  "智能"
+#define STRING_TERMINAL_ACK           "在G-code终端中显示温度信息"
+#define STRING_INVERT_XAXIS           "翻转X轴"
+#define STRING_INVERT_YAXIS           "翻转Y轴"
+#define STRING_INVERT_ZAXIS           "翻转Z轴"
+#define STRING_MOVE_SPEED             "移动速度(X Y Z)"
+#define STRING_KNOB_LED               "旋钮LED颜色"
+#define STRING_KNOB_LED_IDLE          "旋钮LED自动睡眠"
+#define STRING_M0_PAUSE               "M0暂停"
+#define STRING_SEND_START_GCODE       "执行打印前起始Gcode"
+#define STRING_SEND_END_GCODE         "执行打印后结束Gcode"
+#define STRING_SEND_CANCEL_GCODE      "中断打印Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "顶部温度信息"
+#define STRING_FILE_LISTMODE          "文件浏览列表模式"
+#define STRING_CURRENT_SETTING        "TMC驱动电流设置"
+#define STRING_STEPS_SETTING          "电机每毫米脉冲数(Steps/mm)"
+#define STRING_MAXFEEDRATE            "最大移动速度"
+#define STRING_MAXACCELERATION        "最大加速度"
+#define STRING_ACCELERATION           "加速度"
+#define STRING_PRINT_ACCELERATION     "打印加速度"
+#define STRING_RETRACT_ACCELERATION   "回抽加速度"
+#define STRING_TRAVEL_ACCELERATION    "空载加速度"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC堵转检测灵敏度"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "所有的设置会被重置为默认值, 是否继续?"
+#define STRING_RESET_SETTINGS_DONE    "重置所有参数成功! 重启设备后生效."
+#define STRING_INFO                   "提示"
+#define STRING_LCD_BRIGHTNESS         "LCD背光亮度"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD睡眠背光亮度"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD自动睡眠时间"
+#define STRING_5_SECONDS              "5秒"
+#define STRING_10_SECONDS             "10秒"
+#define STRING_30_SECONDS             "30秒"
+#define STRING_60_SECONDS             "1分钟"
+#define STRING_120_SECONDS            "2分钟"
+#define STRING_300_SECONDS            "5分钟"
+#define STRING_CUSTOM_SECONDS         "自定义"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "全屏显示Marlin模式"
+#define STRING_PLR_EN                 "断电续打"
+#define STRING_SETTING_SAVE           "保存设置"
+#define STRING_SETTING_RESET          "重置设置"
+#define STRING_SETTING_RESTORE        "保存设置"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "是否保存打印机设置到EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "是否从EEPROM加载设置?"
+#define STRING_EEPROM_RESET_INFO      "重置EEPROM到出厂设置?"
+#define STRING_RETRACT_FEEDRATE       "FW回抽速度"
+#define STRING_RETRACT_LENGTH         "FW回抽长度"
+#define STRING_RETRACT_SWAP_LENGTH    "换料时回抽的长度"
+#define STRING_RETRACT_Z_LIFT         "回抽时Z轴抬升的高度"
+#define STRING_RETRACT_AUTO           "FW自动回抽"
+#define STRING_RECOVER_FEEDRATE       "FW挤出速度"
+#define STRING_SWAP_RECOVER_FEEDRATE  "换料时挤出的速度"
+#define STRING_RECOVER_LENGTH         "额外挤出的长度"
+#define STRING_SWAP_RECOVER_LENGTH    "换料时额外挤出的长度"
+#define STRING_START_PRINT            "是否开始打印:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK 弹窗类型"
+#define STRING_LEVELING_EDGE_DISTANCE "手动调平边沿距离"
+#define STRING_XY_UNLOCK              "解锁XY"
+#define STRING_TUNING                 "调整"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID自动整定"
+#define STRING_PID_START_INFO         "开始PID自动整定,需要几分钟来完成,是否继续?"
+#define STRING_PID_START_INFO_2       "PID 正在自动整定中!"
+#define STRING_PID_START_INFO_3       "不要操作触控屏直到整定完成!"
+#define STRING_TUNE_EXTRUDER          "微调E-Steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "挤出100mm"
+#define STRING_TUNE_EXT_TEMP          "挤出机微调 | 加热"
+#define STRING_TUNE_EXT_TEMPLOW       "目标温度太低,最低温度为: %d℃"
+#define STRING_TUNE_EXT_DESIREDVAL    "实际温度还没达到设定值"
+#define STRING_TUNE_EXT_MARK120MM     "在耗材上标记120mm\n标记完成后点击 '%s'\n挤出完成后测量剩余长度"
+#define STRING_TUNE_EXT_HEATOFF       "关闭加热?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "调整E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "新的E-Steps已生效,需要手动保存到EEPROM\n新E-Steps: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "剩余的长度:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "旧的E-Steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "新的E-Steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "连接"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "简体中文"
     #define STRING_HEAT                   "加热"
     #define STRING_MOVE                   "移动"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_cz.h b/TFT/src/User/API/Language/language_cz.h
index ae592b057e..8dcfea54bb 100644
--- a/TFT/src/User/API/Language/language_cz.h
+++ b/TFT/src/User/API/Language/language_cz.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_CZ_H_
-#define _LANGUAGE_CZ_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Čeština"
+#define STRING_HEAT                   "Teplota"
+#define STRING_MOVE                   "Posunout"
+#define STRING_HOME                   "Domů"
+#define STRING_DISABLE_STEPPERS       "Motory"
+#define STRING_PRINT                  "Tisknout"
+#define STRING_EXTRUDE                "Filament"
+#define STRING_FAN                    "Ofuk"
+#define STRING_SETTINGS               "Nastavení"
+#define STRING_SCREEN_SETTINGS        "Displej"
+#define STRING_MACHINE_SETTINGS       "Tiskárna"
+#define STRING_FEATURE_SETTINGS       "Vlastnosti"
+#define STRING_SOUND                  "Zvuk"
+#define STRING_TOUCH_SOUND            "Zvuk při dotyku"
+#define STRING_TOAST_SOUND            "Zvuk vytápění"
+#define STRING_ALERT_SOUND            "Upozornění, popup okno"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Vypnout"
+#define STRING_RGB_SETTINGS           "Barva LED"
+#define STRING_RGB_OFF                "LED vyp."
+#define STRING_TERMINAL               "Terminál"
+#define STRING_CUSTOM                 "Vlastní"
+#define STRING_LEVELING               "Srovnat"
+#define STRING_POINT_1                "Bod 1"
+#define STRING_POINT_2                "Bod 2"
+#define STRING_POINT_3                "Bod 3"
+#define STRING_POINT_4                "Bod 4"
+#define STRING_POINT_5                "Bod 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Vyrovnání kompletní"
+#define STRING_BL_SMART_FILL          "Chybějící body sondy\nbyly vyplněny inteligentně.\n \nPozn: Nezapomeň uložit!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "Vyrovnat"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Ruční vyrovnání"
+#define STRING_ABL_SETTINGS           "Auto vyrovnání"
+#define STRING_ABL_SETTINGS_BBL       "Bilineární vyrovnání"
+#define STRING_ABL_SETTINGS_UBL       "UBL vyrovnání"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Uložit do slotu"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Nahrát ze slotu"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Zapamatuj si slot\nrestart? (Uložit EEPROM)"
+#define STRING_ABL_Z                  "Z-Slábnutí"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Vysunout"
+#define STRING_BLTOUCH_STOW           "Zasunout"
+#define STRING_BLTOUCH_REPEAT         "Přesnost"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Offset sondy"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Jste si jistý?"
+#define STRING_DOWN                   "Dolů"
+#define STRING_UP                     "Nahoru"
+#define STRING_SAVE                   "Uložit"
+#define STRING_RESTORE                "Obnovit"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Výchozí"
+#define STRING_CLEAR                  "Vymaž"
+#define STRING_NEXT                   "Další"
+#define STRING_DISTANCE               "Vzdálenost"
+#define STRING_INVALID_VALUE          "Neplatná hodnota/y!"
+#define STRING_TIMEOUT_REACHED        "Časový limit vypršel!"
+#define STRING_PROCESS_RUNNING        "Probíhá proces!"
+#define STRING_PROCESS_COMPLETED      "Proces dokončen!"
+#define STRING_PROCESS_ABORTED        "Proces přerušen!"
+#define STRING_INC                    "Přidat"
+#define STRING_DEC                    "Ubrat"
+#define STRING_NOZZLE                 "Tryska"
+#define STRING_BED                    "Stolek"
+#define STRING_CHAMBER                "Komora"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Stop"
+#define STRING_BACK                   "Zpět"
+#define STRING_PAGE_UP                "Další"
+#define STRING_PAGE_DOWN              "Předchozí"
+#define STRING_PAUSE                  "Pauza"
+#define STRING_RESUME                 "Obnovit"
+#define STRING_LOAD                   "Zavést"
+#define STRING_UNLOAD                 "Vysunout"
+#define STRING_SLOW_SPEED             "Pomalu"
+#define STRING_NORMAL_SPEED           "Normál"
+#define STRING_FAST_SPEED             "Rychle"
+#define STRING_FAN_FULL_SPEED         "Plný"
+#define STRING_FAN_HALF_SPEED         "Poloviční"
+#define STRING_ROTATE_UI              "Otočit UI"
+#define STRING_TOUCHSCREEN_ADJUST     "Kalibrovat"
+#define STRING_MORE                   "Více"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Status"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin - Barva pozadí"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin - Barva písma"
+#define STRING_WHITE                  "Bílá"
+#define STRING_BLACK                  "Černá"
+#define STRING_BLUE                   "Modrá"
+#define STRING_RED                    "Červená"
+#define STRING_GREEN                  "Zelená"
+#define STRING_CYAN                   "Tyrkys"
+#define STRING_YELLOW                 "Žlutá"
+#define STRING_BROWN                  "Hnědá"
+#define STRING_GRAY                   "Šedá"
+#define STRING_ORANGE                 "Oranžová"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Fialová"
+#define STRING_MAGENTA                "Purpurová"
+#define STRING_PURPLE                 "Nachová"
+#define STRING_LIME                   "Limetková"
+#define STRING_DARKBLUE               "Tmavá Modrá"
+#define STRING_DARKGREEN              "Tmavá Červená"
+#define STRING_DARKGRAY               "Tmavá Šedá"
+#define STRING_DISCONNECT             "Odpojit"
+#define STRING_BAUDRATE               "Serial Port"
+#define STRING_PERCENTAGE             "Procenta"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Rychlost"
+#define STRING_PERCENTAGE_FLOW        "Průtok"
+#define STRING_VALUE_ZERO             "Vynulovat"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0,01mm"
+#define STRING_01_MM                  "0,1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Připraven"
+#define STRING_BUSY                   "Zpracovávám, čekejte prosím..."
+#define STRING_UNCONNECTED            "Tiskárna není připojena!"
+#define STRING_DISCONNECT_INFO        "Nyní můžete tiskárnu ovládat z počítače!"
+#define STRING_LOADING                "Nahrávám..."
+#define STRING_POWER_FAILED           "Obnovit tisk?"
+#define STRING_CONTINUE               "Pokračovat"
+#define STRING_CANCEL                 "Zrušit"
+#define STRING_ADJUST_TITLE           "Kalibrace dotykové obrazovky"
+#define STRING_ADJUST_INFO            "Dotkněte se postupně všech bodů"
+#define STRING_ADJUST_OK              "Kalibrace úspěšná"
+#define STRING_ADJUST_FAILED          "Kalibrace selhala, zopakujte znovu"
+#define STRING_WARNING                "Varování"
+#define STRING_STOP_PRINT             "Zastavit tisk?"
+#define STRING_CONFIRM                "Potvrdit"
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "Chyba při čtení SD karty!"
+#define STRING_TFTSD_INSERTED         "SD karta vložena!"
+#define STRING_TFTSD_REMOVED          "SD karta vyjmuta!"
+#define STRING_U_DISK                 "USB Disk"
+#define STRING_READ_U_DISK_ERROR      "Chyba při čtení USB disku!"
+#define STRING_U_DISK_INSERTED        "USB disk  vložen!"
+#define STRING_U_DISK_REMOVED         "USB disk vyjmut!"
+#define STRING_ONBOARDSD              "Onboard SD"
+#define STRING_READ_ONBOARDSD_ERROR   "Chyba při čtení Onboard SD!"
+#define STRING_FILAMENT_SENSOR        "Senzor filamentu"
+#define STRING_FILAMENT_RUNOUT        "Došel filament!"
+#define STRING_PREHEAT                "Zahřát"
+#define STRING_PREHEAT_BOTH           "Vše"
+#define STRING_IS_PAUSE               "Během tisku nelze\nextrudovat,\nmám pozastavit tisk?"
+#define STRING_AUTO_SHUT_DOWN         "Auto.vypnutí"
+#define STRING_UNIFIEDMOVE            "Pohyb"
+#define STRING_UNIFIEDHEAT            "Teplota"
+#define STRING_COOLDOWN               "Zchladit"
+#define STRING_EMERGENCYSTOP          "!!STOP!!"
+#define STRING_TOUCH_TO_EXIT          "Pro návrat se dotkněte obrazovky..."
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Čekám na zchladnutí\nextruderu pod %d℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Vynutit"
+#define STRING_SHUTTING_DOWN          "Vypínám se..."
+#define STRING_PARAMETER_SETTING      "Parametry"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "zobrazit ACK Terminálu"
+#define STRING_INVERT_XAXIS           "Otočit osu X"
+#define STRING_INVERT_YAXIS           "Otočit osu Y"
+#define STRING_INVERT_ZAXIS           "Otočit osu Z"
+#define STRING_MOVE_SPEED             "Rychlost pohybu X Y Z"
+#define STRING_KNOB_LED               "Rotační knob LED"
+#define STRING_KNOB_LED_IDLE          "Rotační knob LED idle"
+#define STRING_M0_PAUSE               "Pauza po příkazu M0"
+#define STRING_SEND_START_GCODE       "Spustit Gcode před tiskem"
+#define STRING_SEND_END_GCODE         "Spustit Gcode po tisku"
+#define STRING_SEND_CANCEL_GCODE      "Přerušení tisku"
+#define STRING_PERSISTENT_STATUS_INFO "Trvalé zobrazení stavu"
+#define STRING_FILE_LISTMODE          "Zobrazit soub.jako seznam"
+#define STRING_CURRENT_SETTING        "Proud motorů (mA)"
+#define STRING_STEPS_SETTING          "Kroků/mm"
+#define STRING_MAXFEEDRATE            "Max rychlost"
+#define STRING_MAXACCELERATION        "Max zrychlení"
+#define STRING_ACCELERATION           "Zrychlení"
+#define STRING_PRINT_ACCELERATION     "Zrychlení při tisku"
+#define STRING_RETRACT_ACCELERATION   "Zrychlení retrakcí"
+#define STRING_TRAVEL_ACCELERATION    "Zrychlení při přesunu"
+#define STRING_JERK                   "Jerk-trhnutí"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "Citlivost nárazu TMC"
+#define STRING_FWRETRACT              "FW Zatažení"
+#define STRING_FWRECOVER              "FW Obnovení"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Všechna nastavení budou\nobnovena na výchozí\nhodnoty. Pokračovat?"
+#define STRING_RESET_SETTINGS_DONE    "Resetování všech nastavení\nbylo úspěšně provedeno.\nRestartujte zařízení."
+#define STRING_INFO                   "Info"
+#define STRING_LCD_BRIGHTNESS         "LCD Jas"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD snížení jasu"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD snížení jasu po"
+#define STRING_5_SECONDS              "5 sec."
+#define STRING_10_SECONDS             "10 sec."
+#define STRING_30_SECONDS             "30 sec."
+#define STRING_60_SECONDS             "1 min."
+#define STRING_120_SECONDS            "2 min."
+#define STRING_300_SECONDS            "5 min."
+#define STRING_CUSTOM_SECONDS         "Vlastní"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Celoobrazovkový režim Marlin"
+#define STRING_PLR_EN                 "Obnova po ztrátě napájení"
+#define STRING_SETTING_SAVE           "Uložení nastavení"
+#define STRING_SETTING_RESET          "Reset nastavení"
+#define STRING_SETTING_RESTORE        "Obnovení nastavení"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Uložit nastavení tiskárny\ndo EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Obnovit nastavení \nz EEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM na výchozí hodnoty?"
+#define STRING_RETRACT_FEEDRATE       "Rychlost zatažení"
+#define STRING_RETRACT_LENGTH         "Délka zatažení"
+#define STRING_RETRACT_SWAP_LENGTH    "Délka zatažení Swap"
+#define STRING_RETRACT_Z_LIFT         "Z zvýšení při zatažení"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Rychlost obnovení"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Rychlost obnovení Swap"
+#define STRING_RECOVER_LENGTH         "Délka obnovení"
+#define STRING_SWAP_RECOVER_LENGTH    "Délka obnovení Swap"
+#define STRING_START_PRINT            "Spustit tisk:\n %s?"
+#define STRING_ACK_NOTIFICATION       "Styl oznámení ACK"
+#define STRING_LEVELING_EDGE_DISTANCE "Vzdálenost nivelačních bodů\n stolku od kraje"
+#define STRING_XY_UNLOCK              "Uvolnit XY"
+#define STRING_TUNING                 "Kalibrace"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autokalibrace"
+#define STRING_PID_START_INFO         "PID autokalibrace bude spuštěna.\n Bude to cvíli trvat. Pokračovat?"
+#define STRING_PID_START_INFO_2       "PID autokalibrace probíhá!"
+#define STRING_PID_START_INFO_3       "NEDOTÝKEJ se displeje dokud není dokončeno\n (Zelená LED svítí)!"
+#define STRING_TUNE_EXTRUDER          "E-Krok"
+#define STRING_TUNE_EXT_EXTRUDE_100   "100mm Vysunutí"
+#define STRING_TUNE_EXT_TEMP          "Kalibrace extruderu, ohřev"
+#define STRING_TUNE_EXT_TEMPLOW       "Požadovaná teplota je příliš nízká!\nMinimální teplota: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Teplota ještě není na požadované hodnotě"
+#define STRING_TUNE_EXT_MARK120MM     "Označ 120mm on fillamentu\nStlač '%s' pokud jsi připraven.\nZměř zbývající délku\npo vytlačení."
+#define STRING_TUNE_EXT_HEATOFF       "Vypnout topení?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Nastavení E-Kroků"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "Nové E-kroky uloženy!\nNezapmeň \nuložit do EEPROM.\nNová hodnota: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Zbývající délka:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Původní E-kroky: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "Nový E-kroky: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Připojení"
+#define STRING_OFFSET_TOOL            "Offset 2.trysky"
+#define STRING_HYBRID_THRESHOLD       "TMC Hybridní práh"
+#define STRING_NOTIFICATIONS          "Oznámení"
+#define STRING_MESH_EDITOR            "Mesh síť"
+#define STRING_MESH_TUNER             "Mesh nastavení"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Čeština"
     #define STRING_HEAT                   "Teplota"
     #define STRING_MOVE                   "Posunout"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_de.h b/TFT/src/User/API/Language/language_de.h
index 93382eb1f6..418eea9736 100644
--- a/TFT/src/User/API/Language/language_de.h
+++ b/TFT/src/User/API/Language/language_de.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_DE_H_
-#define _LANGUAGE_DE_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Deutsch"
+#define STRING_HEAT                   "heizen"
+#define STRING_MOVE                   "bewegen"
+#define STRING_HOME                   "Home XYZ"
+#define STRING_DISABLE_STEPPERS       "alle lösen"
+#define STRING_PRINT                  "drucken"
+#define STRING_EXTRUDE                "Extruder"
+#define STRING_FAN                    "Lüfter"
+#define STRING_SETTINGS               "Einstellungen"
+#define STRING_SCREEN_SETTINGS        "Bildschirm"
+#define STRING_MACHINE_SETTINGS       "Drucker"
+#define STRING_FEATURE_SETTINGS       "Andere"
+#define STRING_SOUND                  "Töne"
+#define STRING_TOUCH_SOUND            "Eingabe"
+#define STRING_TOAST_SOUND            "Toasts"
+#define STRING_ALERT_SOUND            "Popups & Alarme"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "auschalten (PS_ON)"
+#define STRING_RGB_SETTINGS           "LED Farbe"
+#define STRING_RGB_OFF                "LED aus"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Extras"
+#define STRING_LEVELING               "justieren"
+#define STRING_POINT_1                "Punkt 1"
+#define STRING_POINT_2                "Punkt 2"
+#define STRING_POINT_3                "Punkt 3"
+#define STRING_POINT_4                "Punkt 4"
+#define STRING_POINT_5                "Punkt 5"
+#define STRING_BED_LEVELING           "vermessen"
+#define STRING_BL_COMPLETE            "Bett-Vermessung ausgeführt"
+#define STRING_BL_SMART_FILL          "Fehlende Messpunkte\nwurden berechent.\n \nHinweis: Bitte speichern!"
+#define STRING_BL_ENABLE              "BL: an"
+#define STRING_BL_DISABLE             "BL: aus"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Bett Vermessung (Raster)"
+#define STRING_ABL_SETTINGS           "Bett Vermessung (auto)"
+#define STRING_ABL_SETTINGS_BBL       "Bett Vermessung (bilinear)"
+#define STRING_ABL_SETTINGS_UBL       "Bett Vermessung (Unified)"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "im Slot speichern"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "aus Slot laden"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Slot für den nächsten\nNeustart merken?(Im EEPROM speichern)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "testen"
+#define STRING_BLTOUCH_DEPLOY         "ausfahren"
+#define STRING_BLTOUCH_STOW           "einziehen"
+#define STRING_BLTOUCH_REPEAT         "widerholen"
+#define STRING_Z_OFFSET               "Delta Z"
+#define STRING_PROBE_OFFSET           "Delta Fühler"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Sicher?"
+#define STRING_DOWN                   "ab"
+#define STRING_UP                     "auf"
+#define STRING_SAVE                   "speichern"
+#define STRING_RESTORE                "laden"
+#define STRING_RESET                  "zurücksetzen"
+#define STRING_DEFAULT                "Standard"
+#define STRING_CLEAR                  "löschen"
+#define STRING_NEXT                   "nächster"
+#define STRING_DISTANCE               "Abstand"
+#define STRING_INVALID_VALUE          "Ungültige(r) Wert(e)"
+#define STRING_TIMEOUT_REACHED        "Timeout erreicht!"
+#define STRING_PROCESS_RUNNING        "Prozess läuft bereits!"
+#define STRING_PROCESS_COMPLETED      "Prozess fertiggestellt!"
+#define STRING_PROCESS_ABORTED        "Prozess abgebrochen!"
+#define STRING_INC                    "erhöhen"
+#define STRING_DEC                    "verringern"
+#define STRING_NOZZLE                 "Düse"
+#define STRING_BED                    "Heizbett"
+#define STRING_CHAMBER                "Kammer"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Stop"
+#define STRING_BACK                   "zurück"
+#define STRING_PAGE_UP                "Seite hoch"
+#define STRING_PAGE_DOWN              "Seite runter"
+#define STRING_PAUSE                  "Pause"
+#define STRING_RESUME                 "Wiederaufnahme"
+#define STRING_LOAD                   "laden"
+#define STRING_UNLOAD                 "entladen"
+#define STRING_SLOW_SPEED             "langsam"
+#define STRING_NORMAL_SPEED           "normal"
+#define STRING_FAST_SPEED             "schnell"
+#define STRING_FAN_FULL_SPEED         "alles"
+#define STRING_FAN_HALF_SPEED         "halb"
+#define STRING_ROTATE_UI              "UI drehen"
+#define STRING_TOUCHSCREEN_ADJUST     "TSC kalib."
+#define STRING_MORE                   "mehr"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Status"
+#define STRING_SIMULATOR_BG_COLOR     "Hintergrundfarbe Marlin"
+#define STRING_SIMULATOR_FONT_COLOR   "Schriftfarbe Marlin"
+#define STRING_WHITE                  "weiß"
+#define STRING_BLACK                  "schwarz"
+#define STRING_BLUE                   "blau"
+#define STRING_RED                    "rot"
+#define STRING_GREEN                  "grün"
+#define STRING_CYAN                   "cyan"
+#define STRING_YELLOW                 "gelb"
+#define STRING_BROWN                  "braun"
+#define STRING_GRAY                   "grau"
+#define STRING_ORANGE                 "orange"
+#define STRING_INDIGO                 "indigo"
+#define STRING_VIOLET                 "violet"
+#define STRING_MAGENTA                "magenta"
+#define STRING_PURPLE                 "lila"
+#define STRING_LIME                   "grüngelb"
+#define STRING_DARKBLUE               "dunkelblau"
+#define STRING_DARKGREEN              "dunkelgrün"
+#define STRING_DARKGRAY               "dunkelgrau"
+#define STRING_DISCONNECT             "trennen"
+#define STRING_BAUDRATE               "Baudrate"
+#define STRING_PERCENTAGE             "Prozent"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Geschw."
+#define STRING_PERCENTAGE_FLOW        "Fluss"
+#define STRING_VALUE_ZERO             "0"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "bereit"
+#define STRING_BUSY                   "Bitte warten ..."
+#define STRING_UNCONNECTED            "Keine Verbindung zum Drucker!"
+#define STRING_DISCONNECT_INFO        "Verbindung getrennt!"
+#define STRING_LOADING                "Lade ..."
+#define STRING_POWER_FAILED           "Druck fortsetzen?" //Question Sign
+#define STRING_CONTINUE               "fortsetzen"
+#define STRING_CANCEL                 "Abbruch" //Cancel Sign
+#define STRING_ADJUST_TITLE           "Touchscreen kalibrieren"
+#define STRING_ADJUST_INFO            "roten Punkt antippen"
+#define STRING_ADJUST_OK              "erfolgreich kalibriert"
+#define STRING_ADJUST_FAILED          "Kalibrierung fehlgeschlagen, erneut versuchen."
+#define STRING_WARNING                "Warnung" //Exclamation Sign
+#define STRING_STOP_PRINT             "Druck abbrechen?"
+#define STRING_CONFIRM                "OK" //Confirm Sign
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "TFT SD Lesefehler!"
+#define STRING_TFTSD_INSERTED         "SD-Karte eingesteckt!"
+#define STRING_TFTSD_REMOVED          "SD-Karte entfernt!"
+#define STRING_U_DISK                 "USB-Stick"
+#define STRING_READ_U_DISK_ERROR      "USB-Stick Lesefehler!"
+#define STRING_U_DISK_INSERTED        "USB-Stick eingesteckt!"
+#define STRING_U_DISK_REMOVED         "USB-Stick entfernt!"
+#define STRING_ONBOARDSD              "Onboard SD"
+#define STRING_READ_ONBOARDSD_ERROR   "Onboard SD Lesefehler!"
+#define STRING_FILAMENT_SENSOR        "Filament Sensor"
+#define STRING_FILAMENT_RUNOUT        "Filament alle!"
+#define STRING_PREHEAT                "vorheizen"
+#define STRING_PREHEAT_BOTH           "beide"
+#define STRING_IS_PAUSE               "Extrudieren während\nDruckvorgang nicht\nmöglich!\nDruck pausieren?"
+#define STRING_AUTO_SHUT_DOWN         "Automatisch AUS (PS_ON)"
+#define STRING_UNIFIEDMOVE            "Bewegung"
+#define STRING_UNIFIEDHEAT            "Heiz.Lüft."
+#define STRING_COOLDOWN               "abkühlen"
+#define STRING_EMERGENCYSTOP          "NOT AUS!"
+#define STRING_TOUCH_TO_EXIT          "Zum Verlassen, Bildschirm berühren."
+#define STRING_MAINMENU               "Menü"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Warte bis Hotend-\nTemperatur unter\n %d℃ fällt." // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "erzwinge"
+#define STRING_SHUTTING_DOWN          "Fahre herunter..."
+#define STRING_PARAMETER_SETTING      "Parameter"
+#define STRING_ON                     "AN"
+#define STRING_OFF                    "AUS"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Zeige ACK im Terminal"
+#define STRING_INVERT_XAXIS           "Invertiere X-Achse"
+#define STRING_INVERT_YAXIS           "Invertiere Y-Achse"
+#define STRING_INVERT_ZAXIS           "Invertiere Z-Achse"
+#define STRING_MOVE_SPEED             "Geschwindigkeit (XYZ)"
+#define STRING_KNOB_LED               "Drehknopf LED Farbe"
+#define STRING_KNOB_LED_IDLE          "Drehknopf LED idle Farbe"
+#define STRING_M0_PAUSE               "Pause durch M0 Befehl"
+#define STRING_SEND_START_GCODE       "Gcode vor Druck"
+#define STRING_SEND_END_GCODE         "Gcode nach Druck"
+#define STRING_SEND_CANCEL_GCODE      "Gcode bei Abbruch"
+#define STRING_PERSISTENT_STATUS_INFO "Speicherungs-Status"
+#define STRING_FILE_LISTMODE          "Datein als Liste"
+#define STRING_CURRENT_SETTING        "Treiber Strom (mA)"
+#define STRING_STEPS_SETTING          "Steps pro mm"
+#define STRING_MAXFEEDRATE            "max. Geschwindigkeit"
+#define STRING_MAXACCELERATION        "max. Beschleunigung"
+#define STRING_ACCELERATION           "Beschleunigung"
+#define STRING_PRINT_ACCELERATION     "Beschleunigung (Druck)"
+#define STRING_RETRACT_ACCELERATION   "Beschleunigung (Rückzug)"
+#define STRING_TRAVEL_ACCELERATION    "Beschleunigung (Fahrt)"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC Empfindlichkeit"
+#define STRING_FWRETRACT              "FW Rückzug"
+#define STRING_FWRECOVER              "FW Rückeinschub"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Hiermit werden alle\nEinstellungen zurückgesetzt. Fortfahren?"
+#define STRING_RESET_SETTINGS_DONE    "Einstellungen wurden\nerfolgreich zurückgesetzt.\nBitte neustarten."
+#define STRING_INFO                   "Info" //Info Sign
+#define STRING_LCD_BRIGHTNESS         "LCD Helligkeit"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD Helligkeit (Standby)"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD Timer Standby"
+#define STRING_5_SECONDS              "5 Sek."
+#define STRING_10_SECONDS             "10 Sek."
+#define STRING_30_SECONDS             "30 Sek."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Benutz."
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin Modus im Vollbild"
+#define STRING_PLR_EN                 "Wiederherstellung nach Stromausfall"
+#define STRING_SETTING_SAVE           "Einstellungen speichern"
+#define STRING_SETTING_RESET          "Einstellungen zurücksetzten"
+#define STRING_SETTING_RESTORE        "Einstellungen wiederherstellen"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Einstellungen im\nEEPROM speichern?"
+#define STRING_EEPROM_RESTORE_INFO    "Einstellungen aus\nEEPROM laden?"
+#define STRING_EEPROM_RESET_INFO      "Standardeinstellungen des Druckers wiederherstellen?"
+#define STRING_RETRACT_FEEDRATE       "Rückzugsgeschwindigkeit"
+#define STRING_RETRACT_LENGTH         "Rückzugslänge"
+#define STRING_RETRACT_SWAP_LENGTH    "Rückzugslänge (Wechsel)"
+#define STRING_RETRACT_Z_LIFT         "Z-Anhebung bei Rückzug"
+#define STRING_RETRACT_AUTO           "Auto-Rückzug über Firmware"
+#define STRING_RECOVER_FEEDRATE       "Geschw. Rückeinschub"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Geschw. Rückeinschub (Wechsel)"
+#define STRING_RECOVER_LENGTH         "zus. Länge Rückeinschub"
+#define STRING_SWAP_RECOVER_LENGTH    "zus. Länge Rückeinschub (Wechsel)"
+#define STRING_START_PRINT            "Druck starten:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK Benachrichtigungs-Stil"
+#define STRING_LEVELING_EDGE_DISTANCE "Bettecken-Abstand"
+#define STRING_XY_UNLOCK              "löse XY"
+#define STRING_TUNING                 "Justage"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune benötigt\neinige Zeit.\nWeitermachen?"
+#define STRING_PID_START_INFO_2       "PID autotune läuft!"
+#define STRING_PID_START_INFO_3       "Berühren Sie den Bildschirm erst bei Fertigstellung (Grüne LED)!"
+#define STRING_TUNE_EXTRUDER          "Steps anp."
+#define STRING_TUNE_EXT_EXTRUDE_100   "100mm ext."
+#define STRING_TUNE_EXT_TEMP          "Ext. Kalib. Temp."
+#define STRING_TUNE_EXT_TEMPLOW       "Temparatur zu niedrig!\nMinimale Temparatur: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temparatur hat gewünschten Wert noch nicht erreicht"
+#define STRING_TUNE_EXT_MARK120MM     "Filament 120 mm über Einlass markieren,\ndann '%s' drücken & nach Extrusion\nerneut messen"
+#define STRING_TUNE_EXT_HEATOFF       "Heizung abschalten?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "E-Steps einstellen"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "Neue E-Steps gespeichert!\nBitte auch im EEPROM speichern.\nNeuer Wert: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Restliche Länge:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Alte E-Steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "Neue E-Steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Verbindung"
+#define STRING_OFFSET_TOOL            "Abstand 2te Düse"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Benachrichtigungen"
+#define STRING_MESH_EDITOR            "Mesh edit."
+#define STRING_MESH_TUNER             "Mesh anp."
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Deutsch"
     #define STRING_HEAT                   "heizen"
     #define STRING_MOVE                   "bewegen"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_en.h b/TFT/src/User/API/Language/language_en.h
index 7ac2a459b9..220860d4f7 100644
--- a/TFT/src/User/API/Language/language_en.h
+++ b/TFT/src/User/API/Language/language_en.h
@@ -1,286 +1,285 @@
-#ifndef _LANGUAGE_EN_H_
-#define _LANGUAGE_EN_H_
+#pragma once
 
-    #define STRING_LANGUAGE               "English"
-    #define STRING_HEAT                   "Heat"
-    #define STRING_MOVE                   "Move"
-    #define STRING_HOME                   "Home"
-    #define STRING_DISABLE_STEPPERS       "Disarm All"
-    #define STRING_PRINT                  "Print"
-    #define STRING_EXTRUDE                "Extrude"
-    #define STRING_FAN                    "Fan"
-    #define STRING_SETTINGS               "Settings"
-    #define STRING_SCREEN_SETTINGS        "Screen"
-    #define STRING_MACHINE_SETTINGS       "Machine"
-    #define STRING_FEATURE_SETTINGS       "Feature"
-    #define STRING_SOUND                  "Sound"
-    #define STRING_TOUCH_SOUND            "Touch sounds"
-    #define STRING_TOAST_SOUND            "Toast Notifications"
-    #define STRING_ALERT_SOUND            "Popups and Alerts"
-    #define STRING_SHUT_DOWN              "Shut Down"
-    #define STRING_RGB_SETTINGS           "LED Color"
-    #define STRING_RGB_OFF                "LED Off"
-    #define STRING_TERMINAL               "Terminal"
-    #define STRING_CUSTOM                 "Custom"
-    #define STRING_LEVELING               "Leveling"
-    #define STRING_POINT_1                "Point 1"
-    #define STRING_POINT_2                "Point 2"
-    #define STRING_POINT_3                "Point 3"
-    #define STRING_POINT_4                "Point 4"
-    #define STRING_POINT_5                "Point 5"
-    #define STRING_BED_LEVELING           "Bed Level"
-    #define STRING_BL_COMPLETE            "Bed Leveling Complete"
-    #define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
-    #define STRING_BL_ENABLE              "BL: on"
-    #define STRING_BL_DISABLE             "BL: off"
-    #define STRING_ABL                    "ABL"
-    #define STRING_BBL                    "BBL"
-    #define STRING_UBL                    "UBL"
-    #define STRING_MBL                    "MBL"
-    #define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
-    #define STRING_ABL_SETTINGS           "Auto Bed Leveling"
-    #define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
-    #define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
-    #define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
-    #define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
-    #define STRING_ABL_SLOT0              "Slot 0"
-    #define STRING_ABL_SLOT1              "Slot 1"
-    #define STRING_ABL_SLOT2              "Slot 2"
-    #define STRING_ABL_SLOT3              "Slot 3"
-    #define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
-    #define STRING_ABL_Z                  "Z Fade"
-    #define STRING_BLTOUCH                "BLTouch"
-    #define STRING_BLTOUCH_TEST           "Test"
-    #define STRING_BLTOUCH_DEPLOY         "Deploy"
-    #define STRING_BLTOUCH_STOW           "Stow"
-    #define STRING_BLTOUCH_REPEAT         "Repeat"
-    #define STRING_Z_OFFSET               "Z Offset"
-    #define STRING_PROBE_OFFSET           "Probe Offset"
-    #define STRING_HOME_OFFSET            "Home Offset"
-    #define STRING_CONFIRMATION           "Are you sure?"
-    #define STRING_DOWN                   "Down"
-    #define STRING_UP                     "Up"
-    #define STRING_SAVE                   "Save"
-    #define STRING_RESTORE                "Restore"
-    #define STRING_RESET                  "Reset"
-    #define STRING_DEFAULT                "Default"
-    #define STRING_CLEAR                  "Clear"
-    #define STRING_NEXT                   "Next"
-    #define STRING_DISTANCE               "Distance"
-    #define STRING_INVALID_VALUE          "Invalid value(s)"
-    #define STRING_TIMEOUT_REACHED        "Timeout reached!"
-    #define STRING_PROCESS_RUNNING        "Process already running!"
-    #define STRING_PROCESS_COMPLETED      "Process completed!"
-    #define STRING_PROCESS_ABORTED        "Process aborted!"
-    #define STRING_INC                    "Increase"
-    #define STRING_DEC                    "Decrease"
-    #define STRING_NOZZLE                 "Nozzle"
-    #define STRING_BED                    "Hotbed"
-    #define STRING_CHAMBER                "Chamber"
-    #define STRING_START                  "Start"
-    #define STRING_STOP                   "Stop"
-    #define STRING_BACK                   "Back"
-    #define STRING_PAGE_UP                "Page up"
-    #define STRING_PAGE_DOWN              "Page down"
-    #define STRING_PAUSE                  "Pause"
-    #define STRING_RESUME                 "Resume"
-    #define STRING_LOAD                   "Load"
-    #define STRING_UNLOAD                 "Unload"
-    #define STRING_LOAD_UNLOAD            "Load/Unload"
-    #define STRING_LOAD_UNLOAD_SHORT      "(Un)Load"
-    #define STRING_SLOW_SPEED             "Slow"
-    #define STRING_NORMAL_SPEED           "Normal"
-    #define STRING_FAST_SPEED             "Fast"
-    #define STRING_FAN_FULL_SPEED         "Full"
-    #define STRING_FAN_HALF_SPEED         "Half"
-    #define STRING_ROTATE_UI              "Rotate UI"
-    #define STRING_TOUCHSCREEN_ADJUST     "TSC Adjust"
-    #define STRING_MORE                   "More"
-    #define STRING_SCREEN_INFO            "Info"
-    #define STRING_STATUS                 "Info"
-    #define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
-    #define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
-    #define STRING_WHITE                  "White"
-    #define STRING_BLACK                  "Black"
-    #define STRING_BLUE                   "Blue"
-    #define STRING_RED                    "Red"
-    #define STRING_GREEN                  "Green"
-    #define STRING_CYAN                   "Cyan"
-    #define STRING_YELLOW                 "Yellow"
-    #define STRING_BROWN                  "Brown"
-    #define STRING_GRAY                   "Gray"
-    #define STRING_ORANGE                 "Orange"
-    #define STRING_INDIGO                 "Indigo"
-    #define STRING_VIOLET                 "Violet"
-    #define STRING_MAGENTA                "Magenta"
-    #define STRING_PURPLE                 "Purple"
-    #define STRING_LIME                   "Lime"
-    #define STRING_DARKBLUE               "DarkBlue"
-    #define STRING_DARKGREEN              "DarkGreen"
-    #define STRING_DARKGRAY               "DarkGray"
-    #define STRING_DISCONNECT             "Disconnect"
-    #define STRING_BAUDRATE               "BaudRate"
-    #define STRING_PERCENTAGE             "Percentage"
-    #define STRING_BABYSTEP               "BabyStep"
-    #define STRING_PERCENTAGE_SPEED       "Speed"
-    #define STRING_PERCENTAGE_FLOW        "Flow"
-    #define STRING_VALUE_ZERO             "Zero"
-    #define STRING_1_DEGREE               "1℃"
-    #define STRING_5_DEGREE               "5℃"
-    #define STRING_10_DEGREE              "10℃"
-    #define STRING_X_INC                  "X+"
-    #define STRING_Y_INC                  "Y+"
-    #define STRING_Z_INC                  "Z+"
-    #define STRING_X_DEC                  "X-"
-    #define STRING_Y_DEC                  "Y-"
-    #define STRING_Z_DEC                  "Z-"
-    #define STRING_X                      "X"
-    #define STRING_Y                      "Y"
-    #define STRING_Z                      "Z"
-    #define STRING_001_MM                 "0.01mm"
-    #define STRING_01_MM                  "0.1mm"
-    #define STRING_1_MM                   "1mm"
-    #define STRING_5_MM                   "5mm"
-    #define STRING_10_MM                  "10mm"
-    #define STRING_100_MM                 "100mm"
-    #define STRING_200_MM                 "200mm"
-    #define STRING_1_PERCENT              "1%"
-    #define STRING_5_PERCENT              "5%"
-    #define STRING_10_PERCENT             "10%"
-    #define STRING_PERCENT_VALUE          "%d%%"
-    #define STRING_READY                  "Ready"
-    #define STRING_BUSY                   "Busy processing, please wait..."
-    #define STRING_UNCONNECTED            "No printer attached!"
-    #define STRING_DISCONNECT_INFO        "Now you can control the printer by your computer!"
-    #define STRING_LOADING                "Loading..."
-    #define STRING_POWER_FAILED           "Continue printing?" //Question Sign
-    #define STRING_CONTINUE               "Continue"
-    #define STRING_CANCEL                 "\u088F Cancel" //Cancel Sign
-    #define STRING_ADJUST_TITLE           "Touch Screen Calibration"
-    #define STRING_ADJUST_INFO            "Please click on the red dot"
-    #define STRING_ADJUST_OK              "Adjustment Success"
-    #define STRING_ADJUST_FAILED          "Adjustment failed, Please Try Again"
-    #define STRING_WARNING                "Warning" //Exclamation Sign
-    #define STRING_STOP_PRINT             "Stop printing?"
-    #define STRING_CONFIRM                "\u088E OK" //Confirm Sign
-    #define STRING_TFTSD                  "TFT SD"
-    #define STRING_READ_TFTSD_ERROR       "Read TFT SD card error!"
-    #define STRING_TFTSD_INSERTED         "Card inserted!"
-    #define STRING_TFTSD_REMOVED          "Card removed!"
-    #define STRING_U_DISK                 "U Disk"
-    #define STRING_READ_U_DISK_ERROR      "Read U Disk error!"
-    #define STRING_U_DISK_INSERTED        "U Disk inserted!"
-    #define STRING_U_DISK_REMOVED         "U Disk removed!"
-    #define STRING_ONBOARDSD              "OnboardSD"
-    #define STRING_READ_ONBOARDSD_ERROR   "Read Onboard SD card error!"
-    #define STRING_FILAMENT_SENSOR        "Filament sensor"
-    #define STRING_FILAMENT_RUNOUT        "filament runout!"
-    #define STRING_PREHEAT                "Preheat"
-    #define STRING_PREHEAT_BOTH           "Both"
-    #define STRING_IS_PAUSE               "Unable to extrude when\nprinting.\nPause printing?"
-    #define STRING_AUTO_SHUT_DOWN         "Auto Power"
-    #define STRING_UNIFIEDMOVE            "Movement"
-    #define STRING_UNIFIEDHEAT            "Heat/Fan"
-    #define STRING_COOLDOWN               "Cool Down"
-    #define STRING_EMERGENCYSTOP          "EM. STOP"
-    #define STRING_TOUCH_TO_EXIT          "Touch anywhere to exit"
-    #define STRING_MAINMENU               "Menu"
-    #define STRING_WAIT_TEMP_SHUT_DOWN    "Wait for the hotend\ntemperature to be\nlower than %d ℃"
-    #define STRING_FORCE_SHUT_DOWN        "Force"
-    #define STRING_SHUTTING_DOWN          "Shutting down..."
-    #define STRING_PARAMETER_SETTING      "Parameter Settings"
-    #define STRING_ON                     "ON"
-    #define STRING_OFF                    "OFF"
-    #define STRING_SMART                  "SMART"
-    #define STRING_TERMINAL_ACK           "Show ACK in Terminal"
-    #define STRING_INVERT_XAXIS           "Invert X Axis"
-    #define STRING_INVERT_YAXIS           "Invert Y Axis"
-    #define STRING_INVERT_ZAXIS           "Invert Z Axis"
-    #define STRING_MOVE_SPEED             "Move speed(X Y Z)"
-    #define STRING_KNOB_LED               "Rotary Knob LED"
-    #define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
-    #define STRING_M0_PAUSE               "Paused by M0 command"
-    #define STRING_SEND_START_GCODE       "Start Gcode before print"
-    #define STRING_SEND_END_GCODE         "End Gcode after print"
-    #define STRING_SEND_CANCEL_GCODE      "Cancel Gcode"
-    #define STRING_PERSISTENT_STATUS_INFO "Persistent Status Info"
-    #define STRING_FILE_LISTMODE          "Files viewer List Mode"
-    #define STRING_CURRENT_SETTING        "Driver Current (mA)"
-    #define STRING_STEPS_SETTING          "Steps per mm"
-    #define STRING_MAXFEEDRATE            "Max Feed Rate"
-    #define STRING_MAXACCELERATION        "Max Acceleration"
-    #define STRING_ACCELERATION           "Acceleration"
-    #define STRING_PRINT_ACCELERATION     "Print Acceleration"
-    #define STRING_RETRACT_ACCELERATION   "Retract Acceleration"
-    #define STRING_TRAVEL_ACCELERATION    "Travel Acceleration"
-    #define STRING_JERK                   "Jerk"
-    #define STRING_JUNCTION_DEVIATION     "Junction Deviation"
-    #define STRING_BUMP_SENSITIVITY       "TMC bump sensitivity"
-    #define STRING_FWRETRACT              "FW Retraction"
-    #define STRING_FWRECOVER              "FW Retraction Recover"
-    #define STRING_LIN_ADVANCE            "Linear Advance"
-    #define STRING_RESET_SETTINGS_INFO    "Reset all settings to\ndefault values?"
-    #define STRING_RESET_SETTINGS_DONE    "Reset all settings\nsuccessful.\nplease restart the device."
-    #define STRING_INFO                   "Info" //Info Sign
-    #define STRING_LCD_BRIGHTNESS         "LCD Brightness"
-    #define STRING_LCD_BRIGHTNESS_DIM     "LCD Brightness dim"
-    #define STRING_LCD_DIM_IDLE_TIMER     "LCD dim idle timer"
-    #define STRING_5_SECONDS              "5 Sec."
-    #define STRING_10_SECONDS             "10 Sec."
-    #define STRING_30_SECONDS             "30 Sec."
-    #define STRING_60_SECONDS             "1 Min."
-    #define STRING_120_SECONDS            "2 Min."
-    #define STRING_300_SECONDS            "5 Min."
-    #define STRING_CUSTOM_SECONDS         "Custom"
-    #define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
-    #define STRING_PLR_EN                 "Power loss recovery"
-    #define STRING_SETTING_SAVE           "Save settings"
-    #define STRING_SETTING_RESET          "Reset default settings"
-    #define STRING_SETTING_RESTORE        "Restore settings"
-    #define STRING_EEPROM_SETTINGS        "EEPROM"
-    #define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
-    #define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
-    #define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
-    #define STRING_RETRACT_FEEDRATE       "Retract feedrate"
-    #define STRING_RETRACT_LENGTH         "Retract length"
-    #define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
-    #define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
-    #define STRING_RETRACT_AUTO           "Auto Firmware Retract"
-    #define STRING_RECOVER_FEEDRATE       "Recover feedrate"
-    #define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
-    #define STRING_RECOVER_LENGTH         "Extra recover length"
-    #define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
-    #define STRING_START_PRINT            "Start Printing:\n %s?"
-    #define STRING_ACK_NOTIFICATION       "ACK notification style"
-    #define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
-    #define STRING_XY_UNLOCK              "Disarm XY"
-    #define STRING_TUNING                 "Tuning"
-    #define STRING_PID                    "PID"
-    #define STRING_PID_TITLE              "PID autotune"
-    #define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
-    #define STRING_PID_START_INFO_2       "PID autotune in progress!"
-    #define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
-    #define STRING_TUNE_EXTRUDER          "Tune steps"
-    #define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
-    #define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
-    #define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
-    #define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
-    #define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
-    #define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
-    #define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
-    #define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
-    #define STRING_TUNE_EXT_MEASURED      "Length remaining:"
-    #define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
-    #define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
-    #define STRING_CONNECTION_SETTINGS    "Connection"
-    #define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
-    #define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
-    #define STRING_NOTIFICATIONS          "Notifications"
-    #define STRING_MESH_EDITOR            "Mesh edit"
-    #define STRING_MESH_TUNER             "Mesh tuner"
-    #define STRING_CASE_LIGHT             "Case light"
-    #define STRING_LOAD_STARTED           "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by."
-    #define STRING_UNLOAD_STARTED         "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by."
-    #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"
-
-#endif
+#define STRING_LANGUAGE               "English"
+#define STRING_HEAT                   "Heat"
+#define STRING_MOVE                   "Move"
+#define STRING_HOME                   "Home"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Print"
+#define STRING_EXTRUDE                "Extrude"
+#define STRING_FAN                    "Fan"
+#define STRING_SETTINGS               "Settings"
+#define STRING_SCREEN_SETTINGS        "Screen"
+#define STRING_MACHINE_SETTINGS       "Machine"
+#define STRING_FEATURE_SETTINGS       "Feature"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Shut Down"
+#define STRING_RGB_SETTINGS           "LED Color"
+#define STRING_RGB_OFF                "LED Off"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Custom"
+#define STRING_EVENT_LED_MODE         "Event led mode"
+#define STRING_LEVELING               "Leveling"
+#define STRING_POINT_1                "Point 1"
+#define STRING_POINT_2                "Point 2"
+#define STRING_POINT_3                "Point 3"
+#define STRING_POINT_4                "Point 4"
+#define STRING_POINT_5                "Point 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Deploy"
+#define STRING_BLTOUCH_STOW           "Stow"
+#define STRING_BLTOUCH_REPEAT         "Repeat"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Probe Offset"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Save"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Increase"
+#define STRING_DEC                    "Decrease"
+#define STRING_NOZZLE                 "Nozzle"
+#define STRING_BED                    "Hotbed"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Stop"
+#define STRING_BACK                   "Back"
+#define STRING_PAGE_UP                "Page up"
+#define STRING_PAGE_DOWN              "Page down"
+#define STRING_PAUSE                  "Pause"
+#define STRING_RESUME                 "Resume"
+#define STRING_LOAD                   "Load"
+#define STRING_UNLOAD                 "Unload"
+#define STRING_LOAD_UNLOAD            "Load/Unload"
+#define STRING_LOAD_UNLOAD_SHORT      "(Un)Load"
+#define STRING_SLOW_SPEED             "Slow"
+#define STRING_NORMAL_SPEED           "Normal"
+#define STRING_FAST_SPEED             "Fast"
+#define STRING_FAN_FULL_SPEED         "Full"
+#define STRING_FAN_HALF_SPEED         "Half"
+#define STRING_ROTATE_UI              "Rotate UI"
+#define STRING_TOUCHSCREEN_ADJUST     "TSC Adjust"
+#define STRING_MORE                   "More"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Info"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
+#define STRING_WHITE                  "White"
+#define STRING_BLACK                  "Black"
+#define STRING_BLUE                   "Blue"
+#define STRING_RED                    "Red"
+#define STRING_GREEN                  "Green"
+#define STRING_CYAN                   "Cyan"
+#define STRING_YELLOW                 "Yellow"
+#define STRING_BROWN                  "Brown"
+#define STRING_GRAY                   "Gray"
+#define STRING_ORANGE                 "Orange"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Violet"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Purple"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "DarkBlue"
+#define STRING_DARKGREEN              "DarkGreen"
+#define STRING_DARKGRAY               "DarkGray"
+#define STRING_DISCONNECT             "Disconnect"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Percentage"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Speed"
+#define STRING_PERCENTAGE_FLOW        "Flow"
+#define STRING_VALUE_ZERO             "Zero"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Ready"
+#define STRING_BUSY                   "Busy processing, please wait..."
+#define STRING_UNCONNECTED            "No printer attached!"
+#define STRING_DISCONNECT_INFO        "Now you can control the printer by your computer!"
+#define STRING_LOADING                "Loading..."
+#define STRING_POWER_FAILED           "Continue printing?" //Question Sign
+#define STRING_CONTINUE               "Continue"
+#define STRING_CANCEL                 "\u088F Cancel" //Cancel Sign
+#define STRING_ADJUST_TITLE           "Touch Screen Calibration"
+#define STRING_ADJUST_INFO            "Please click on the red dot"
+#define STRING_ADJUST_OK              "Adjustment Success"
+#define STRING_ADJUST_FAILED          "Adjustment failed, Please Try Again"
+#define STRING_WARNING                "Warning" //Exclamation Sign
+#define STRING_STOP_PRINT             "Stop printing?"
+#define STRING_CONFIRM                "\u088E OK" //Confirm Sign
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "Read TFT SD card error!"
+#define STRING_TFTSD_INSERTED         "Card inserted!"
+#define STRING_TFTSD_REMOVED          "Card removed!"
+#define STRING_U_DISK                 "U Disk"
+#define STRING_READ_U_DISK_ERROR      "Read U Disk error!"
+#define STRING_U_DISK_INSERTED        "U Disk inserted!"
+#define STRING_U_DISK_REMOVED         "U Disk removed!"
+#define STRING_ONBOARDSD              "OnboardSD"
+#define STRING_READ_ONBOARDSD_ERROR   "Read Onboard SD card error!"
+#define STRING_FILAMENT_SENSOR        "Filament sensor"
+#define STRING_FILAMENT_RUNOUT        "filament runout!"
+#define STRING_PREHEAT                "Preheat"
+#define STRING_PREHEAT_BOTH           "Both"
+#define STRING_IS_PAUSE               "Unable to extrude when\nprinting.\nPause printing?"
+#define STRING_AUTO_SHUT_DOWN         "Auto Power"
+#define STRING_UNIFIEDMOVE            "Movement"
+#define STRING_UNIFIEDHEAT            "Heat/Fan"
+#define STRING_COOLDOWN               "Cool Down"
+#define STRING_EMERGENCYSTOP          "EM. STOP"
+#define STRING_TOUCH_TO_EXIT          "Touch anywhere to exit"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Wait for the hotend\ntemperature to be\nlower than %d ℃"
+#define STRING_FORCE_SHUT_DOWN        "Force"
+#define STRING_SHUTTING_DOWN          "Shutting down..."
+#define STRING_PARAMETER_SETTING      "Parameter Settings"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Show ACK in Terminal"
+#define STRING_INVERT_XAXIS           "Invert X Axis"
+#define STRING_INVERT_YAXIS           "Invert Y Axis"
+#define STRING_INVERT_ZAXIS           "Invert Z Axis"
+#define STRING_MOVE_SPEED             "Move speed(X Y Z)"
+#define STRING_KNOB_LED               "Rotary Knob LED"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Paused by M0 command"
+#define STRING_SEND_START_GCODE       "Start Gcode before print"
+#define STRING_SEND_END_GCODE         "End Gcode after print"
+#define STRING_SEND_CANCEL_GCODE      "Cancel Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Persistent Status Info"
+#define STRING_FILE_LISTMODE          "Files viewer List Mode"
+#define STRING_CURRENT_SETTING        "Driver Current (mA)"
+#define STRING_STEPS_SETTING          "Steps per mm"
+#define STRING_MAXFEEDRATE            "Max Feed Rate"
+#define STRING_MAXACCELERATION        "Max Acceleration"
+#define STRING_ACCELERATION           "Acceleration"
+#define STRING_PRINT_ACCELERATION     "Print Acceleration"
+#define STRING_RETRACT_ACCELERATION   "Retract Acceleration"
+#define STRING_TRAVEL_ACCELERATION    "Travel Acceleration"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC bump sensitivity"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Reset all settings to\ndefault values?"
+#define STRING_RESET_SETTINGS_DONE    "Reset all settings\nsuccessful.\nplease restart the device."
+#define STRING_INFO                   "Info" //Info Sign
+#define STRING_LCD_BRIGHTNESS         "LCD Brightness"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD Brightness dim"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD dim idle timer"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset default settings"
+#define STRING_SETTING_RESTORE        "Restore settings"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start Printing:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Disarm XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+#define STRING_LOAD_STARTED           "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by."
+#define STRING_UNLOAD_STARTED         "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by."
+#define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"
diff --git a/TFT/src/User/API/Language/language_es.h b/TFT/src/User/API/Language/language_es.h
index c815cbf40f..9a047719bf 100644
--- a/TFT/src/User/API/Language/language_es.h
+++ b/TFT/src/User/API/Language/language_es.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_ES_H_
-#define _LANGUAGE_ES_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Español"
+#define STRING_HEAT                   "Calentar"
+#define STRING_MOVE                   "Mover"
+#define STRING_HOME                   "Origen"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Imprimir"
+#define STRING_EXTRUDE                "Extruir"
+#define STRING_FAN                    "Ventilar"
+#define STRING_SETTINGS               "Configurar"
+#define STRING_SCREEN_SETTINGS        "Pantalla"
+#define STRING_MACHINE_SETTINGS       "Máquina"
+#define STRING_FEATURE_SETTINGS       "Añadidos"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Apagar"
+#define STRING_RGB_SETTINGS           "Color LED"
+#define STRING_RGB_OFF                "Apagar LED"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Personalizar"
+#define STRING_LEVELING               "Nivelar"
+#define STRING_POINT_1                "Punto 1"
+#define STRING_POINT_2                "Punto 2"
+#define STRING_POINT_3                "Punto 3"
+#define STRING_POINT_4                "Punto 4"
+#define STRING_POINT_5                "Punto 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Probar"
+#define STRING_BLTOUCH_DEPLOY         "Desplegar"
+#define STRING_BLTOUCH_STOW           "Plegar"
+#define STRING_BLTOUCH_REPEAT         "Repetir"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Sonda Compensar"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Grabar"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Aumentar"
+#define STRING_DEC                    "Disminur"
+#define STRING_NOZZLE                 "Punta"
+#define STRING_BED                    "Cama"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Parar"
+#define STRING_BACK                   "Volver"
+#define STRING_PAGE_UP                "Retroceder"
+#define STRING_PAGE_DOWN              "Avanzar"
+#define STRING_PAUSE                  "Pausar"
+#define STRING_RESUME                 "Continuar"
+#define STRING_LOAD                   "Cargar"
+#define STRING_UNLOAD                 "Descargar"
+#define STRING_SLOW_SPEED             "Despacio"
+#define STRING_NORMAL_SPEED           "Normal"
+#define STRING_FAST_SPEED             "Rápido"
+#define STRING_FAN_FULL_SPEED         "Todo"
+#define STRING_FAN_HALF_SPEED         "Mitad"
+#define STRING_ROTATE_UI              "Rotar"
+#define STRING_TOUCHSCREEN_ADJUST     "Calibrar"
+#define STRING_MORE                   "Más"
+#define STRING_SCREEN_INFO            "Informar"
+#define STRING_STATUS                 "Status"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
+#define STRING_WHITE                  "Blanco"
+#define STRING_BLACK                  "Negro"
+#define STRING_BLUE                   "Azul"
+#define STRING_RED                    "Rojo"
+#define STRING_GREEN                  "Verde"
+#define STRING_CYAN                   "Cyan"
+#define STRING_YELLOW                 "Amarillo"
+#define STRING_BROWN                  "Marrón"
+#define STRING_GRAY                   "Gris"
+#define STRING_ORANGE                 "Orange"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Violet"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Purple"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "DarkBlue"
+#define STRING_DARKGREEN              "DarkGreen"
+#define STRING_DARKGRAY               "DarkGray"
+#define STRING_DISCONNECT             "Desconectar"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Porcentaje"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Velocidad"
+#define STRING_PERCENTAGE_FLOW        "Flujo"
+#define STRING_VALUE_ZERO             "Cero"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "+X"
+#define STRING_Y_INC                  "+Y"
+#define STRING_Z_INC                  "+Z"
+#define STRING_X_DEC                  "-X"
+#define STRING_Y_DEC                  "-Y"
+#define STRING_Z_DEC                  "-Z"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Preparado"
+#define STRING_BUSY                   "Procesamiento ocupado, por favor espere..."
+#define STRING_UNCONNECTED            "¡No hay comunicación con impresora!"
+#define STRING_DISCONNECT_INFO        "¡Ahora puede controlar la impresora desde su ordenador!"
+#define STRING_LOADING                "Cargando..."
+#define STRING_POWER_FAILED           "¿Continuar imprimiendo?"
+#define STRING_CONTINUE               "Continuar"
+#define STRING_CANCEL                 "Cancelar"
+#define STRING_ADJUST_TITLE           "¡Calibrar la pantalla táctil"
+#define STRING_ADJUST_INFO            "Por favor haga clic en el punto rojo"
+#define STRING_ADJUST_OK              "Ajuste correcto"
+#define STRING_ADJUST_FAILED          "Ajuste fallido, por favor intentelo de nuevo"
+#define STRING_WARNING                "Advertencia"
+#define STRING_STOP_PRINT             "¿Desea parar la impresión?"
+#define STRING_CONFIRM                "Confirmar"
+#define STRING_TFTSD                  "SD TFT"
+#define STRING_READ_TFTSD_ERROR       "¡Error en la tarjeta SD TFT!"
+#define STRING_TFTSD_INSERTED         "¡Tarjeta insertada!"
+#define STRING_TFTSD_REMOVED          "¡Tarjeta extraida!"
+#define STRING_U_DISK                 "Pendrive"
+#define STRING_READ_U_DISK_ERROR      "¡Error en el Pendrive!"
+#define STRING_U_DISK_INSERTED        "¡Pendrive insertado!"
+#define STRING_U_DISK_REMOVED         "¡Pendrive extraido!"
+#define STRING_ONBOARDSD              "SD Placa"
+#define STRING_READ_ONBOARDSD_ERROR   "¡Error en la tarjeta SD de la placa!"
+#define STRING_FILAMENT_SENSOR        "Filament sensor"
+#define STRING_FILAMENT_RUNOUT        "¡Filamento agotado!"
+#define STRING_PREHEAT                "Precalentar"
+#define STRING_PREHEAT_BOTH           "Ambos"
+#define STRING_IS_PAUSE               "No se puede extruir\nal imprimir,¿\nPausar la impresión?"
+#define STRING_AUTO_SHUT_DOWN         "Apag. aut."
+#define STRING_UNIFIEDMOVE            "Movimiento"
+#define STRING_UNIFIEDHEAT            "Calor/Ventilador"
+#define STRING_COOLDOWN               "Enfriarse"
+#define STRING_EMERGENCYSTOP          "PARADA EMERGENCIA"
+#define STRING_TOUCH_TO_EXIT          "Toca cualquier lugar para salir"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Espere a que la\ntemperatura del hotend\nsea inferior a %d℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Forzar Apagado"
+#define STRING_SHUTTING_DOWN          "Apagando..."
+#define STRING_PARAMETER_SETTING      "Parámetro"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Show ACK in Terminal"
+#define STRING_INVERT_XAXIS           "Invert X Axis"
+#define STRING_INVERT_YAXIS           "Invert Y Axis"
+#define STRING_INVERT_ZAXIS           "Invert Z Axis"
+#define STRING_MOVE_SPEED             "Move speed(X Y Z)"
+#define STRING_KNOB_LED               "Rotary Knob LED"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Paused by M0 command"
+#define STRING_SEND_START_GCODE       "Start Gcode before print"
+#define STRING_SEND_END_GCODE         "End Gcode after print"
+#define STRING_SEND_CANCEL_GCODE      "Cancel Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Persistent Status Info"
+#define STRING_FILE_LISTMODE          "Files viewer List Mode"
+#define STRING_CURRENT_SETTING        "Driver Current (mA)"
+#define STRING_STEPS_SETTING          "Steps per mm"
+#define STRING_MAXFEEDRATE            "Max Feed Rate"
+#define STRING_MAXACCELERATION        "Max Acceleration"
+#define STRING_ACCELERATION           "Acceleration"
+#define STRING_PRINT_ACCELERATION     "Print Acceleration"
+#define STRING_RETRACT_ACCELERATION   "Retract Acceleration"
+#define STRING_TRAVEL_ACCELERATION    "Travel Acceleration"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC bump sensitivity"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Reset all settings to\ndefault values?"
+#define STRING_RESET_SETTINGS_DONE    "Reset all settings\nsuccessful.\nplease restart the device."
+#define STRING_INFO                   "Info"
+#define STRING_LCD_BRIGHTNESS         "LCD Brightness"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD Brightness dim"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD dim idle timer"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset default settings"
+#define STRING_SETTING_RESTORE        "Restore settings"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start Printing:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Desbloquear XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Español"
     #define STRING_HEAT                   "Calentar"
     #define STRING_MOVE                   "Mover"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_fr.h b/TFT/src/User/API/Language/language_fr.h
index 3f0108e075..3f298327b9 100644
--- a/TFT/src/User/API/Language/language_fr.h
+++ b/TFT/src/User/API/Language/language_fr.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_FR_H_
-#define _LANGUAGE_FR_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Français"
+#define STRING_HEAT                   "Chauffer"
+#define STRING_MOVE                   "Déplacer"
+#define STRING_HOME                   "Home"
+#define STRING_DISABLE_STEPPERS       "Moteurs"
+#define STRING_PRINT                  "Imprimer"
+#define STRING_EXTRUDE                "Extruder"
+#define STRING_FAN                    "Ventiler"
+#define STRING_SETTINGS               "Options"
+#define STRING_SCREEN_SETTINGS        "Écran"
+#define STRING_MACHINE_SETTINGS       "Machine"
+#define STRING_FEATURE_SETTINGS       "Paramètres"
+#define STRING_SOUND                  "Son"
+#define STRING_TOUCH_SOUND            "Son des touches"
+#define STRING_TOAST_SOUND            "Notifications"
+#define STRING_ALERT_SOUND            "Popups et alertes"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Eteindre"
+#define STRING_RGB_SETTINGS           "LED"
+#define STRING_RGB_OFF                "LED Off"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Gcode"
+#define STRING_LEVELING               "Niveaux"
+#define STRING_POINT_1                "Point 1"
+#define STRING_POINT_2                "Point 2"
+#define STRING_POINT_3                "Point 3"
+#define STRING_POINT_4                "Point 4"
+#define STRING_POINT_5                "Point 5"
+#define STRING_BED_LEVELING           "ABL"
+#define STRING_BL_COMPLETE            "Nivellement terminé"
+#define STRING_BL_SMART_FILL          "Les points de sonde manquants\nont été intelligemment remplis.\n \nNote : n'oubliez pas de sauvegarder !"
+#define STRING_BL_ENABLE              "BL On"
+#define STRING_BL_DISABLE             "BL Off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Nivellement Mesh"
+#define STRING_ABL_SETTINGS           "Nivellement Automatique"
+#define STRING_ABL_SETTINGS_BBL       "Nivellement bilinéaire"
+#define STRING_ABL_SETTINGS_UBL       "Nivellement unifié"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Enregistrer dans l'emplacement"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Charger depuis l'emplacement"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Se souvenir de l'emplacement\nau prochain redémarrage ?\n(Sauvegarde EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Tester"
+#define STRING_BLTOUCH_DEPLOY         "Déployer"
+#define STRING_BLTOUCH_STOW           "Rentrer"
+#define STRING_BLTOUCH_REPEAT         "Répéter"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Décalage Palpeur"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Êtes-vous sûr ?"
+#define STRING_DOWN                   "Descendre"
+#define STRING_UP                     "Monter"
+#define STRING_SAVE                   "Sauver"
+#define STRING_RESTORE                "Restaurer"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Défaut"
+#define STRING_CLEAR                  "Effacer"
+#define STRING_NEXT                   "Suivant"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Aucune valeur valide fournie !"
+#define STRING_TIMEOUT_REACHED        "Délai d'attente dépassé !"
+#define STRING_PROCESS_RUNNING        "Processus en cours ! Veuillez patienter"
+#define STRING_PROCESS_COMPLETED      "Processus terminé !"
+#define STRING_PROCESS_ABORTED        "Processus annulé !"
+#define STRING_INC                    "Plus"
+#define STRING_DEC                    "Moins"
+#define STRING_NOZZLE                 "Buse"
+#define STRING_BED                    "Plateau"
+#define STRING_CHAMBER                "Caisson"
+#define STRING_START                  "Démarrer"
+#define STRING_STOP                   "Stopper"
+#define STRING_BACK                   "Retour"
+#define STRING_PAGE_UP                "Précédent"
+#define STRING_PAGE_DOWN              "Suivant"
+#define STRING_PAUSE                  "Pause"
+#define STRING_RESUME                 "Reprendre"
+#define STRING_LOAD                   "Charger"
+#define STRING_UNLOAD                 "Décharger"
+#define STRING_SLOW_SPEED             "Lent"
+#define STRING_NORMAL_SPEED           "Normal"
+#define STRING_FAST_SPEED             "Rapide"
+#define STRING_FAN_FULL_SPEED         "Max"
+#define STRING_FAN_HALF_SPEED         "Moitié"
+#define STRING_ROTATE_UI              "Rotation"
+#define STRING_TOUCHSCREEN_ADJUST     "Ajuster"
+#define STRING_MORE                   "Plus"
+#define STRING_SCREEN_INFO            "Infos"
+#define STRING_STATUS                 "Statut"
+#define STRING_SIMULATOR_BG_COLOR     "Couleur de l'arrière-plan Marlin"
+#define STRING_SIMULATOR_FONT_COLOR   "Couleur de la police Marlin"
+#define STRING_WHITE                  "Blanc"
+#define STRING_BLACK                  "Noir"
+#define STRING_BLUE                   "Bleu"
+#define STRING_RED                    "Rouge"
+#define STRING_GREEN                  "Vert"
+#define STRING_CYAN                   "Cyan"
+#define STRING_YELLOW                 "Jaune"
+#define STRING_BROWN                  "Marron"
+#define STRING_GRAY                   "Gris"
+#define STRING_ORANGE                 "Orange"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Violette"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Violet"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "Bleu Foncé"
+#define STRING_DARKGREEN              "Vert Foncé"
+#define STRING_DARKGRAY               "Gris Foncé"
+#define STRING_DISCONNECT             "Libérer"
+#define STRING_BAUDRATE               "Vitesse"
+#define STRING_PERCENTAGE             "Avancement"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Vitesse"
+#define STRING_PERCENTAGE_FLOW        "Débit"
+#define STRING_VALUE_ZERO             "Zéro"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Prête"
+#define STRING_BUSY                   "Occupée, veuillez patienter..."
+#define STRING_UNCONNECTED            "Aucune imprimante connectée !"
+#define STRING_DISCONNECT_INFO        "Vous pouvez maintenant contrôler l'imprimante depuis votre ordinateur !"
+#define STRING_LOADING                "Chargement..."
+#define STRING_POWER_FAILED           "Continuer l'impression ?"
+#define STRING_CONTINUE               "Continuer"
+#define STRING_CANCEL                 "Annuler"
+#define STRING_ADJUST_TITLE           "Calibration écran tactile"
+#define STRING_ADJUST_INFO            "Veuillez toucher le point rouge"
+#define STRING_ADJUST_OK              "Succès de l'ajustement"
+#define STRING_ADJUST_FAILED          "Ajustement incorrect, veuillez réessayer"
+#define STRING_WARNING                "Attention"
+#define STRING_STOP_PRINT             "Arrêter l'impression ?"
+#define STRING_CONFIRM                "Confirmer"
+#define STRING_TFTSD                  "SD TFT"
+#define STRING_READ_TFTSD_ERROR       "Erreur de lecture de la carte SD TFT !"
+#define STRING_TFTSD_INSERTED         "Carte insérée !"
+#define STRING_TFTSD_REMOVED          "Carte retirée !"
+#define STRING_U_DISK                 "Clé USB"
+#define STRING_READ_U_DISK_ERROR      "Erreur de lecture de la clé USB !"
+#define STRING_U_DISK_INSERTED        "Clé USB insérée !"
+#define STRING_U_DISK_REMOVED         "Clé USB retirée !"
+#define STRING_ONBOARDSD              "SD interne"
+#define STRING_READ_ONBOARDSD_ERROR   "Erreur de lecture de la carte SD interne !"
+#define STRING_FILAMENT_SENSOR        "Capteur de filament"
+#define STRING_FILAMENT_RUNOUT        "Fin de Filament !"
+#define STRING_PREHEAT                "Préparer"
+#define STRING_PREHEAT_BOTH           "Global"
+#define STRING_IS_PAUSE               "Extrusion impossible quand\nl'impression est en cours.\nMettre l'impression en pause ?"
+#define STRING_AUTO_SHUT_DOWN         "Extinction automatique"
+#define STRING_UNIFIEDMOVE            "Mouvement"
+#define STRING_UNIFIEDHEAT            "Chauffer"
+#define STRING_COOLDOWN               "Refroidir"
+#define STRING_EMERGENCYSTOP          "Arrêt"
+#define STRING_TOUCH_TO_EXIT          "Toucher n'importe où pour quitter"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Attendez que la température de la buse\nsoit inférieure à %d℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Forcer l'extinction"
+#define STRING_SHUTTING_DOWN          "Extinction en cours..."
+#define STRING_PARAMETER_SETTING      "Réglages"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Afficher ACK sur Terminal"
+#define STRING_INVERT_XAXIS           "Inverser l'axe X"
+#define STRING_INVERT_YAXIS           "Inverser l'axe Y"
+#define STRING_INVERT_ZAXIS           "Inverser l'axe Z"
+#define STRING_MOVE_SPEED             "Vitesse de déplacement (X Y Z)"
+#define STRING_KNOB_LED               "LED du bouton rotatif"
+#define STRING_KNOB_LED_IDLE          "Veille du bouton rotatif"
+#define STRING_M0_PAUSE               "Suspendu par la commande M0"
+#define STRING_SEND_START_GCODE       "Gcode avant l'impression"
+#define STRING_SEND_END_GCODE         "Gcode après l'impression"
+#define STRING_SEND_CANCEL_GCODE      "Gcode d'annulation"
+#define STRING_PERSISTENT_STATUS_INFO "Temp. toujours affichées"
+#define STRING_FILE_LISTMODE          "Fichiers en mode liste"
+#define STRING_CURRENT_SETTING        "Courant Driver (mA)"
+#define STRING_STEPS_SETTING          "Steps par mm"
+#define STRING_MAXFEEDRATE            "Débit maximum"
+#define STRING_MAXACCELERATION        "Accélération maximale"
+#define STRING_ACCELERATION           "Accélération"
+#define STRING_PRINT_ACCELERATION     "Impression"
+#define STRING_RETRACT_ACCELERATION   "Rétraction"
+#define STRING_TRAVEL_ACCELERATION    "Déplacements"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Ecart de jonction"
+#define STRING_BUMP_SENSITIVITY       "Sensibilité TMC"
+#define STRING_FWRETRACT              "Rétraction FW"
+#define STRING_FWRECOVER              "Récupération FW"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Réinitialiser tous les\nparamètres aux valeurs\npar défaut ?"
+#define STRING_RESET_SETTINGS_DONE    "Réinitialisation des paramètres\nréalisé avec succès.\nVeuillez redémarrer l'imprimante."
+#define STRING_INFO                   "Infos"
+#define STRING_LCD_BRIGHTNESS         "Luminosité LCD"
+#define STRING_LCD_BRIGHTNESS_DIM     "Diminution luminosité"
+#define STRING_LCD_DIM_IDLE_TIMER     "Durée avant diminution"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Mode Marlin plein écran"
+#define STRING_PLR_EN                 "Reprise après coupure"
+#define STRING_SETTING_SAVE           "Sauvegarder les paramètres"
+#define STRING_SETTING_RESET          "RAZ des paramètres"
+#define STRING_SETTING_RESTORE        "Restaurer les paramètres"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Enregistrer les paramètres\ndans l'EEPROM ?"
+#define STRING_EEPROM_RESTORE_INFO    "Restaurer les paramètres\nde l'EEPROM ?"
+#define STRING_EEPROM_RESET_INFO      "Réinitialiser l'EEPROM\naux paramètres d'origine\nde l'imprimante ?"
+#define STRING_RETRACT_FEEDRATE       "Vitesse"
+#define STRING_RETRACT_LENGTH         "Longueur"
+#define STRING_RETRACT_SWAP_LENGTH    "Longueur de swap"
+#define STRING_RETRACT_Z_LIFT         "Décalage en Z"
+#define STRING_RETRACT_AUTO           "Rétraction Firmware auto"
+#define STRING_RECOVER_FEEDRATE       "Vitesse"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Vitesse de swap"
+#define STRING_RECOVER_LENGTH         "Longueur"
+#define STRING_SWAP_RECOVER_LENGTH    "Longueur de swap"
+#define STRING_START_PRINT            "Démarrer l'impression :\n%s ?"
+#define STRING_ACK_NOTIFICATION       "Style de notification ACK"
+#define STRING_LEVELING_EDGE_DISTANCE "Distance au bord du plateau"
+#define STRING_XY_UNLOCK              "Moteurs XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "Autocalibrage PID"
+#define STRING_PID_START_INFO         "L'autocalibrage PID va être\nlancé. Cela peut prendre\nquelques minutes. Continuer ?"
+#define STRING_PID_START_INFO_2       "Autocalibrage PID en cours !"
+#define STRING_PID_START_INFO_3       "Ne touchez pas l'écran avant la fin (LED verte allumée) !"
+#define STRING_TUNE_EXTRUDER          "Extrudeur"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Réglage de l'extrudeur"
+#define STRING_TUNE_EXT_TEMPLOW       "Température souhaitée\ntrop basse !\nTempérature minimum : %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "La température n'est pas\nencore à la valeur souhaitée"
+#define STRING_TUNE_EXT_MARK120MM     "Marquer 120 mm sur le filament\nAppuyer ensuite sur '%s'\nMesurer la longueur restante"
+#define STRING_TUNE_EXT_HEATOFF       "Arrêter la chauffe ?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Ajustement E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "Nouveau E-steps\nenregistré !"
+#define STRING_TUNE_EXT_MEASURED      "Longueur restante"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Ancien : %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "Nouveau : %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connexion"
+#define STRING_OFFSET_TOOL            "Offset 2ème Buse"
+#define STRING_HYBRID_THRESHOLD       "Seuil Hybride TMC"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Maillage"
+#define STRING_MESH_TUNER             "Edition du maillage"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Français"
     #define STRING_HEAT                   "Chauffer"
     #define STRING_MOVE                   "Déplacer"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_gr.h b/TFT/src/User/API/Language/language_gr.h
index 56dbfbee7d..a7bc44f8b0 100644
--- a/TFT/src/User/API/Language/language_gr.h
+++ b/TFT/src/User/API/Language/language_gr.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_GR_H_
-#define _LANGUAGE_GR_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Ελληνικά"
+#define STRING_HEAT                   "Θέρμανση"
+#define STRING_MOVE                   "Μετακίνηση"
+#define STRING_HOME                   "Αυτο-Κατεύθυνση"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Εκτύπωση"
+#define STRING_EXTRUDE                "Εκβολή"
+#define STRING_FAN                    "Ανεμιστήρας"
+#define STRING_SETTINGS               "Ρυθμίσεις"
+#define STRING_SCREEN_SETTINGS        "Οθόνη"
+#define STRING_MACHINE_SETTINGS       "Μηχανήματος"
+#define STRING_FEATURE_SETTINGS       "Χαρακτηριστικών"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Απενεργοποίηση"
+#define STRING_RGB_SETTINGS           "Χρώμα LED"
+#define STRING_RGB_OFF                "Απενεργοποίηση LED"
+#define STRING_TERMINAL               "Τερματικό"
+#define STRING_CUSTOM                 "Τροποποιημένο"
+#define STRING_LEVELING               "Ισοπέδωση"
+#define STRING_POINT_1                "Σημείο 1"
+#define STRING_POINT_2                "Σημείο 2"
+#define STRING_POINT_3                "Σημείο 3"
+#define STRING_POINT_4                "Σημείο 4"
+#define STRING_POINT_5                "Σημείο 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Δοκιμή"
+#define STRING_BLTOUCH_DEPLOY         "Επέκταση"
+#define STRING_BLTOUCH_STOW           "Aπόσυρση"
+#define STRING_BLTOUCH_REPEAT         "Επανάληψη"
+#define STRING_Z_OFFSET               "Αντιστάθμιση Z"
+#define STRING_PROBE_OFFSET           "Αντιστάθμιση Καθετήρας"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Αποθήκευση"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Επαναφορά"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Αύξηση"
+#define STRING_DEC                    "Μείωση"
+#define STRING_NOZZLE                 "Στόμιο"
+#define STRING_BED                    "Θερμή Βάση"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Τερμάτιση"
+#define STRING_BACK                   "Πίσω"
+#define STRING_PAGE_UP                "Σελίδα πάνω"
+#define STRING_PAGE_DOWN              "Σελίδα κάτω"
+#define STRING_PAUSE                  "Παύση"
+#define STRING_RESUME                 "Ξαναρχίσει"
+#define STRING_LOAD                   "Φόρτωση"
+#define STRING_UNLOAD                 "Ξεφόρτωση"
+#define STRING_SLOW_SPEED             "Αργά"
+#define STRING_NORMAL_SPEED           "Κανονικά"
+#define STRING_FAST_SPEED             "Γρήγορα"
+#define STRING_FAN_FULL_SPEED         "Ολοταχώς"
+#define STRING_FAN_HALF_SPEED         "Μισή ταχύτητα"
+#define STRING_ROTATE_UI              "Περιστροφή UI"
+#define STRING_TOUCHSCREEN_ADJUST     "Προσαρμογή TOUCH"
+#define STRING_MORE                   "Περισσότερα"
+#define STRING_SCREEN_INFO            "Πληροφορίες"
+#define STRING_STATUS                 "ΚΑΤΑΣΤΑΣΗ"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
+#define STRING_WHITE                  "Άσπρο"
+#define STRING_BLACK                  "Μάυρο"
+#define STRING_BLUE                   "Μπλέ"
+#define STRING_RED                    "Κόκκινο"
+#define STRING_GREEN                  "Πράσινο"
+#define STRING_CYAN                   "Κυανό"
+#define STRING_YELLOW                 "Κίτρινο"
+#define STRING_BROWN                  "Καφέ"
+#define STRING_GRAY                   "Γκρί"
+#define STRING_ORANGE                 "Πορτοκάλι"
+#define STRING_INDIGO                 "Ινδικό"
+#define STRING_VIOLET                 "Βιολετί"
+#define STRING_MAGENTA                "Πορφύρα"
+#define STRING_PURPLE                 "Μωβ"
+#define STRING_LIME                   "Πρασινοκίτρινο"
+#define STRING_DARKBLUE               "Σκούρο μπλε"
+#define STRING_DARKGREEN              "Σκούρο πράσινο"
+#define STRING_DARKGRAY               "Σκούρο γκρίζο"
+#define STRING_DISCONNECT             "Αποσυνδέσει"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Ποσοστό"
+#define STRING_BABYSTEP               "Μικροβήμα"
+#define STRING_PERCENTAGE_SPEED       "Ταχύτητα"
+#define STRING_PERCENTAGE_FLOW        "Ροή"
+#define STRING_VALUE_ZERO             "Μηδέν"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01χιλ"
+#define STRING_01_MM                  "0.1χιλ"
+#define STRING_1_MM                   "1χιλ"
+#define STRING_5_MM                   "5χιλ"
+#define STRING_10_MM                  "10χιλ"
+#define STRING_100_MM                 "100χιλ"
+#define STRING_200_MM                 "200χιλ"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Έτοιμο"
+#define STRING_BUSY                   "Απασχολημένη επεξεργασία, παρακάλω περιμένετε ..."
+#define STRING_UNCONNECTED            "Δεν υπάρχει συνδεδεμένος εκτυπωτής!"
+#define STRING_DISCONNECT_INFO        "Τώρα μπορείτε να ελέγξετε τον εκτυπωτή από τον υπολογιστή σας!"
+#define STRING_LOADING                "Φόρτωση..."
+#define STRING_POWER_FAILED           "Συνέχεια εκτύπωσης;"
+#define STRING_CONTINUE               "Συνέχεια"
+#define STRING_CANCEL                 "\u088F Ματαίωση" //Cancel Sign
+#define STRING_ADJUST_TITLE           "Βαθμονόμηση οθόνης αφής"
+#define STRING_ADJUST_INFO            "Κάντε κλικ στην κόκκινη κουκκίδα"
+#define STRING_ADJUST_OK              "Επιτυχία προσαρμογής"
+#define STRING_ADJUST_FAILED          "Η προσαρμογή απέτυχε. Δοκιμάστε ξανά"
+#define STRING_WARNING                "Προειδοποίηση"
+#define STRING_STOP_PRINT             "Διακοπή εκτύπωσης?"
+#define STRING_CONFIRM                "\u088E Εντάξει" //Confirm Sign
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "Σφάλμα ανάγνωσης κάρτας SD οθόνης!"
+#define STRING_TFTSD_INSERTED         "Η κάρτα έχει εισαχθεί!"
+#define STRING_TFTSD_REMOVED          "Η κάρτα αφαιρέθηκε!"
+#define STRING_U_DISK                 "USB Δίσκος"
+#define STRING_READ_U_DISK_ERROR      "Σφάλμα ανάγνωσης USB Δίσκου!"
+#define STRING_U_DISK_INSERTED        "Ο USB Δίσκος έχει εισαχθεί!"
+#define STRING_U_DISK_REMOVED         "Ο USB Δίσκος αφαιρέθηκε!"
+#define STRING_ONBOARDSD              "Ενσωματωμένη κάρτα SD"
+#define STRING_READ_ONBOARDSD_ERROR   "Σφάλμα ανάγνωσης ενσωματωμένης κάρτας SD!"
+#define STRING_FILAMENT_SENSOR        "Αισθητήρας νήματος"
+#define STRING_FILAMENT_RUNOUT        "τελείωσε το νημά!"
+#define STRING_PREHEAT                "Προθέρμανση"
+#define STRING_PREHEAT_BOTH           "Και τα δυο"
+#define STRING_IS_PAUSE               "Δεν είναι δυνατή η εξώθηση κατα τη δυάρκεια\nεκτύπωσης.\nΠαύση εκτύπωσης?"
+#define STRING_AUTO_SHUT_DOWN         "Αυτόματη απενεργοποίηση"
+#define STRING_UNIFIEDMOVE            "Κίνηση"
+#define STRING_UNIFIEDHEAT            "Θέρμανση/Ανεμιστήρας"
+#define STRING_COOLDOWN               "Κρυώσει"
+#define STRING_EMERGENCYSTOP          "Σταμάτημα έκτακτης ανάγκης"
+#define STRING_TOUCH_TO_EXIT          "Αγγίξτε οπουδήποτε για έξοδο"
+#define STRING_MAINMENU               "Μενού"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Περιμένετε για την \nθερμοκρασία του hotend να πέσει \nχαμηλότερα απο %d ℃" // The length of the info line is 24 characters, so the "temperatureof" will automatically be divided into "temperature of..."
+#define STRING_FORCE_SHUT_DOWN        "Αναγκαστική απενεργοποίηση"
+#define STRING_SHUTTING_DOWN          "Απενεργοποίηση..."
+#define STRING_PARAMETER_SETTING      "Ρυθμίσεις παραμέτρων"
+#define STRING_ON                     "Ενεργό"
+#define STRING_OFF                    "Σβηστό"
+#define STRING_SMART                  "ΈΞΥΠΝΟ"
+#define STRING_TERMINAL_ACK           "Εμφάνιση ACK στο τερματικό"
+#define STRING_INVERT_XAXIS           "Αντιστρέψει X άξονα"
+#define STRING_INVERT_YAXIS           "Αντιστρέψει Y άξονα"
+#define STRING_INVERT_ZAXIS           "Αντιστρέψει Z άξονα"
+#define STRING_MOVE_SPEED             "Ταχύτητα κίνησης(X Y Z)"
+#define STRING_KNOB_LED               "LED περιστροφικού κουμπιού"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Διακόπηκε λόγω M0 εντολής"
+#define STRING_SEND_START_GCODE       "Αρχικό Gcode προ εκτύπωσης"
+#define STRING_SEND_END_GCODE         "Τερματικό Gcode εφότου εκτύπωσης"
+#define STRING_SEND_CANCEL_GCODE      "Ματαίωση Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Πληροφορίες μόνιμης κατάστασης"
+#define STRING_FILE_LISTMODE          "Λειτουργία λίστας προβολής αρχείων"
+#define STRING_CURRENT_SETTING        "Ένταση η. ρεύ. οδηγού(mA)"
+#define STRING_STEPS_SETTING          "Βήματα ανά χιλ"
+#define STRING_MAXFEEDRATE            "Μέγιστο ποσοστό τροφοδοσίας"
+#define STRING_MAXACCELERATION        "Μέγιστη επιτάχυνση"
+#define STRING_ACCELERATION           "Eπιτάχυνση"
+#define STRING_PRINT_ACCELERATION     "Επιτάχυνση εκτύπωσης"
+#define STRING_RETRACT_ACCELERATION   "Eπιτάχυνση ανάκλησης"
+#define STRING_TRAVEL_ACCELERATION    "Επιτάχυνση ταξιδιού"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC ευαισθησία χτυπήματος"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Όλες οι ρυθμίσεις θα \nεπαναφερθούν στις προεπιλεγμένες \nτιμές. Συνεχίσει?"
+#define STRING_RESET_SETTINGS_DONE    "Η επαναφορά όλων των ρυθμίσεων \nολοκληρώθηκε με επιτυχία. \nΓια πλήρη εφαρμογή,\nπαρακάλω επανεκκινήστε τη συσκευή σας."
+#define STRING_INFO                   "\u0884 Πληροφορίες" //Info Sign
+#define STRING_LCD_BRIGHTNESS         "Φωτεινότητα οθόνης"
+#define STRING_LCD_BRIGHTNESS_DIM     "Φωτεινότητα LCD σκοτεινή"
+#define STRING_LCD_DIM_IDLE_TIMER     "Xρονομετρητής αδράνειας οθόνης"
+#define STRING_5_SECONDS              "5 Δευτ."
+#define STRING_10_SECONDS             "10 Δευτ."
+#define STRING_30_SECONDS             "30 Δευτ."
+#define STRING_60_SECONDS             "1 Λεπτό"
+#define STRING_120_SECONDS            "2 Λεπτά"
+#define STRING_300_SECONDS            "5 Λεπτά"
+#define STRING_CUSTOM_SECONDS         "Τροποποιημένες ρυθμίσεις"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Λειτουργία Marlin σε πλήρη οθόνη"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset default settings"
+#define STRING_SETTING_RESTORE        "Restore settings"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start Printing:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Disarm XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Ελληνικά"
     #define STRING_HEAT                   "Θέρμανση"
     #define STRING_MOVE                   "Μετακίνηση"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_hu.h b/TFT/src/User/API/Language/language_hu.h
index 8c04a330e9..cac99fb018 100644
--- a/TFT/src/User/API/Language/language_hu.h
+++ b/TFT/src/User/API/Language/language_hu.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_HU_H_
-#define _LANGUAGE_HU_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Magyar"
+#define STRING_HEAT                   "Fűtés"
+#define STRING_MOVE                   "Mozgás"
+#define STRING_HOME                   "Végállás"
+#define STRING_DISABLE_STEPPERS       "Léptetők"
+#define STRING_PRINT                  "Nyomtatás"
+#define STRING_EXTRUDE                "Adagolás"
+#define STRING_FAN                    "Hűtés"
+#define STRING_SETTINGS               "Opciók"
+#define STRING_SCREEN_SETTINGS        "Kijelző"
+#define STRING_MACHINE_SETTINGS       "Gép"
+#define STRING_FEATURE_SETTINGS       "Funkciók"
+#define STRING_SOUND                  "Hangok"
+#define STRING_TOUCH_SOUND            "Érintés hangja"
+#define STRING_TOAST_SOUND            "Fűtő értesítések"
+#define STRING_ALERT_SOUND            "Felugró riasztások"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Leállítás"
+#define STRING_RGB_SETTINGS           "LED Szín"
+#define STRING_RGB_OFF                "LED KI"
+#define STRING_TERMINAL               "Terminál"
+#define STRING_CUSTOM                 "Egyedi"
+#define STRING_LEVELING               "Szintezés"
+#define STRING_POINT_1                "1. pont"
+#define STRING_POINT_2                "2. pont"
+#define STRING_POINT_3                "3. pont"
+#define STRING_POINT_4                "4. pont"
+#define STRING_POINT_5                "5. pont"
+#define STRING_BED_LEVELING           "Ágyszint"
+#define STRING_BL_COMPLETE            "Ágy Szintezése Sikeres"
+#define STRING_BL_SMART_FILL          "A hiányzó szonda pontok\nkitöltésre kerültek.\nMegjegyzés: Mentsd el!"
+#define STRING_BL_ENABLE              "BL: be"
+#define STRING_BL_DISABLE             "BL: ki"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Kézi Rács Szintezés"
+#define STRING_ABL_SETTINGS           "Automata Szintezés"
+#define STRING_ABL_SETTINGS_BBL       "Bilineáris Szintezés"
+#define STRING_ABL_SETTINGS_UBL       "Egységes Szintezés"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Mentés szlotba"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Betöltés szlotból"
+#define STRING_ABL_SLOT0              "Szlot 0"
+#define STRING_ABL_SLOT1              "Szlot 1"
+#define STRING_ABL_SLOT2              "Szlot 2"
+#define STRING_ABL_SLOT3              "Szlot 3"
+#define STRING_ABL_SLOT_EEPROM        "Emlékezzen a következő\nújraindításnál? (EEPROM Mentése)"
+#define STRING_ABL_Z                  "Z Áttűnés"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Teszt"
+#define STRING_BLTOUCH_DEPLOY         "Telepítés"
+#define STRING_BLTOUCH_STOW           "Elhelyezés"
+#define STRING_BLTOUCH_REPEAT         "Ismétlés"
+#define STRING_Z_OFFSET               "Z Eltolás"
+#define STRING_PROBE_OFFSET           "Szonda Eltolás"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Biztos vagy benne?"
+#define STRING_DOWN                   "Le"
+#define STRING_UP                     "Fel"
+#define STRING_SAVE                   "Mentés"
+#define STRING_RESTORE                "Betöltés"
+#define STRING_RESET                  "Újratölt"
+#define STRING_DEFAULT                "Alapért."
+#define STRING_CLEAR                  "Tiszta"
+#define STRING_NEXT                   "Tovább"
+#define STRING_DISTANCE               "Távolság"
+#define STRING_INVALID_VALUE          "Nincs érvényes érték/s megadva"
+#define STRING_TIMEOUT_REACHED        "Időkorlát elérve!"
+#define STRING_PROCESS_RUNNING        "Folyamat fut!"
+#define STRING_PROCESS_COMPLETED      "Folyamat befejezve!"
+#define STRING_PROCESS_ABORTED        "Folyamat megszakítva!"
+#define STRING_INC                    "Növel"
+#define STRING_DEC                    "Csökkent"
+#define STRING_NOZZLE                 "Fej"
+#define STRING_BED                    "Ágy"
+#define STRING_CHAMBER                "Kamra"
+#define STRING_START                  "Kezdés"
+#define STRING_STOP                   "Állj"
+#define STRING_BACK                   "Vissza"
+#define STRING_PAGE_UP                "Fel"
+#define STRING_PAGE_DOWN              "Le"
+#define STRING_PAUSE                  "Szünet"
+#define STRING_RESUME                 "Folytatás"
+#define STRING_LOAD                   "Betöltés"
+#define STRING_UNLOAD                 "Kiadás"
+#define STRING_SLOW_SPEED             "Lassú"
+#define STRING_NORMAL_SPEED           "Normál"
+#define STRING_FAST_SPEED             "Gyors"
+#define STRING_FAN_FULL_SPEED         "Teljes"
+#define STRING_FAN_HALF_SPEED         "Fél"
+#define STRING_ROTATE_UI              "Forgatás"
+#define STRING_TOUCHSCREEN_ADJUST     "Igazítás"
+#define STRING_MORE                   "Több"
+#define STRING_SCREEN_INFO            "Infó"
+#define STRING_STATUS                 "Státusz"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin mód háttérszín"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin mód betűszín"
+#define STRING_WHITE                  "Fehér"
+#define STRING_BLACK                  "Fekete"
+#define STRING_BLUE                   "Kék"
+#define STRING_RED                    "Piros"
+#define STRING_GREEN                  "Zöld"
+#define STRING_CYAN                   "Cián"
+#define STRING_YELLOW                 "Sárga"
+#define STRING_BROWN                  "Barna"
+#define STRING_GRAY                   "Szürke"
+#define STRING_ORANGE                 "Narancs"
+#define STRING_INDIGO                 "Indigó"
+#define STRING_VIOLET                 "Viola"
+#define STRING_MAGENTA                "Bíborvörös"
+#define STRING_PURPLE                 "Lila"
+#define STRING_LIME                   "Mész"
+#define STRING_DARKBLUE               "Sötétkék"
+#define STRING_DARKGREEN              "Sötétzöld"
+#define STRING_DARKGRAY               "Sötétszürke"
+#define STRING_DISCONNECT             "Leválaszt"
+#define STRING_BAUDRATE               "Kapcsolat"
+#define STRING_PERCENTAGE             "Százalék"
+#define STRING_BABYSTEP               "Mikrolépés"
+#define STRING_PERCENTAGE_SPEED       "Sebesség"
+#define STRING_PERCENTAGE_FLOW        "Folyás"
+#define STRING_VALUE_ZERO             "Nulla"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Kész"
+#define STRING_BUSY                   "Feldolgozás alatt, kérlek várj..."
+#define STRING_UNCONNECTED            "Nincs nyomtató csatlakoztatva!"
+#define STRING_DISCONNECT_INFO        "Most a számítógépéről vezérelheted a nyomtatót!"
+#define STRING_LOADING                "Betöltés..."
+#define STRING_POWER_FAILED           "Folytatod a nyomtatást?"
+#define STRING_CONTINUE               "Folytatás"
+#define STRING_CANCEL                 "Mégse"
+#define STRING_ADJUST_TITLE           "Érintőképernyő kalibrálása."
+#define STRING_ADJUST_INFO            "Kattints a piros pontra."
+#define STRING_ADJUST_OK              "Kalibrálás sikeres."
+#define STRING_ADJUST_FAILED          "A kalibrálás sikertelen, próbáld újra"
+#define STRING_WARNING                "Figyelem!"
+#define STRING_STOP_PRINT             "Megállítod a nyomtatást?"
+#define STRING_CONFIRM                "Igen"
+#define STRING_TFTSD                  "TFT-SD"
+#define STRING_READ_TFTSD_ERROR       "TFT-SD olvasási hiba!"
+#define STRING_TFTSD_INSERTED         "SD-Kártya behelyezve!"
+#define STRING_TFTSD_REMOVED          "SD-Kártya eltávolítva!"
+#define STRING_U_DISK                 "USB Tár"
+#define STRING_READ_U_DISK_ERROR      "USB olvasási hiba!"
+#define STRING_U_DISK_INSERTED        "USB behelyezve!"
+#define STRING_U_DISK_REMOVED         "USB eltávolítva!"
+#define STRING_ONBOARDSD              "Lap-SD"
+#define STRING_READ_ONBOARDSD_ERROR   "Alaplap-SD olvasási hiba!"
+#define STRING_FILAMENT_SENSOR        "Filament érzékelő"
+#define STRING_FILAMENT_RUNOUT        "Filament kifutás!"
+#define STRING_PREHEAT                "Előfűtés"
+#define STRING_PREHEAT_BOTH           "Mindkettő"
+#define STRING_IS_PAUSE               "Nem sikerült az adagolás\na nyomtatás alatt.\nSzünetelteted a nyomtatást?"
+#define STRING_AUTO_SHUT_DOWN         "Automata kikapcsolás"
+#define STRING_UNIFIEDMOVE            "Mozgás"
+#define STRING_UNIFIEDHEAT            "Fűt/Hűt"
+#define STRING_COOLDOWN               "Lehűtés"
+#define STRING_EMERGENCYSTOP          "VészSTOP"
+#define STRING_TOUCH_TO_EXIT          "Érintsd meg a kilépéshez."
+#define STRING_MAINMENU               "Főmenü"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Várd meg a fej\nvisszahűlését.%d℃" // Várj, míg a fej a megadott ℃ alá hűl.
+#define STRING_FORCE_SHUT_DOWN        "Kényszerítés"
+#define STRING_SHUTTING_DOWN          "Leállítás..."
+#define STRING_PARAMETER_SETTING      "Tényezők"
+#define STRING_ON                     "BE"
+#define STRING_OFF                    "KI"
+#define STRING_SMART                  "OKOS"
+#define STRING_TERMINAL_ACK           "ACK Megjelenítése"
+#define STRING_INVERT_XAXIS           "X megfordítása"
+#define STRING_INVERT_YAXIS           "Y megfordítása"
+#define STRING_INVERT_ZAXIS           "Z megfordítása"
+#define STRING_MOVE_SPEED             "Mozg.Sebesség (X-Y-Z)"
+#define STRING_KNOB_LED               "Forgatógomb LED"
+#define STRING_KNOB_LED_IDLE          "Forgatógomb tétlen"
+#define STRING_M0_PAUSE               "Szünetelés M0 parancsal"
+#define STRING_SEND_START_GCODE       "Kezdő G-Kód"
+#define STRING_SEND_END_GCODE         "Befejező G-Kód"
+#define STRING_SEND_CANCEL_GCODE      "Leállító G-Kód"
+#define STRING_PERSISTENT_STATUS_INFO "Perzisztens állapotinfó"
+#define STRING_FILE_LISTMODE          "Fájlnéző listamód"
+#define STRING_CURRENT_SETTING        "Motoráramok Beállítása"
+#define STRING_STEPS_SETTING          "Lépés Beállítás"
+#define STRING_MAXFEEDRATE            "Max Előtolási Sebesség"
+#define STRING_MAXACCELERATION        "Max Gyorsulás"
+#define STRING_ACCELERATION           "Gyorsulás"
+#define STRING_PRINT_ACCELERATION     "Nyomtatás Gyorsulás"
+#define STRING_RETRACT_ACCELERATION   "Adagoló Gyorsulása"
+#define STRING_TRAVEL_ACCELERATION    "Utazási Gyorsulás"
+#define STRING_JERK                   "Rántás"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC ütközés érzékenység"
+#define STRING_FWRETRACT              "FW Visszahúzás"
+#define STRING_FWRECOVER              "FW Visszahúzás helyreáll."
+#define STRING_LIN_ADVANCE            "Lineáris Haladás"
+#define STRING_RESET_SETTINGS_INFO    "Minden beállítás vissza\nfog állni alapértelmezett\nértékre. Folytatod?"
+#define STRING_RESET_SETTINGS_DONE    "A beállítások visszaállítása\nsikeresen megtörtént.\nAz aktiváláshoz indítsd\nújra az eszközt."
+#define STRING_INFO                   "Infó"
+#define STRING_LCD_BRIGHTNESS         "LCD Fényerősség"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD Halványítás"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD Halványítási idő"
+#define STRING_5_SECONDS              "5 Mp."
+#define STRING_10_SECONDS             "10 Mp."
+#define STRING_30_SECONDS             "30 Mp."
+#define STRING_60_SECONDS             "1 Perc."
+#define STRING_120_SECONDS            "2 Perc."
+#define STRING_300_SECONDS            "5 Perc."
+#define STRING_CUSTOM_SECONDS         "Egyedi"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Nagyképernyős Marlin mód"
+#define STRING_PLR_EN                 "Áramkiesés helyreálítása"
+#define STRING_SETTING_SAVE           "Beállítások mentése"
+#define STRING_SETTING_RESET          "Beállítás visszaállítása"
+#define STRING_SETTING_RESTORE        "Beállítások újratöltése"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Menti a megváltozott\nbeállításokat az EEPROM-ba?"
+#define STRING_EEPROM_RESTORE_INFO    "Betöltöd a beállításokat az\nEEPROM-ból?"
+#define STRING_EEPROM_RESET_INFO      "Visszaállítod az EEPROM-ot a\ngyári beállításokra?"
+#define STRING_RETRACT_FEEDRATE       "Visszahúzás előtol."
+#define STRING_RETRACT_LENGTH         "Visszahúzás hossz"
+#define STRING_RETRACT_SWAP_LENGTH    "Csere hossz vissza."
+#define STRING_RETRACT_Z_LIFT         "Z emelése visszahú."
+#define STRING_RETRACT_AUTO           "Automata Visszahúzás"
+#define STRING_RECOVER_FEEDRATE       "Előtolás javítás"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Csere előtolás jav."
+#define STRING_RECOVER_LENGTH         "Hossz javítás"
+#define STRING_SWAP_RECOVER_LENGTH    "Cserehossz javítás"
+#define STRING_START_PRINT            "Elindítod a %s\nfájl nyomtatását?"
+#define STRING_ACK_NOTIFICATION       "ACK egyéb típus"
+#define STRING_LEVELING_EDGE_DISTANCE "Ágy szélének távolsága"
+#define STRING_XY_UNLOCK              "Felold XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID Automatikus Hangolás"
+#define STRING_PID_START_INFO         "A PID önhangolása elindul.\nPercekig is eltarthat.\nFolytatod?"
+#define STRING_PID_START_INFO_2       "PID Automatikus hangolása zajlik!"
+#define STRING_PID_START_INFO_3       "NE ÉRINTSD meg a kijelzőt míg nincs kész! (zöld LED jelzi)!"
+#define STRING_TUNE_EXTRUDER          "Lépés hangolás"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Kiad 100mm"
+#define STRING_TUNE_EXT_TEMP          "Adagoló hangolás | Fűt"
+#define STRING_TUNE_EXT_TEMPLOW       "Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "A hőfok még nem érte el a kívánt értéket"
+#define STRING_TUNE_EXT_MARK120MM     "A 120mm-t jelöld be a szálon\nNyomd '%s' ha kész\nMérd meg a hátralévő hosszt\nadagolás után."
+#define STRING_TUNE_EXT_HEATOFF       "Kikapcsolod a fűtést?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Állítható E-lépés"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "Új E-lépés mentve!\nNe felejtsd el\nmenteni EEPROM-ba.\nÚj érték: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Fennmaradó Hossz:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Régi e-lépés: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "Új e-lépés: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Kapcsolat"
+#define STRING_OFFSET_TOOL            "Második fej eltolása"
+#define STRING_HYBRID_THRESHOLD       "TMC Hibrid Küszöbérték"
+#define STRING_NOTIFICATIONS          "Értesítések"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Magyar"
     #define STRING_HEAT                   "Fűtés"
     #define STRING_MOVE                   "Mozgás"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Fűtés(ek) bekapcsolva maradt(ak).\nKikapcsolod az összes fűtést?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_it.h b/TFT/src/User/API/Language/language_it.h
index c5c84b9099..ccdead6d02 100644
--- a/TFT/src/User/API/Language/language_it.h
+++ b/TFT/src/User/API/Language/language_it.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_IT_H_
-#define _LANGUAGE_IT_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Italiano"
+#define STRING_HEAT                   "Riscalda"
+#define STRING_MOVE                   "Muovi"
+#define STRING_HOME                   "Home"
+#define STRING_DISABLE_STEPPERS       "Spegni mot"
+#define STRING_PRINT                  "Stampa"
+#define STRING_EXTRUDE                "Estrudi"
+#define STRING_FAN                    "Ventola"
+#define STRING_SETTINGS               "Opzioni"
+#define STRING_SCREEN_SETTINGS        "Schermo"
+#define STRING_MACHINE_SETTINGS       "Stampante"
+#define STRING_FEATURE_SETTINGS       "Extra"
+#define STRING_SOUND                  "Suono"
+#define STRING_TOUCH_SOUND            "Suono touch"
+#define STRING_TOAST_SOUND            "Notifiche Toast"
+#define STRING_ALERT_SOUND            "Popup e Avvisi"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Spegni"
+#define STRING_RGB_SETTINGS           "RGB LED"
+#define STRING_RGB_OFF                "Spegni"
+#define STRING_TERMINAL               "Terminale"
+#define STRING_CUSTOM                 "Custom"
+#define STRING_LEVELING               "Livella"
+#define STRING_POINT_1                "Punto 1"
+#define STRING_POINT_2                "Punto 2"
+#define STRING_POINT_3                "Punto 3"
+#define STRING_POINT_4                "Punto 4"
+#define STRING_POINT_5                "Punto 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Livellamento Bed Completato"
+#define STRING_BL_SMART_FILL          "Punti di test mancanti\nsono stati scelti automaticamente.\n \nNote: ricorda di salvare!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Salva in slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Carica da slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Ricorda lo slot per il prossimo\nriavvio? (Salva EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Estrai"
+#define STRING_BLTOUCH_STOW           "Ritrai"
+#define STRING_BLTOUCH_REPEAT         "Ripeti"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Offset Sonda"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Sei sicuro?"
+#define STRING_DOWN                   "Giù"
+#define STRING_UP                     "Su"
+#define STRING_SAVE                   "Salva"
+#define STRING_RESTORE                "Ripristina"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Cancella"
+#define STRING_NEXT                   "Avanti"
+#define STRING_DISTANCE               "Distanza"
+#define STRING_INVALID_VALUE          "Valore invalido"
+#define STRING_TIMEOUT_REACHED        "Timeout raggiunto!"
+#define STRING_PROCESS_RUNNING        "Processo già in esecuzione!"
+#define STRING_PROCESS_COMPLETED      "Processo completato!"
+#define STRING_PROCESS_ABORTED        "Processo interrotto!"
+#define STRING_INC                    "Aumenta"
+#define STRING_DEC                    "Diminuisci"
+#define STRING_NOZZLE                 "Ugello"
+#define STRING_BED                    "Piatto"
+#define STRING_CHAMBER                "Camera"
+#define STRING_START                  "Avvia"
+#define STRING_STOP                   "Stop"
+#define STRING_BACK                   "Indietro"
+#define STRING_PAGE_UP                "Pagina Su"
+#define STRING_PAGE_DOWN              "Pagina Giu"
+#define STRING_PAUSE                  "Pausa"
+#define STRING_RESUME                 "Riprendi"
+#define STRING_LOAD                   "Carica"
+#define STRING_UNLOAD                 "Estrai"
+#define STRING_SLOW_SPEED             "Lento"
+#define STRING_NORMAL_SPEED           "Normale"
+#define STRING_FAST_SPEED             "Veloce"
+#define STRING_FAN_FULL_SPEED         "Massimo"
+#define STRING_FAN_HALF_SPEED         "Metà"
+#define STRING_ROTATE_UI              "Ruota UI"
+#define STRING_TOUCHSCREEN_ADJUST     "Calibra"
+#define STRING_MORE                   "Altro"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Stato"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator colore sfondo"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator colore scritte"
+#define STRING_WHITE                  "Bianco"
+#define STRING_BLACK                  "Nero"
+#define STRING_BLUE                   "Blu"
+#define STRING_RED                    "Rosso"
+#define STRING_GREEN                  "Verde"
+#define STRING_CYAN                   "Ciano"
+#define STRING_YELLOW                 "Giallo"
+#define STRING_BROWN                  "Marrone"
+#define STRING_GRAY                   "Grigio"
+#define STRING_ORANGE                 "Arancione"
+#define STRING_INDIGO                 "Indaco"
+#define STRING_VIOLET                 "Viola"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Viola"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "Blu Scuro"
+#define STRING_DARKGREEN              "Vrde Scuro"
+#define STRING_DARKGRAY               "Grigio Scuro"
+#define STRING_DISCONNECT             "Scollega"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Percentuale"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Velocità"
+#define STRING_PERCENTAGE_FLOW        "Flusso"
+#define STRING_VALUE_ZERO             "Zero"
+#define STRING_1_DEGREE               "1°"
+#define STRING_5_DEGREE               "5°"
+#define STRING_10_DEGREE              "10°"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Pronto"
+#define STRING_BUSY                   "Caricamento,attendi..."
+#define STRING_UNCONNECTED            "Stampante non connessa"
+#define STRING_DISCONNECT_INFO        "Puoi controllare la stampante dal PC!"
+#define STRING_LOADING                "Caricamento..."
+#define STRING_POWER_FAILED           "Vuoi continuare la stampa?"
+#define STRING_CONTINUE               "Continua"
+#define STRING_CANCEL                 "Cancella"
+#define STRING_ADJUST_TITLE           "Calibrazione Touch Screen"
+#define STRING_ADJUST_INFO            "Premi sui punti rossi"
+#define STRING_ADJUST_OK              "Regolazione Completata!"
+#define STRING_ADJUST_FAILED          "Regolazione Fallita. Riprova!"
+#define STRING_WARNING                "Attenzione"
+#define STRING_STOP_PRINT             "Vuoi fermare la stampa?"
+#define STRING_CONFIRM                "Conferma"
+#define STRING_TFTSD                  "SD Schermo"
+#define STRING_READ_TFTSD_ERROR       "Errore lettura SD!"
+#define STRING_TFTSD_INSERTED         "SD Inserita"
+#define STRING_TFTSD_REMOVED          "SD Rimossa"
+#define STRING_U_DISK                 "USB Disk"
+#define STRING_READ_U_DISK_ERROR      "Errore lettura U Disk"
+#define STRING_U_DISK_INSERTED        "U Disk inserita!"
+#define STRING_U_DISK_REMOVED         "U Disk rimossa!"
+#define STRING_ONBOARDSD              "Micro SD"
+#define STRING_READ_ONBOARDSD_ERROR   "Errore lettura Micro SD!"
+#define STRING_FILAMENT_SENSOR        "Sensore Filamento"
+#define STRING_FILAMENT_RUNOUT        "Filamento finito!"
+#define STRING_PREHEAT                "Prepara"
+#define STRING_PREHEAT_BOTH           "Entrambi"
+#define STRING_IS_PAUSE               "Impossibile estrudere\ndurante la stampa,\nvuoi sospendere?"
+#define STRING_AUTO_SHUT_DOWN         "Auto Spegnimento"
+#define STRING_UNIFIEDMOVE            "Movimento"
+#define STRING_UNIFIEDHEAT            "Scalda"
+#define STRING_COOLDOWN               "Raffredda"
+#define STRING_EMERGENCYSTOP          "EMERGENZA"
+#define STRING_TOUCH_TO_EXIT          "Premi ovunque per uscire"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Attendi che la temperatura\ndell'hotend scenda\nsotto %d℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Forza"
+#define STRING_SHUTTING_DOWN          "Spegnimento..."
+#define STRING_PARAMETER_SETTING      "Parametri"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Mostra ACK nel terminale"
+#define STRING_INVERT_XAXIS           "Inverti Asse X"
+#define STRING_INVERT_YAXIS           "Inverti Asse Y"
+#define STRING_INVERT_ZAXIS           "Inverti Asse Z"
+#define STRING_MOVE_SPEED             "Vel. Movimenti (X Y Z)"
+#define STRING_KNOB_LED               "LED Manopola "
+#define STRING_KNOB_LED_IDLE          "LED Manopola inattivo"
+#define STRING_M0_PAUSE               "Messo in pausa dal comando M0"
+#define STRING_SEND_START_GCODE       "Gcode prima di stampare"
+#define STRING_SEND_END_GCODE         "Gcode dopo la stampa"
+#define STRING_SEND_CANCEL_GCODE      "Gcode Cancella"
+#define STRING_PERSISTENT_STATUS_INFO "Info/Stato Permanenti"
+#define STRING_FILE_LISTMODE          "Files in modalità lista"
+#define STRING_CURRENT_SETTING        "Corrente Motori(mA)"
+#define STRING_STEPS_SETTING          "Steps per mm"
+#define STRING_MAXFEEDRATE            "Max Avanzamento"
+#define STRING_MAXACCELERATION        "Max Accelerazione"
+#define STRING_ACCELERATION           "Accelerazione"
+#define STRING_PRINT_ACCELERATION     "Accel. Stampa"
+#define STRING_RETRACT_ACCELERATION   "Accel. Ritrazione"
+#define STRING_TRAVEL_ACCELERATION    "Accel. Spostamenti"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC Sensibilità Urto"
+#define STRING_FWRETRACT              "FW Retrazione"
+#define STRING_FWRECOVER              "FW Recupero Retrazione"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Ripristinare tutte le\nimpostazioni\nai valori predefiniti?"
+#define STRING_RESET_SETTINGS_DONE    "Ripristino di tutte le impostazioni\navvenuto con successo.\nperfavore riavvia il dispositivo."
+#define STRING_INFO                   "Info"
+#define STRING_LCD_BRIGHTNESS         "Luminosità LCD"
+#define STRING_LCD_BRIGHTNESS_DIM     "Lumin. LCD ridotta"
+#define STRING_LCD_DIM_IDLE_TIMER     "Riduzione lumin. dopo"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode schermo pieno"
+#define STRING_PLR_EN                 "Recupero mancanza corrente"
+#define STRING_SETTING_SAVE           "Salva le impostazioni"
+#define STRING_SETTING_RESET          "Ripristina impost standard"
+#define STRING_SETTING_RESTORE        "Ripristina impost precedenti"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Salvare le impostazioni di\nstampa nella EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Carica le impostazioni \ndalla EEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Ripristino EEPROM alle \nimpostazioni di fabbrica?"
+#define STRING_RETRACT_FEEDRATE       "Avanzamento retraz"
+#define STRING_RETRACT_LENGTH         "Lunghezza retraz"
+#define STRING_RETRACT_SWAP_LENGTH    "Lunghezza cambio fil."
+#define STRING_RETRACT_Z_LIFT         "Alza Z al cambio"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Avanzamento ripristino"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Avanzamento cambio fil"
+#define STRING_RECOVER_LENGTH         "Lunghezza extra al ripr."
+#define STRING_SWAP_RECOVER_LENGTH    "Lunghezza extra al cambio"
+#define STRING_START_PRINT            "Inizia a stampare:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK stile notifica"
+#define STRING_LEVELING_EDGE_DISTANCE "Distanza dai bordi"
+#define STRING_XY_UNLOCK              "Sblocca XY"
+#define STRING_TUNING                 "Regola"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune potrebbe\nrichiedere un po' di tempo.\nContinuare?"
+#define STRING_PID_START_INFO_2       "PID autotune in corso!"
+#define STRING_PID_START_INFO_3       "Non toccare lo schermo prima del completamento (LED verde Acceso)!"
+#define STRING_TUNE_EXTRUDER          "Step E"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Temperatura desisderata troppo bassa!\nTemperatura minima: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "La temperatura non è ancora al valore desiderato"
+#define STRING_TUNE_EXT_MARK120MM     "Segna 120 mm sul filamento\nPremi '%s' quando pronto\nMisura lunghezza rimanente\ndopo l'estrusione"
+#define STRING_TUNE_EXT_HEATOFF       "Spegnere il riscaldamento?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Regola E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "Nuovi E-steps salvati!\nNon dimenticare di\nsalvarli nellaEEPROM\nNuovo valore: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Lunghezza rimanente:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Vecchi e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "Nuovi e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Imp.Conn."
+#define STRING_OFFSET_TOOL            "Offset 2nd Ugello"
+#define STRING_HYBRID_THRESHOLD       "TMC Soglia Modo Ibrido"
+#define STRING_NOTIFICATIONS          "Notifiche"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Italiano"
     #define STRING_HEAT                   "Riscalda"
     #define STRING_MOVE                   "Muovi"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_jp.h b/TFT/src/User/API/Language/language_jp.h
index b88daae155..d61d679197 100644
--- a/TFT/src/User/API/Language/language_jp.h
+++ b/TFT/src/User/API/Language/language_jp.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_JP_H_
-#define _LANGUAGE_JP_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "日本語"
+#define STRING_HEAT                   "あたため"
+#define STRING_MOVE                   "移動"
+#define STRING_HOME                   "ゼロにする"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "プリント"
+#define STRING_EXTRUDE                "押出"
+#define STRING_FAN                    "ファン"
+#define STRING_SETTINGS               "設定"
+#define STRING_SCREEN_SETTINGS        "画面"
+#define STRING_MACHINE_SETTINGS       "マシン"
+#define STRING_FEATURE_SETTINGS       "機能"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND             "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "シャットダウン"
+#define STRING_RGB_SETTINGS           "LED カラー"
+#define STRING_RGB_OFF                "LED オフ"
+#define STRING_TERMINAL               "端末"
+#define STRING_CUSTOM                 "カスタム"
+#define STRING_LEVELING               "レベリング"
+#define STRING_POINT_1                "ポイント1"
+#define STRING_POINT_2                "ポイント2"
+#define STRING_POINT_3                "ポイント3"
+#define STRING_POINT_4                "ポイント4"
+#define STRING_POINT_5                "ポイント5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "自動調整"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "テスト"
+#define STRING_BLTOUCH_DEPLOY         "展開"
+#define STRING_BLTOUCH_STOW           "収納"
+#define STRING_BLTOUCH_REPEAT         "繰り返す"
+#define STRING_Z_OFFSET               "Zオフセット"
+#define STRING_PROBE_OFFSET           "プローブオフセット"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "保存"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "リセット"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "増え"
+#define STRING_DEC                    "減る"
+#define STRING_NOZZLE                 "ノズル"
+#define STRING_BED                    "ベッド"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "停止"
+#define STRING_BACK                   "戻る"
+#define STRING_PAGE_UP                "前ページ"
+#define STRING_PAGE_DOWN              "次ページ"
+#define STRING_PAUSE                  "一時停止"
+#define STRING_RESUME                 "続ける"
+#define STRING_LOAD                   "増え"
+#define STRING_UNLOAD                 "減る"
+#define STRING_SLOW_SPEED             "ゆっくり"
+#define STRING_NORMAL_SPEED           "正常速度"
+#define STRING_FAST_SPEED             "早め"
+#define STRING_FAN_FULL_SPEED         "全速"
+#define STRING_FAN_HALF_SPEED         "50%速さ"
+#define STRING_ROTATE_UI              "回転UI"
+#define STRING_TOUCHSCREEN_ADJUST     "校正する"
+#define STRING_MORE                   "詳細"
+#define STRING_SCREEN_INFO            "ついて"
+#define STRING_STATUS                 "状態"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin シミュレータの背景色"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlinシミュレータフォントの色"
+#define STRING_WHITE                  "白色"
+#define STRING_BLACK                  "黒色"
+#define STRING_BLUE                   "青色"
+#define STRING_RED                    "赤色"
+#define STRING_GREEN                  "緑色"
+#define STRING_CYAN                   "シアン"
+#define STRING_YELLOW                 "黄色"
+#define STRING_BROWN                  "茶色"
+#define STRING_GRAY                   "灰色"
+#define STRING_ORANGE                 "オレンジ"
+#define STRING_INDIGO                 "インディゴ"
+#define STRING_VIOLET                 "バイオレット"
+#define STRING_MAGENTA                "赤紫色"
+#define STRING_PURPLE                 "紫"
+#define STRING_LIME                   "ライム"
+#define STRING_DARKBLUE               "濃紺"
+#define STRING_DARKGREEN              "ダークグリーン"
+#define STRING_DARKGRAY               "暗灰色"
+#define STRING_DISCONNECT             "データ接続"
+#define STRING_BAUDRATE               "ポートレート"
+#define STRING_PERCENTAGE             "パーセント"
+#define STRING_BABYSTEP               "ベビーステップ"
+#define STRING_PERCENTAGE_SPEED       "スビード"
+#define STRING_PERCENTAGE_FLOW        "押出"
+#define STRING_VALUE_ZERO             "ゼロ"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "準備中"
+#define STRING_BUSY                   "ビジー状態、しばらくお待ちください..."
+#define STRING_UNCONNECTED            "プリンターに連続していない!"
+#define STRING_DISCONNECT_INFO        "SDカード　PC両用"
+#define STRING_LOADING                "ロッド中..."
+#define STRING_POWER_FAILED           "プリントを継続しますか?"
+#define STRING_CONTINUE               "継続"
+#define STRING_CANCEL                 "キャンセル"
+#define STRING_ADJUST_TITLE           "タッチスクリーン較正"
+#define STRING_ADJUST_INFO            "赤星をタッチ"
+#define STRING_ADJUST_OK              "校正が成功しました"
+#define STRING_ADJUST_FAILED          "校正が失敗しました、も一度お試して下さい"
+#define STRING_WARNING                "注意"
+#define STRING_STOP_PRINT             "プリントを中止しますか?"
+#define STRING_CONFIRM                "OK"
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "TFT SDカードの読み取りがエラー発生しました!"
+#define STRING_TFTSD_INSERTED         "SDカード入りました!"
+#define STRING_TFTSD_REMOVED          "SDカード出しました!"
+#define STRING_U_DISK                 "USBメモリー"
+#define STRING_READ_U_DISK_ERROR      "USBメモリー読み込みエラー!"
+#define STRING_U_DISK_INSERTED        "U Diskカード入りました!"
+#define STRING_U_DISK_REMOVED         "U Diskカード出しました!"
+#define STRING_ONBOARDSD              "内部 mSDカード"
+#define STRING_READ_ONBOARDSD_ERROR   "内部 mSDカードの読み取りがエラー発生しました!"
+#define STRING_FILAMENT_SENSOR        "フィラメントセンサ"
+#define STRING_FILAMENT_RUNOUT        "フィラメントランアウト!"
+#define STRING_PREHEAT                "予熱する"
+#define STRING_PREHEAT_BOTH           "両方"
+#define STRING_IS_PAUSE               "印刷時に押し出すことができない。印刷を中止しますか？"
+#define STRING_AUTO_SHUT_DOWN         "オートパワー"
+#define STRING_UNIFIEDMOVE            "移動"
+#define STRING_UNIFIEDHEAT            "ヒート&ファン"
+#define STRING_COOLDOWN               "クールダウン"
+#define STRING_EMERGENCYSTOP          "EM.停止"
+#define STRING_TOUCH_TO_EXIT          "クリックして終了します"
+#define STRING_MAINMENU               "メニュー"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "ホットエンドの温度が%d℃未満になるまで待ちます。" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "フォース"
+#define STRING_SHUTTING_DOWN          "シャットダウン..."
+#define STRING_PARAMETER_SETTING      "パラメータ"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "スマート"
+#define STRING_TERMINAL_ACK           "端末でACKを表示する"
+#define STRING_INVERT_XAXIS           "X軸を反転"
+#define STRING_INVERT_YAXIS           "Y軸を反転"
+#define STRING_INVERT_ZAXIS           "Z軸を反転"
+#define STRING_MOVE_SPEED             "移動速度(X Y Z)"
+#define STRING_KNOB_LED               "回転ノブLED"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "MOコマンドで一時停止"
+#define STRING_SEND_START_GCODE       "印刷前にGコードを開始する"
+#define STRING_SEND_END_GCODE         "印刷後にGコードを終了する"
+#define STRING_SEND_CANCEL_GCODE      "Gコードをキャンセルする"
+#define STRING_PERSISTENT_STATUS_INFO "永続的なステータス情報"
+#define STRING_FILE_LISTMODE          "ファイルビューアリストモード"
+#define STRING_CURRENT_SETTING        "ドライバー電流 (mA)"
+#define STRING_STEPS_SETTING          "MMあたりのステップ"
+#define STRING_MAXFEEDRATE            "マックスフィード率"
+#define STRING_MAXACCELERATION        "最大加速度"
+#define STRING_ACCELERATION           "加速度"
+#define STRING_PRINT_ACCELERATION     "印刷加速度"
+#define STRING_RETRACT_ACCELERATION   "引き戻し加速度"
+#define STRING_TRAVEL_ACCELERATION    "空振り加速度"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC バンプ感度"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "すべての設定をデフォルト値にリセットしますか?"
+#define STRING_RESET_SETTINGS_DONE    "すべての設定が正常にリセットされました。デバイスを再起動してください。"
+#define STRING_INFO                   "情報"
+#define STRING_LCD_BRIGHTNESS         "LCD明るさ"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCDの輝度が薄暗い"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD調光アイドルタイマー"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "カスタム"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "フルスクリーンでマーリンモード"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "設定をリセットする"
+#define STRING_SETTING_RESTORE        "設定を復元する"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "プリンタの設定をEEPROMに保存しますか?"
+#define STRING_EEPROM_RESTORE_INFO    "EEPROMから設定を再読み込み?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "引き戻し速度"
+#define STRING_RETRACT_LENGTH         "引き戻し長さ"
+#define STRING_RETRACT_SWAP_LENGTH    "交換時の引き戻し長さ"
+#define STRING_RETRACT_Z_LIFT         "引き戻し時のz軸上げの高さ"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "押出速度"
+#define STRING_SWAP_RECOVER_FEEDRATE  "交換時の押出速度"
+#define STRING_RECOVER_LENGTH         "余分な押し出し長さ"
+#define STRING_SWAP_RECOVER_LENGTH    "交換時の余分な押し出し長さ"
+#define STRING_START_PRINT            "印刷を開始する:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Disarm XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "日本語"
     #define STRING_HEAT                   "あたため"
     #define STRING_MOVE                   "移動"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_keywords.h b/TFT/src/User/API/Language/language_keywords.h
index 72a3712925..b3606c6cad 100644
--- a/TFT/src/User/API/Language/language_keywords.h
+++ b/TFT/src/User/API/Language/language_keywords.h
@@ -1,5 +1,4 @@
-#ifndef _LANGUAGE_KEYWORDS_H_
-#define _LANGUAGE_KEYWORDS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,6 +23,7 @@ extern "C" {
 #define LANG_KEY_TOUCH_SOUND                  "label_touch_sound:"
 #define LANG_KEY_TOAST_SOUND                  "label_toast_sound:"
 #define LANG_KEY_ALERT_SOUND                  "label_alert_sound:"
+#define LANG_KEY_PREHEATDONE_SOUND            "label_preheatdone_sound:"
 #define LANG_KEY_SHUT_DOWN                    "label_shut_down:"
 #define LANG_KEY_RGB_SETTINGS                 "label_rgb_settings:"
 #define LANG_KEY_RGB_OFF                      "label_rgb_off:"
@@ -239,6 +239,7 @@ extern "C" {
 #define LANG_KEY_120_SECONDS                  "label_120_seconds:"
 #define LANG_KEY_300_SECONDS                  "label_300_seconds:"
 #define LANG_KEY_CUSTOM_SECONDS               "label_custom_seconds:"
+#define LANG_KEY_EVENT_LED_MODE              "label_event_led_mode:"
 #define LANG_KEY_ST7920_FULLSCREEN            "label_st7920_fullscreen:"
 #define LANG_KEY_PLR_EN                       "label_plr_en:"
 #define LANG_KEY_SETTING_SAVE                 "label_setting_save:"
@@ -293,5 +294,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Language/language_nl.h b/TFT/src/User/API/Language/language_nl.h
new file mode 100644
index 0000000000..2d66a8c7fb
--- /dev/null
+++ b/TFT/src/User/API/Language/language_nl.h
@@ -0,0 +1,280 @@
+#pragma once
+
+#define STRING_LANGUAGE               "Dutch"
+#define STRING_HEAT                   "Verwarm"
+#define STRING_MOVE                   "Verplaats"
+#define STRING_HOME                   "Thuis"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Print"
+#define STRING_EXTRUDE                "Extrudeer"
+#define STRING_FAN                    "Ventilator"
+#define STRING_SETTINGS               "Instellingen"
+#define STRING_SCREEN_SETTINGS        "Scherm"
+#define STRING_MACHINE_SETTINGS       "Machine"
+#define STRING_FEATURE_SETTINGS       "Kenmerk"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Uitschakelen"
+#define STRING_RGB_SETTINGS           "LED Kleur"
+#define STRING_RGB_OFF                "LED Uit"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Aangepast"
+#define STRING_LEVELING               "Nivelleren"
+#define STRING_POINT_1                "Punt 1"
+#define STRING_POINT_2                "Punt 2"
+#define STRING_POINT_3                "Punt 3"
+#define STRING_POINT_4                "Punt 4"
+#define STRING_POINT_5                "Punt 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling voltooid"
+#define STRING_BL_SMART_FILL          "Missende probe punten\nzijn slim opgevuld.\n \nNote: Vergeet niet op te slaan!"
+#define STRING_BL_ENABLE              "BL: aan"
+#define STRING_BL_DISABLE             "BL: uit"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Sla op naar sleuf"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Laad van sleuf"
+#define STRING_ABL_SLOT0              "Sleuf 0"
+#define STRING_ABL_SLOT1              "Sleuf 1"
+#define STRING_ABL_SLOT2              "Sleuf 2"
+#define STRING_ABL_SLOT3              "Sleuf 3"
+#define STRING_ABL_SLOT_EEPROM        "Onthoud sleuf voor\nvolgende reboot?\n(sla op in EEPROM)"
+#define STRING_ABL_Z                  "Z vervagen"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Gebruiken"
+#define STRING_BLTOUCH_STOW           "Inzetten"
+#define STRING_BLTOUCH_REPEAT         "Herhaal"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Probe Offset"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Weet u het zeker?"
+#define STRING_DOWN                   "Omlaag"
+#define STRING_UP                     "Omhoog"
+#define STRING_SAVE                   "Bewaren"
+#define STRING_RESTORE                "Herstellen"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Standaard"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Volgende"
+#define STRING_DISTANCE               "Afstand"
+#define STRING_INVALID_VALUE          "Geen correcte waarde/s voorzien!"
+#define STRING_TIMEOUT_REACHED        "Time-out bereikt!"
+#define STRING_PROCESS_RUNNING        "Process bezig!"
+#define STRING_PROCESS_COMPLETED      "Process voltooid!"
+#define STRING_PROCESS_ABORTED        "Process geannuleerd!"
+#define STRING_INC                    "Verhogen"
+#define STRING_DEC                    "Verlagen"
+#define STRING_NOZZLE                 "Spuitneus"
+#define STRING_BED                    "Verwarmd bed"
+#define STRING_CHAMBER                "Kamer"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Stop"
+#define STRING_BACK                   "Terug"
+#define STRING_PAGE_UP                "Blz omhoog"
+#define STRING_PAGE_DOWN              "Blz omlaag"
+#define STRING_PAUSE                  "Pauze"
+#define STRING_RESUME                 "Hervatten"
+#define STRING_LOAD                   "Laden"
+#define STRING_UNLOAD                 "Lossen"
+#define STRING_SLOW_SPEED             "Traag"
+#define STRING_NORMAL_SPEED           "Normaal"
+#define STRING_FAST_SPEED             "Snel"
+#define STRING_FAN_FULL_SPEED         "Volledig"
+#define STRING_FAN_HALF_SPEED         "Half"
+#define STRING_ROTATE_UI              "Draai UI"
+#define STRING_TOUCHSCREEN_ADJUST     "TSC Aanpassen"
+#define STRING_MORE                   "Meer"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Status"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator achtergrond kleur"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator tekst kleur"
+#define STRING_WHITE                  "Wit"
+#define STRING_BLACK                  "Zwart"
+#define STRING_BLUE                   "Blauw"
+#define STRING_RED                    "Rood"
+#define STRING_GREEN                  "Groen"
+#define STRING_CYAN                   "Cyaan"
+#define STRING_YELLOW                 "Geel"
+#define STRING_BROWN                  "Bruin"
+#define STRING_GRAY                   "Grijs"
+#define STRING_ORANGE                 "Oranje"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Violet"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Purple"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "DarkBlue"
+#define STRING_DARKGREEN              "DarkGreen"
+#define STRING_DARKGRAY               "DarkGray"
+#define STRING_DISCONNECT             "Loskoppelen"
+#define STRING_BAUDRATE               "Baudsnelheid"
+#define STRING_PERCENTAGE             "Percentage"
+#define STRING_BABYSTEP               "BabyStap"
+#define STRING_PERCENTAGE_SPEED       "Snelheid"
+#define STRING_PERCENTAGE_FLOW        "Stromen"
+#define STRING_VALUE_ZERO             "Zero"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Gereed"
+#define STRING_BUSY                   "In verwerking ,wacht aub..."
+#define STRING_UNCONNECTED            "Geen printer gekoppeld!"
+#define STRING_DISCONNECT_INFO        "De printer kan nu door de computer bestuurd worden!"
+#define STRING_LOADING                "Opladen..."
+#define STRING_POWER_FAILED           "Verder met printen?"
+#define STRING_CONTINUE               "Verder"
+#define STRING_CANCEL                 "Afbreken"
+#define STRING_ADJUST_TITLE           "Touch Screen Calibratie"
+#define STRING_ADJUST_INFO            "Klik op de rode punt"
+#define STRING_ADJUST_OK              "Calibratie Gelukt"
+#define STRING_ADJUST_FAILED          "Calibratie Mislukt, Probeer Opnieuw aub"
+#define STRING_WARNING                "Waarschuwing"
+#define STRING_STOP_PRINT             "Stop afdruk?"
+#define STRING_CONFIRM                "Bevestig"
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "TFT SD leesfout!"
+#define STRING_TFTSD_INSERTED         "Kaart geplaatst!"
+#define STRING_TFTSD_REMOVED          "Kaart verwijdert!"
+#define STRING_U_DISK                 "U Disk"
+#define STRING_READ_U_DISK_ERROR      "U Disk Leesfout!"
+#define STRING_U_DISK_INSERTED        "U Disk geplaatst!"
+#define STRING_U_DISK_REMOVED         "U Disk verwijdert!"
+#define STRING_ONBOARDSD              "OnboardSD"
+#define STRING_READ_ONBOARDSD_ERROR   "Onboard SD-kaart leesfout!"
+#define STRING_FILAMENT_SENSOR        "Filament sensor"
+#define STRING_FILAMENT_RUNOUT        "filament op!"
+#define STRING_PREHEAT                "Voorverwarmen"
+#define STRING_PREHEAT_BOTH           "Beide"
+#define STRING_IS_PAUSE               "Kan niet extruderen\ntijdens printen,\nPauzeer printen?"
+#define STRING_AUTO_SHUT_DOWN         "Auto Power"
+#define STRING_UNIFIEDMOVE            "Beweging"
+#define STRING_UNIFIEDHEAT            "Verwarm/Ventilator"
+#define STRING_COOLDOWN               "Afkoelen"
+#define STRING_EMERGENCYSTOP          "NOODSTOP"
+#define STRING_TOUCH_TO_EXIT          "Aanraken om te verlaten"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Wacht tot de temperatuur\nvan de spuitkop\nlager dan %d℃ is" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Forceer Afsluiten"
+#define STRING_SHUTTING_DOWN          "Afsluiten..."
+#define STRING_PARAMETER_SETTING      "Parameter"
+#define STRING_ON                     "AAN"
+#define STRING_OFF                    "UIT"
+#define STRING_SMART                  "SLIM"
+#define STRING_TERMINAL_ACK           "Laat ACK in Terminal zien"
+#define STRING_INVERT_XAXIS           "Inverteer X Axis"
+#define STRING_INVERT_YAXIS           "Inverteer Y Axis"
+#define STRING_INVERT_ZAXIS           "Inverteer Z Axis"
+#define STRING_MOVE_SPEED             "Bewegingssnelheid(X Y Z)"
+#define STRING_KNOB_LED               "Draaiknop LED"
+#define STRING_KNOB_LED_IDLE          "Draaiknop LED inactief"
+#define STRING_M0_PAUSE               "Gepauseerd door M0 commando"
+#define STRING_SEND_START_GCODE       "Start Gcode before print"
+#define STRING_SEND_END_GCODE         "End Gcode after print"
+#define STRING_SEND_CANCEL_GCODE      "Cancel Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Aanhoudende statusinfo"
+#define STRING_FILE_LISTMODE          "Files viewer List Mode"
+#define STRING_CURRENT_SETTING        "Driver stroom (mA)"
+#define STRING_STEPS_SETTING          "Stappen permm"
+#define STRING_MAXFEEDRATE            "Max Feed Rate"
+#define STRING_MAXACCELERATION        "Max Acceleratie"
+#define STRING_ACCELERATION           "Acceleratie"
+#define STRING_PRINT_ACCELERATION     "Afdruk Acceleratie"
+#define STRING_RETRACT_ACCELERATION   "Retract Acceleratie"
+#define STRING_TRAVEL_ACCELERATION    "Travel Acceleratie"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC bump sensitiviteit"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Reset alle instellingen \naar de standaard waardes?"
+#define STRING_RESET_SETTINGS_DONE    "Reset van alle instellingen\nis succesvol gelukt.\nHerstart alstublieft het apparaat."
+#define STRING_INFO                   "Info"
+#define STRING_LCD_BRIGHTNESS         "LCD Brightness"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD Brightness dim"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD dim idle timer"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset instellingen"
+#define STRING_SETTING_RESTORE        "Herstel instellingen"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Sla printer instellingen\nop naar EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Herlaad instellingen van \nde EEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM naar de standaard printer instellingen?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start afdruk:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Ontgrendel XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune zal starten.\nDit kan een paar minuten duren.\nDoorgaan?"
+#define STRING_PID_START_INFO_2       "PID autotune is bezig!"
+#define STRING_PID_START_INFO_3       "Raak het scherm NIET aan totdat deze klaar is (groene LED aan)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connecties"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
diff --git a/TFT/src/User/API/Language/language_pl.h b/TFT/src/User/API/Language/language_pl.h
index 1275eaa877..1dd43c9269 100644
--- a/TFT/src/User/API/Language/language_pl.h
+++ b/TFT/src/User/API/Language/language_pl.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_PL_H_
-#define _LANGUAGE_PL_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Polski"
+#define STRING_HEAT                   "Temp."
+#define STRING_MOVE                   "Ruch"
+#define STRING_HOME                   "Powrót"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Druk"
+#define STRING_EXTRUDE                "Extrude"
+#define STRING_FAN                    "Wentylator"
+#define STRING_SETTINGS               "Ustawienia"
+#define STRING_SCREEN_SETTINGS        "Ekran"
+#define STRING_MACHINE_SETTINGS       "Drukarka"
+#define STRING_FEATURE_SETTINGS       "Opcje"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Wyłącz"
+#define STRING_RGB_SETTINGS           "Kolor LED"
+#define STRING_RGB_OFF                "Wyłącz LED"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Własne"
+#define STRING_LEVELING               "Poziomowanie"
+#define STRING_POINT_1                "Punkt 1"
+#define STRING_POINT_2                "Punkt 2"
+#define STRING_POINT_3                "Punkt 3"
+#define STRING_POINT_4                "Punkt 4"
+#define STRING_POINT_5                "Punkt 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Wysuń"
+#define STRING_BLTOUCH_STOW           "Schowaj"
+#define STRING_BLTOUCH_REPEAT         "Powtórz"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Przesunięcie"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Zapisz"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Więcej"
+#define STRING_DEC                    "Mniej"
+#define STRING_NOZZLE                 "Głowica"
+#define STRING_BED                    "Stół"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Stop"
+#define STRING_BACK                   "Powrót"
+#define STRING_PAGE_UP                "Dalej"
+#define STRING_PAGE_DOWN              "Wstecz"
+#define STRING_PAUSE                  "Wstrzymaj"
+#define STRING_RESUME                 "Wznów"
+#define STRING_LOAD                   "Load"
+#define STRING_UNLOAD                 "Unload"
+#define STRING_SLOW_SPEED             "Wolno"
+#define STRING_NORMAL_SPEED           "Normalnie"
+#define STRING_FAST_SPEED             "Szybko"
+#define STRING_FAN_FULL_SPEED         "Max"
+#define STRING_FAN_HALF_SPEED         "Połowa"
+#define STRING_ROTATE_UI              "Obrót"
+#define STRING_TOUCHSCREEN_ADJUST     "Kalibracja"
+#define STRING_MORE                   "Więcej"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Status"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
+#define STRING_WHITE                  "Biały"
+#define STRING_BLACK                  "Czarny"
+#define STRING_BLUE                   "Niebieski"
+#define STRING_RED                    "Czerwony"
+#define STRING_GREEN                  "Zielony"
+#define STRING_CYAN                   "Turkusowy"
+#define STRING_YELLOW                 "Żółty"
+#define STRING_BROWN                  "Brązowy"
+#define STRING_GRAY                   "Szary"
+#define STRING_ORANGE                 "Orange"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Violet"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Purple"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "DarkBlue"
+#define STRING_DARKGREEN              "DarkGreen"
+#define STRING_DARKGRAY               "DarkGray"
+#define STRING_DISCONNECT             "Odłącz"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Procent"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Prędkość"
+#define STRING_PERCENTAGE_FLOW        "Flow"
+#define STRING_VALUE_ZERO             "Zero"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Gotowy"
+#define STRING_BUSY                   "Trwa przetwarzanie, proszę czekać..."
+#define STRING_UNCONNECTED            "Drukarka nie podłączona!"
+#define STRING_DISCONNECT_INFO        "Teraz możesz kontrolować drukarkę z komputera!"
+#define STRING_LOADING                "Loading..."
+#define STRING_POWER_FAILED           "Kontynuować drukowanie?"
+#define STRING_CONTINUE               "Kontynuuj"
+#define STRING_CANCEL                 "Anuluj"
+#define STRING_ADJUST_TITLE           "Kalibracja ekranu dotykowego"
+#define STRING_ADJUST_INFO            "Dotykaj czerwoną kropkę"
+#define STRING_ADJUST_OK              "Kalibracja poprawna"
+#define STRING_ADJUST_FAILED          "Kalibracja niepoprawna, spróbuj ponownie"
+#define STRING_WARNING                "Uwaga"
+#define STRING_STOP_PRINT             "Zatrzymać drukowanie?"
+#define STRING_CONFIRM                "Potwierdź"
+#define STRING_TFTSD                  "SD TFT"
+#define STRING_READ_TFTSD_ERROR       "Błąd odczytu karty SD wyświetlacza!"
+#define STRING_TFTSD_INSERTED         "Karta włożona!"
+#define STRING_TFTSD_REMOVED          "Karta wyjęta!"
+#define STRING_U_DISK                 "U Disk"
+#define STRING_READ_U_DISK_ERROR      "Błąd odczytu U Disk!"
+#define STRING_U_DISK_INSERTED        "U Disk włożony!"
+#define STRING_U_DISK_REMOVED         "U Disk wyjęty!"
+#define STRING_ONBOARDSD              "SD płyta"
+#define STRING_READ_ONBOARDSD_ERROR   "Błąd odczytu karty SD na płycie!"
+#define STRING_FILAMENT_SENSOR        "Filament sensor"
+#define STRING_FILAMENT_RUNOUT        "brak filamentu!"
+#define STRING_PREHEAT                "Rozgrzew."
+#define STRING_PREHEAT_BOTH           "Wszystko"
+#define STRING_IS_PAUSE               "Operacja niedostępna\nw trakcie drukowania,\nwstrzymać drukowanie?"
+#define STRING_AUTO_SHUT_DOWN         "Auto Wył."
+#define STRING_UNIFIEDMOVE            "Ruch"
+#define STRING_UNIFIEDHEAT            "Temperatura"
+#define STRING_COOLDOWN               "Chłodzenie"
+#define STRING_EMERGENCYSTOP          "ZATRZYMAJ"
+#define STRING_TOUCH_TO_EXIT          "Dotkij aby wyjść"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Czekam na schłodzenie\ndo %d℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Wymuś"
+#define STRING_SHUTTING_DOWN          "Wyłączanie..."
+#define STRING_PARAMETER_SETTING      "Parametr"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Show ACK in Terminal"
+#define STRING_INVERT_XAXIS           "Invert X Axis"
+#define STRING_INVERT_YAXIS           "Invert Y Axis"
+#define STRING_INVERT_ZAXIS           "Invert Z Axis"
+#define STRING_MOVE_SPEED             "Move speed(X Y Z)"
+#define STRING_KNOB_LED               "Rotary Knob LED"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Paused by M0 command"
+#define STRING_SEND_START_GCODE       "Start Gcode before print"
+#define STRING_SEND_END_GCODE         "End Gcode after print"
+#define STRING_SEND_CANCEL_GCODE      "Cancel Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Persistent Status Info"
+#define STRING_FILE_LISTMODE          "Files viewer List Mode"
+#define STRING_CURRENT_SETTING        "Driver Current (mA)"
+#define STRING_STEPS_SETTING          "Steps per mm"
+#define STRING_MAXFEEDRATE            "Max Feed Rate"
+#define STRING_MAXACCELERATION        "Max Acceleration"
+#define STRING_ACCELERATION           "Acceleration"
+#define STRING_PRINT_ACCELERATION     "Print Acceleration"
+#define STRING_RETRACT_ACCELERATION   "Retract Acceleration"
+#define STRING_TRAVEL_ACCELERATION    "Travel Acceleration"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC bump sensitivity"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Reset all settings to\ndefault values?"
+#define STRING_RESET_SETTINGS_DONE    "Reset all settings\nsuccessful.\nplease restart the device."
+#define STRING_INFO                   "Info"
+#define STRING_LCD_BRIGHTNESS         "LCD Brightness"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD Brightness dim"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD dim idle timer"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset default settings"
+#define STRING_SETTING_RESTORE        "Restore settings"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start Printing:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Odblokuj XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Polski"
     #define STRING_HEAT                   "Temp."
     #define STRING_MOVE                   "Ruch"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_pt.h b/TFT/src/User/API/Language/language_pt.h
index c1ca9a9b79..f16a3a01af 100644
--- a/TFT/src/User/API/Language/language_pt.h
+++ b/TFT/src/User/API/Language/language_pt.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_PT_H_
-#define _LANGUAGE_PT_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Portugues"
+#define STRING_HEAT                   "Aquecer"
+#define STRING_MOVE                   "Mover"
+#define STRING_HOME                   "Inicio"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Imprimir"
+#define STRING_EXTRUDE                "Extrudir"
+#define STRING_FAN                    "Ventoinha"
+#define STRING_SETTINGS               "Configurar"
+#define STRING_SCREEN_SETTINGS        "Ecra"
+#define STRING_MACHINE_SETTINGS       "Impressora"
+#define STRING_FEATURE_SETTINGS       "Extras"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Desligar"
+#define STRING_RGB_SETTINGS           "LED cor"
+#define STRING_RGB_OFF                "Desligar"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Custom"
+#define STRING_LEVELING               "Nivelar"
+#define STRING_POINT_1                "Ponto 1"
+#define STRING_POINT_2                "Ponto 2"
+#define STRING_POINT_3                "Ponto 3"
+#define STRING_POINT_4                "Ponto 4"
+#define STRING_POINT_5                "Ponto 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Testar"
+#define STRING_BLTOUCH_DEPLOY         "Abrir"
+#define STRING_BLTOUCH_STOW           "Encolher"
+#define STRING_BLTOUCH_REPEAT         "Repetir"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Probe Offset"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Gravar"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Aumentar"
+#define STRING_DEC                    "Diminuir"
+#define STRING_NOZZLE                 "Nozzle"
+#define STRING_BED                    "Hotbed"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Parar"
+#define STRING_BACK                   "Voltar"
+#define STRING_PAGE_UP                "Subir pagina"
+#define STRING_PAGE_DOWN              "Pagina abaixo"
+#define STRING_PAUSE                  "Pausar"
+#define STRING_RESUME                 "Resumir"
+#define STRING_LOAD                   "Carregar"
+#define STRING_UNLOAD                 "Descarregar"
+#define STRING_SLOW_SPEED             "Lento"
+#define STRING_NORMAL_SPEED           "Normal"
+#define STRING_FAST_SPEED             "Rapido"
+#define STRING_FAN_FULL_SPEED         "Full"
+#define STRING_FAN_HALF_SPEED         "Half"
+#define STRING_ROTATE_UI              "Rodar"
+#define STRING_TOUCHSCREEN_ADJUST     "Ajustar"
+#define STRING_MORE                   "Mais"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Status"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
+#define STRING_WHITE                  "Branco"
+#define STRING_BLACK                  "Preto"
+#define STRING_BLUE                   "Azul"
+#define STRING_RED                    "Vermelho"
+#define STRING_GREEN                  "Verde"
+#define STRING_CYAN                   "Turquesa"
+#define STRING_YELLOW                 "Amarelo"
+#define STRING_BROWN                  "Castanho"
+#define STRING_GRAY                   "Cinzento"
+#define STRING_ORANGE                 "Orange"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Violet"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Purple"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "DarkBlue"
+#define STRING_DARKGREEN              "DarkGreen"
+#define STRING_DARKGRAY               "DarkGray"
+#define STRING_DISCONNECT             "Desconectar"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Percentagem"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Rapidez"
+#define STRING_PERCENTAGE_FLOW        "Fluxo"
+#define STRING_VALUE_ZERO             "Zero"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Pronto"
+#define STRING_BUSY                   "Em processamento, aguarde..."
+#define STRING_UNCONNECTED            "Nenhuma impressora conectada!"
+#define STRING_DISCONNECT_INFO        "Agora podes controlar a impressora com o computador!"
+#define STRING_LOADING                "Carregando..."
+#define STRING_POWER_FAILED           "Continuar a imprimir?"
+#define STRING_CONTINUE               "Continuar"
+#define STRING_CANCEL                 "Cancelar"
+#define STRING_ADJUST_TITLE           "Calibracao do Touch Screen"
+#define STRING_ADJUST_INFO            "Por favor, clique no ponto vermelho"
+#define STRING_ADJUST_OK              "Ajustado com sucesso"
+#define STRING_ADJUST_FAILED          "Ajuste falhou, tente novamente"
+#define STRING_WARNING                "Aviso"
+#define STRING_STOP_PRINT             "Parar de imprimir?"
+#define STRING_CONFIRM                "Confirme"
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "Erro a ler TFT SD!"
+#define STRING_TFTSD_INSERTED         "Cartao inserido!"
+#define STRING_TFTSD_REMOVED          "Cartao removido!"
+#define STRING_U_DISK                 "U Disk"
+#define STRING_READ_U_DISK_ERROR      "Erro a ler U Disk!"
+#define STRING_U_DISK_INSERTED        "U Disk inserido!"
+#define STRING_U_DISK_REMOVED         "U Disk removido!"
+#define STRING_ONBOARDSD              "OnboardSD"
+#define STRING_READ_ONBOARDSD_ERROR   "Erro a ler Onboard SD card!"
+#define STRING_FILAMENT_SENSOR        "Filament sensor"
+#define STRING_FILAMENT_RUNOUT        "Filamento runout!"
+#define STRING_PREHEAT                "Aquecer"
+#define STRING_PREHEAT_BOTH           "Ambos"
+#define STRING_IS_PAUSE               "Nao e possível a extrusão\ndurante a impressao,\npausar a impressao?"
+#define STRING_AUTO_SHUT_DOWN         "Auto Power"
+#define STRING_UNIFIEDMOVE            "Movimento"
+#define STRING_UNIFIEDHEAT            "Heat/Fan"
+#define STRING_COOLDOWN               "Arrefecer"
+#define STRING_EMERGENCYSTOP          "EMERGENCIA STOP"
+#define STRING_TOUCH_TO_EXIT          "Toque em qualquer lugar para sair"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Wait for the hotend\ntemperature to be\nlower than %d ℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Force"
+#define STRING_SHUTTING_DOWN          "Shutting down..."
+#define STRING_PARAMETER_SETTING      "Parâmetro"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Show ACK in Terminal"
+#define STRING_INVERT_XAXIS           "Invert X Axis"
+#define STRING_INVERT_YAXIS           "Invert Y Axis"
+#define STRING_INVERT_ZAXIS           "Invert Z Axis"
+#define STRING_MOVE_SPEED             "Move speed(X Y Z)"
+#define STRING_KNOB_LED               "Rotary Knob LED"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Paused by M0 command"
+#define STRING_SEND_START_GCODE       "Start Gcode before print"
+#define STRING_SEND_END_GCODE         "End Gcode after print"
+#define STRING_SEND_CANCEL_GCODE      "Cancel Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Persistent Status Info"
+#define STRING_FILE_LISTMODE          "Files viewer List Mode"
+#define STRING_CURRENT_SETTING        "Driver Current (mA)"
+#define STRING_STEPS_SETTING          "Steps per mm"
+#define STRING_MAXFEEDRATE            "Max Feed Rate"
+#define STRING_MAXACCELERATION        "Max Acceleration"
+#define STRING_ACCELERATION           "Acceleration"
+#define STRING_PRINT_ACCELERATION     "Print Acceleration"
+#define STRING_RETRACT_ACCELERATION   "Retract Acceleration"
+#define STRING_TRAVEL_ACCELERATION    "Travel Acceleration"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC bump sensitivity"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Reset all settings to\ndefault values?"
+#define STRING_RESET_SETTINGS_DONE    "Reset all settings\nsuccessful.\nplease restart the device."
+#define STRING_INFO                   "Info"
+#define STRING_LCD_BRIGHTNESS         "LCD Brightness"
+#define STRING_LCD_BRIGHTNESS_DIM     "LCD Brightness dim"
+#define STRING_LCD_DIM_IDLE_TIMER     "LCD dim idle timer"
+#define STRING_5_SECONDS              "5 Sec."
+#define STRING_10_SECONDS             "10 Sec."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset default settings"
+#define STRING_SETTING_RESTORE        "Restore settings"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start Printing:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Desbloquear XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Portugues"
     #define STRING_HEAT                   "Aquecer"
     #define STRING_MOVE                   "Mover"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_ru.h b/TFT/src/User/API/Language/language_ru.h
index f2afdff0cf..def5ffc811 100644
--- a/TFT/src/User/API/Language/language_ru.h
+++ b/TFT/src/User/API/Language/language_ru.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_RU_H_
-#define _LANGUAGE_RU_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Русский"
+#define STRING_HEAT                   "Нагрев"
+#define STRING_MOVE                   "Движение"
+#define STRING_HOME                   "Домой"
+#define STRING_DISABLE_STEPPERS       "Двигатели"
+#define STRING_PRINT                  "Печать"
+#define STRING_EXTRUDE                "Экструзия"
+#define STRING_FAN                    "Вентилятор"
+#define STRING_SETTINGS               "Настройки"
+#define STRING_SCREEN_SETTINGS        "Экран"
+#define STRING_MACHINE_SETTINGS       "Принтер"
+#define STRING_FEATURE_SETTINGS       "Опции"
+#define STRING_SOUND                  "Звуки"
+#define STRING_TOUCH_SOUND            "Звуки нажатий"
+#define STRING_TOAST_SOUND            "Звуки инфостроки"
+#define STRING_ALERT_SOUND            "Предупреждения"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Выключить"
+#define STRING_RGB_SETTINGS           "Цвет LED"
+#define STRING_RGB_OFF                "LED выкл"
+#define STRING_TERMINAL               "Терминал"
+#define STRING_CUSTOM                 "Своё меню"
+#define STRING_LEVELING               "Стол вруч."
+#define STRING_POINT_1                "Точка 1"
+#define STRING_POINT_2                "Точка 2"
+#define STRING_POINT_3                "Точка 3"
+#define STRING_POINT_4                "Точка 4"
+#define STRING_POINT_5                "Точка 5"
+#define STRING_BED_LEVELING           "Стол равнен."
+#define STRING_BL_COMPLETE            "Выравнивание стола окончено"
+#define STRING_BL_SMART_FILL          "Отсутствующие точки\nзамера были атоматически\nзаполнены.\nЗапомните для сохраниения!"
+#define STRING_BL_ENABLE              "BL: вкл"
+#define STRING_BL_DISABLE             "BL: выкл"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Равнение по сетке"
+#define STRING_ABL_SETTINGS           "Автовыравнивание"
+#define STRING_ABL_SETTINGS_BBL       "Билинейная калибровка"
+#define STRING_ABL_SETTINGS_UBL       "Универсальная калибровка"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Сохранить в ячейку"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Загрузить из ячейки"
+#define STRING_ABL_SLOT0              "Ячейка 0"
+#define STRING_ABL_SLOT1              "Ячейка 1"
+#define STRING_ABL_SLOT2              "Ячейка 2"
+#define STRING_ABL_SLOT3              "Ячейка 3"
+#define STRING_ABL_SLOT_EEPROM        "Восстановить из ячейки\nпри перезагрузке?\n(Сохранить в EEPROM)"
+#define STRING_ABL_Z                  "Z затухание"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "BLT тест"
+#define STRING_BLTOUCH_DEPLOY         "BLT вниз"
+#define STRING_BLTOUCH_STOW           "BLT вверх"
+#define STRING_BLTOUCH_REPEAT         "Точность Z"
+#define STRING_Z_OFFSET               "Отступ Z"
+#define STRING_PROBE_OFFSET           "Смещение датчика"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Вы уверены?"
+#define STRING_DOWN                   "Вниз"
+#define STRING_UP                     "Вверх"
+#define STRING_SAVE                   "Сохранить"
+#define STRING_RESTORE                "Вернуть"
+#define STRING_RESET                  "Сброс"
+#define STRING_DEFAULT                "По умолчанию"
+#define STRING_CLEAR                  "Очистить"
+#define STRING_NEXT                   "Следующий"
+#define STRING_DISTANCE               "Отступы"
+#define STRING_INVALID_VALUE          "Остутствуют правильные значения!"
+#define STRING_TIMEOUT_REACHED        "Время истекло!"
+#define STRING_PROCESS_RUNNING        "Идёт процесс!"
+#define STRING_PROCESS_COMPLETED      "Процесс завершён!"
+#define STRING_PROCESS_ABORTED        "Процесс прерван!"
+#define STRING_INC                    "Увеличить"
+#define STRING_DEC                    "Уменьшить"
+#define STRING_NOZZLE                 "Сопло"
+#define STRING_BED                    "Стол"
+#define STRING_CHAMBER                "Камера"
+#define STRING_START                  "Начать"
+#define STRING_STOP                   "Стоп"
+#define STRING_BACK                   "Назад"
+#define STRING_PAGE_UP                "\u0899 Стр." //Left Arrow
+#define STRING_PAGE_DOWN              "Стр. \u089A" //Right Arrow
+#define STRING_PAUSE                  "Пауза"
+#define STRING_RESUME                 "Продолжить"
+#define STRING_LOAD                   "Загрузка"
+#define STRING_UNLOAD                 "Выгрузка"
+#define STRING_SLOW_SPEED             "Медленно"
+#define STRING_NORMAL_SPEED           "Обычно"
+#define STRING_FAST_SPEED             "Быстро"
+#define STRING_FAN_FULL_SPEED         "Максимум"
+#define STRING_FAN_HALF_SPEED         "50%"
+#define STRING_ROTATE_UI              "Переворот"
+#define STRING_TOUCHSCREEN_ADJUST     "Калибровка"
+#define STRING_MORE                   "Больше\u089C"  //Curved Right Arrow
+#define STRING_SCREEN_INFO            "Инфо"
+#define STRING_STATUS                 "Статус"
+#define STRING_SIMULATOR_BG_COLOR     "Задний фон Marlin режима"
+#define STRING_SIMULATOR_FONT_COLOR   "Передний фон Marlin режима"
+#define STRING_WHITE                  "Белый"
+#define STRING_BLACK                  "Чёрный"
+#define STRING_BLUE                   "Синий"
+#define STRING_RED                    "Красный"
+#define STRING_GREEN                  "Зелёный"
+#define STRING_CYAN                   "Голубой"
+#define STRING_YELLOW                 "Жёлтый"
+#define STRING_BROWN                  "Коричневый"
+#define STRING_GRAY                   "Серый"
+#define STRING_ORANGE                 "Оранжевый"
+#define STRING_INDIGO                 "Индиго"
+#define STRING_VIOLET                 "Фиолетовый"
+#define STRING_MAGENTA                "Маджента"
+#define STRING_PURPLE                 "Пурпурный"
+#define STRING_LIME                   "Лаймовый"
+#define STRING_DARKBLUE               "Тёмно-синий"
+#define STRING_DARKGREEN              "Тёмно-зелёный"
+#define STRING_DARKGRAY               "Тёмно-серый"
+#define STRING_DISCONNECT             "Отключить"
+#define STRING_BAUDRATE               "Скорость"
+#define STRING_PERCENTAGE             "Подстройки"
+#define STRING_BABYSTEP               "Микрошаг Z"
+#define STRING_PERCENTAGE_SPEED       "Скорость"
+#define STRING_PERCENTAGE_FLOW        "Поток"
+#define STRING_VALUE_ZERO             "Обнулить"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01мм"
+#define STRING_01_MM                  "0.1мм"
+#define STRING_1_MM                   "1мм"
+#define STRING_5_MM                   "5мм"
+#define STRING_10_MM                  "10мм"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Готов"
+#define STRING_BUSY                   "Занято процессом, подождите..."
+#define STRING_UNCONNECTED            "Нет подключения!"
+#define STRING_DISCONNECT_INFO        "Управление принтером через компьютер"
+#define STRING_LOADING                "Загрузка..."
+#define STRING_POWER_FAILED           "Продолжить печать?"
+#define STRING_CONTINUE               "Продолжение"
+#define STRING_CANCEL                 "\u088F Отмена" //Cancel Sign
+#define STRING_ADJUST_TITLE           "Калибровка экрана"
+#define STRING_ADJUST_INFO            "Нажмите на красную точку"
+#define STRING_ADJUST_OK              "Успешная калибровка"
+#define STRING_ADJUST_FAILED          "Неудачная калибровка, попробуйте снова"
+#define STRING_WARNING                "Внимание"
+#define STRING_STOP_PRINT             "Остановить печать?"
+#define STRING_CONFIRM                "\u088E OK" //Confirm Sign
+#define STRING_TFTSD                  "SD экрана"
+#define STRING_READ_TFTSD_ERROR       "Ошибка чтения SD карты!"
+#define STRING_TFTSD_INSERTED         "SD карта вставлена!"
+#define STRING_TFTSD_REMOVED          "SD карта извлечена!"
+#define STRING_U_DISK                 "Флеш карта"
+#define STRING_READ_U_DISK_ERROR      "Ошибка чтения флеш карты!"
+#define STRING_U_DISK_INSERTED        "Флеш карта вставлена!"
+#define STRING_U_DISK_REMOVED         "Флеш карта извлечена!"
+#define STRING_ONBOARDSD              "SD платы"
+#define STRING_READ_ONBOARDSD_ERROR   "Ошибка чтения SD карты!"
+#define STRING_FILAMENT_SENSOR        "Сенсор прутка"
+#define STRING_FILAMENT_RUNOUT        "Пруток закончился"
+#define STRING_PREHEAT                "Преднагрев"
+#define STRING_PREHEAT_BOTH           "Оба"
+#define STRING_IS_PAUSE               "Невозможна экструзия\nпри печати, поставить\nна паузу?"
+#define STRING_AUTO_SHUT_DOWN         "Автовыключение"
+#define STRING_UNIFIEDMOVE            "Движение"
+#define STRING_UNIFIEDHEAT            "Нагрев"
+#define STRING_COOLDOWN               "Охладить"
+#define STRING_EMERGENCYSTOP          "Экст.стоп"
+#define STRING_TOUCH_TO_EXIT          "Нажмите для возврата"
+#define STRING_MAINMENU               "Меню"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Дождитесь температуры\nсопла не ниже чем %d℃" // Wait for the temperature of hotend to be lower than 50℃
+#define STRING_FORCE_SHUT_DOWN        "Принудительно выкл"
+#define STRING_SHUTTING_DOWN          "Выключаю..."
+#define STRING_PARAMETER_SETTING      "Параметры"
+#define STRING_ON                     "Вкл"
+#define STRING_OFF                    "Выкл"
+#define STRING_SMART                  "Умный"
+#define STRING_TERMINAL_ACK           "ACK терминала (C°)"
+#define STRING_INVERT_XAXIS           "Инверсия оси X"
+#define STRING_INVERT_YAXIS           "Инверсия оси Y"
+#define STRING_INVERT_ZAXIS           "Инверсия оси Z"
+#define STRING_MOVE_SPEED             "Скорость (X Y Z)"
+#define STRING_KNOB_LED               "Подсветка энкодера"
+#define STRING_KNOB_LED_IDLE          "Простой подсветки энкодера"
+#define STRING_M0_PAUSE               "Пауза по команде M0"
+#define STRING_SEND_START_GCODE       "G-код перед печатью"
+#define STRING_SEND_END_GCODE         "G-код после печати"
+#define STRING_SEND_CANCEL_GCODE      "G-код отмены печати"
+#define STRING_PERSISTENT_STATUS_INFO "Нагрев в инфостроке"
+#define STRING_FILE_LISTMODE          "Файлы в режиме строк"
+#define STRING_CURRENT_SETTING        "Настройка TMC драйверов"
+#define STRING_STEPS_SETTING          "Настройка шагов на мм"
+#define STRING_MAXFEEDRATE            "MAX скорость подачи"
+#define STRING_MAXACCELERATION        "MAX ускорение"
+#define STRING_ACCELERATION           "Ускорение"
+#define STRING_PRINT_ACCELERATION     "Печати"
+#define STRING_RETRACT_ACCELERATION   "Ретракта"
+#define STRING_TRAVEL_ACCELERATION    "Перемещения"
+#define STRING_JERK                   "Рывок"
+#define STRING_JUNCTION_DEVIATION     "Отклонение узла"
+#define STRING_BUMP_SENSITIVITY       "TMC чувствительность удара"
+#define STRING_FWRETRACT              "M207 ретракт"
+#define STRING_FWRECOVER              "M208 восстановление ретракта"
+#define STRING_LIN_ADVANCE            "К-фактор"
+#define STRING_RESET_SETTINGS_INFO    "Все настройки будут\nсброшены по умолчанию.\nПродолжить?"
+#define STRING_RESET_SETTINGS_DONE    "Успешный сброс настроек\nэкрана. Для полного\nвступления в силу,\nперегрузите устройство."
+#define STRING_INFO                   "\u0884 Информация" //Info Sign
+#define STRING_LCD_BRIGHTNESS         "Яркость LCD"
+#define STRING_LCD_BRIGHTNESS_DIM     "Регулировка яркости LCD"
+#define STRING_LCD_DIM_IDLE_TIMER     "Время до гашения LCD"
+#define STRING_5_SECONDS              "5 сек."
+#define STRING_10_SECONDS             "10 сек."
+#define STRING_30_SECONDS             "30 сек."
+#define STRING_60_SECONDS             "1 мин."
+#define STRING_120_SECONDS            "2 мин."
+#define STRING_300_SECONDS            "5 мин."
+#define STRING_CUSTOM_SECONDS         "Своё"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin на весь экран"
+#define STRING_PLR_EN                 "Работа после потери питания"
+#define STRING_SETTING_SAVE           "Сохранить настройки"
+#define STRING_SETTING_RESET          "Сбросить настройки"
+#define STRING_SETTING_RESTORE        "Восстановить настройки"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Сохранить настройки\nпринтера в EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Загрузить настройки\nиз EEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Сбрость EEPROM настройки\nпринтера на начальные?"
+#define STRING_RETRACT_FEEDRATE       "Скорость"
+#define STRING_RETRACT_LENGTH         "Длина"
+#define STRING_RETRACT_SWAP_LENGTH    "Длина при смене сопла"
+#define STRING_RETRACT_Z_LIFT         "Подъём по Z"
+#define STRING_RETRACT_AUTO           "Авто FW ретракт"
+#define STRING_RECOVER_FEEDRATE       "Скорость"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Скорость при смене сопла"
+#define STRING_RECOVER_LENGTH         "Длина"
+#define STRING_SWAP_RECOVER_LENGTH    "Длина при смене сопла"
+#define STRING_START_PRINT            "Начать печать:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK стиль уведомления"
+#define STRING_LEVELING_EDGE_DISTANCE "Отступы от краёв стола"
+#define STRING_XY_UNLOCK              "Моторы выкл"
+#define STRING_TUNING                 "Наладка"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID автонастройка"
+#define STRING_PID_START_INFO         "Сейчас будет запущена PID\nавтонастройка, это займёт\nнекоторое время. Продолжить?"
+#define STRING_PID_START_INFO_2       "Автонастройка PID в работе!"
+#define STRING_PID_START_INFO_3       "Не трогайте экран до\nокончания настройки\n(загориться зелёным LED)!"
+#define STRING_TUNE_EXTRUDER          "Настройка шагов"
+#define STRING_TUNE_EXT_EXTRUDE_100   "100mm экст."
+#define STRING_TUNE_EXT_TEMP          "Настройка экструдера/Нагрев"
+#define STRING_TUNE_EXT_TEMPLOW       "Требуемая температура\nслишком низкая!\nМинимальная температура: %d℃"
+#define STRING_TUNE_EXT_DESIREDVAL    "Температура еще не достигла требуемого значения"
+#define STRING_TUNE_EXT_MARK120MM     "Отметьте 120 мм на филаменте\nНажмите '%s' по говности\nИзмерьте полученную длину/nпосле экструдирования"
+#define STRING_TUNE_EXT_HEATOFF       "Отключить нагрев?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Подстройка E-шагов"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "E-шаги установлены!\nНе забудьте сохранить\nих в EEPROM\nНовое значение: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Оставшаяся длина:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Старые E-шаги: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "Новые E-шаги: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Соединение"
+#define STRING_OFFSET_TOOL            "Смещение 2-го сопла"
+#define STRING_HYBRID_THRESHOLD       "TMC гибридный порог"
+#define STRING_NOTIFICATIONS          "Уведомления"
+#define STRING_MESH_EDITOR            "Сетка ред."
+#define STRING_MESH_TUNER             "Сетка настр."
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Русский"
     #define STRING_HEAT                   "Нагрев"
     #define STRING_MOVE                   "Движение"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_sk.h b/TFT/src/User/API/Language/language_sk.h
index 12c394e322..b383e2c27a 100644
--- a/TFT/src/User/API/Language/language_sk.h
+++ b/TFT/src/User/API/Language/language_sk.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_SK_H_
-#define _LANGUAGE_SK_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Slovensky"
+#define STRING_HEAT                   "Teplota"
+#define STRING_MOVE                   "Posunúť"
+#define STRING_HOME                   "Domov"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Tlačiť"
+#define STRING_EXTRUDE                "Extrúder"
+#define STRING_FAN                    "Ofuk"
+#define STRING_SETTINGS               "Nastavenia"
+#define STRING_SCREEN_SETTINGS        "Obrazovka"
+#define STRING_MACHINE_SETTINGS       "Tlačiareň"
+#define STRING_FEATURE_SETTINGS       "Funkcie"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Vypnúť"
+#define STRING_RGB_SETTINGS           "Farba LED"
+#define STRING_RGB_OFF                "Vypnúť LED"
+#define STRING_TERMINAL               "Terminál"
+#define STRING_CUSTOM                 "Vlastné"
+#define STRING_LEVELING               "Vyrovnanie"
+#define STRING_POINT_1                "Bod 1"
+#define STRING_POINT_2                "Bod 2"
+#define STRING_POINT_3                "Bod 3"
+#define STRING_POINT_4                "Bod 4"
+#define STRING_POINT_5                "Bod 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Vystrčiť"
+#define STRING_BLTOUCH_STOW           "Stiahnuť"
+#define STRING_BLTOUCH_REPEAT         "Opakovať"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Probe Offset"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Uložiť"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Pridať"
+#define STRING_DEC                    "Ubrať"
+#define STRING_NOZZLE                 "Tryska"
+#define STRING_BED                    "Podložka"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Stop"
+#define STRING_BACK                   "Naspäť"
+#define STRING_PAGE_UP                "Ďalej"
+#define STRING_PAGE_DOWN              "Naspäť"
+#define STRING_PAUSE                  "Pauza"
+#define STRING_RESUME                 "Pokračovať"
+#define STRING_LOAD                   "Zaviesť"
+#define STRING_UNLOAD                 "Vysunúť"
+#define STRING_SLOW_SPEED             "Pomaly"
+#define STRING_NORMAL_SPEED           "Normálne"
+#define STRING_FAST_SPEED             "Rýchlo"
+#define STRING_FAN_FULL_SPEED         "Naplno"
+#define STRING_FAN_HALF_SPEED         "Polovičná"
+#define STRING_ROTATE_UI              "Otočiť"
+#define STRING_TOUCHSCREEN_ADJUST     "Kalibrácia"
+#define STRING_MORE                   "Viacej"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Status"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
+#define STRING_WHITE                  "Biela"
+#define STRING_BLACK                  "Čierna"
+#define STRING_BLUE                   "Modrá"
+#define STRING_RED                    "Červená"
+#define STRING_GREEN                  "Zelená"
+#define STRING_CYAN                   "Tyrkysová"
+#define STRING_YELLOW                 "Žltá"
+#define STRING_BROWN                  "Hnedá"
+#define STRING_GRAY                   "Šedá"
+#define STRING_ORANGE                 "Oranžová"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Fialová"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Purple"
+#define STRING_LIME                   "Lime"
+#define STRING_DARKBLUE               "DarkBlue"
+#define STRING_DARKGREEN              "DarkGreen"
+#define STRING_DARKGRAY               "DarkGray"
+#define STRING_DISCONNECT             "Odpojiť"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Percentá"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Rýchlosť"
+#define STRING_PERCENTAGE_FLOW        "Prietok"
+#define STRING_VALUE_ZERO             "Vypnúť"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Pripravená"
+#define STRING_BUSY                   "Počkajte prosím..."
+#define STRING_UNCONNECTED            "Tlačiareň odpojená!"
+#define STRING_DISCONNECT_INFO        "Teraz môžete tlačiareň ovládať z počítača!"
+#define STRING_LOADING                "Načítavam..."
+#define STRING_POWER_FAILED           "Pokračovať v tlači?"
+#define STRING_CONTINUE               "Pokračovať"
+#define STRING_CANCEL                 "Zrušiť"
+#define STRING_ADJUST_TITLE           "Kalibrácia"
+#define STRING_ADJUST_INFO            "Dotknite sa postupne všetkých bodov"
+#define STRING_ADJUST_OK              "Kalibrácia úspešná"
+#define STRING_ADJUST_FAILED          "Kalibrácia zlyhala, opakovať"
+#define STRING_WARNING                "Varovanie"
+#define STRING_STOP_PRINT             "Zastaviť tlač?"
+#define STRING_CONFIRM                "Potvrdiť"
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "Chyba pri načítaní SD karty!"
+#define STRING_TFTSD_INSERTED         "SD karta vložená!"
+#define STRING_TFTSD_REMOVED          "SD karta odstránená!"
+#define STRING_U_DISK                 "USB kľúč"
+#define STRING_READ_U_DISK_ERROR      "Chyba pri načítaní USB kľúča!"
+#define STRING_U_DISK_INSERTED        "USB kľúč vložený!"
+#define STRING_U_DISK_REMOVED         "USB disk odstránený!"
+#define STRING_ONBOARDSD              "SD karta na doske"
+#define STRING_READ_ONBOARDSD_ERROR   "Chyba pri načítaní SD karty na doske!"
+#define STRING_FILAMENT_SENSOR        "Filament senzor"
+#define STRING_FILAMENT_RUNOUT        "Chýba filament!"
+#define STRING_PREHEAT                "Nahriať"
+#define STRING_PREHEAT_BOTH           "Tryska/Podložka"
+#define STRING_IS_PAUSE               "Nemožno extrudovať\npočas tlače,\npozastaviť tlač?"
+#define STRING_AUTO_SHUT_DOWN         "Auto vyp."
+#define STRING_UNIFIEDMOVE            "Pohyb"
+#define STRING_UNIFIEDHEAT            "Nahriať"
+#define STRING_COOLDOWN               "Ochladiť"
+#define STRING_EMERGENCYSTOP          "STOP"
+#define STRING_TOUCH_TO_EXIT          "Dotknite sa obrazovky pre ukončenie"
+#define STRING_MAINMENU               "Menu"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Počkať na teplotu\ntrysky menej ako %d℃" // Počkať na teplotu hotendu menej ako 50℃
+#define STRING_FORCE_SHUT_DOWN        "Vynútené vypnutie"
+#define STRING_SHUTTING_DOWN          "Vypínanie..."
+#define STRING_PARAMETER_SETTING      "Parametre"
+#define STRING_ON                     "ZAP"
+#define STRING_OFF                    "VYP"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Show ACK in Terminal"
+#define STRING_INVERT_XAXIS           "Invertovať os X"
+#define STRING_INVERT_YAXIS           "Invertovať os Y"
+#define STRING_INVERT_ZAXIS           "Invertovať os Z"
+#define STRING_MOVE_SPEED             "Rýchlosť pohybu XYZ"
+#define STRING_KNOB_LED               "LED otočného tlačidla"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Pauza príkazom M0"
+#define STRING_SEND_START_GCODE       "Začiatočný Gcode"
+#define STRING_SEND_END_GCODE         "Koncový Gcode"
+#define STRING_SEND_CANCEL_GCODE      "Cancel Gcode"
+#define STRING_PERSISTENT_STATUS_INFO "Trvalé info o stave"
+#define STRING_FILE_LISTMODE          "Zobraziť súbory ako zoznam"
+#define STRING_CURRENT_SETTING        "Prúd ovládača (mA)"
+#define STRING_STEPS_SETTING          "Počet krokov na MM"
+#define STRING_MAXFEEDRATE            "Max Feed Rate"
+#define STRING_MAXACCELERATION        "Maximálna akcelerácia"
+#define STRING_ACCELERATION           "Akcelerácia"
+#define STRING_PRINT_ACCELERATION     "Akcelerácia pri tlači"
+#define STRING_RETRACT_ACCELERATION   "Akcelerácia retrakcie"
+#define STRING_TRAVEL_ACCELERATION    "Akcelerácia presunu"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC bump citlivosť"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Resetovať všetky nastavenia."
+#define STRING_RESET_SETTINGS_DONE    "Reset všetkých nastavení\nvykonaný. Pre správne\nfungovanie, prosím,\nreštartovať zariadenie."
+#define STRING_INFO                   "Info"
+#define STRING_LCD_BRIGHTNESS         "Jas LCD"
+#define STRING_LCD_BRIGHTNESS_DIM     "Zníženie jasu LCD"
+#define STRING_LCD_DIM_IDLE_TIMER     "Zníženie jasu LCD po"
+#define STRING_5_SECONDS              "5 sek."
+#define STRING_10_SECONDS             "10 sek."
+#define STRING_30_SECONDS             "30 Sec."
+#define STRING_60_SECONDS             "1 Min."
+#define STRING_120_SECONDS            "2 Min."
+#define STRING_300_SECONDS            "5 Min."
+#define STRING_CUSTOM_SECONDS         "Custom"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset default settings"
+#define STRING_SETTING_RESTORE        "Restore settings"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start Printing:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Odomknite XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Slovensky"
     #define STRING_HEAT                   "Teplota"
     #define STRING_MOVE                   "Posunúť"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_sl.h b/TFT/src/User/API/Language/language_sl.h
index 820bb11389..21b686aeb7 100644
--- a/TFT/src/User/API/Language/language_sl.h
+++ b/TFT/src/User/API/Language/language_sl.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_SL_H_
-#define _LANGUAGE_SL_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Slovenski"
+#define STRING_HEAT                   "Gretje"
+#define STRING_MOVE                   "Pomik"
+#define STRING_HOME                   "Domov"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Tisk"
+#define STRING_EXTRUDE                "Filament"
+#define STRING_FAN                    "Hlajenje"
+#define STRING_SETTINGS               "Nastavitve"
+#define STRING_SCREEN_SETTINGS        "Zaslon"
+#define STRING_MACHINE_SETTINGS       "Naprava"
+#define STRING_FEATURE_SETTINGS       "Funkcije"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Izklop"
+#define STRING_RGB_SETTINGS           "Barva LED"
+#define STRING_RGB_OFF                "LED Off"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Po meri"
+#define STRING_LEVELING               "Niveliraj"
+#define STRING_POINT_1                "Točka 1"
+#define STRING_POINT_2                "Točka 2"
+#define STRING_POINT_3                "Točka 3"
+#define STRING_POINT_4                "Točka 4"
+#define STRING_POINT_5                "Točka 5"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Postavi"
+#define STRING_BLTOUCH_STOW           "Skrij"
+#define STRING_BLTOUCH_REPEAT         "Ponovi"
+#define STRING_Z_OFFSET               "Z odmik"
+#define STRING_PROBE_OFFSET           "Odmik sonde"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Shrani"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Reset"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Več"
+#define STRING_DEC                    "Manj"
+#define STRING_NOZZLE                 "Šoba"
+#define STRING_BED                    "Miza"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Stop"
+#define STRING_BACK                   "Nazaj"
+#define STRING_PAGE_UP                "Stran gor"
+#define STRING_PAGE_DOWN              "Stran dol"
+#define STRING_PAUSE                  "Pavza"
+#define STRING_RESUME                 "Nadaljuj"
+#define STRING_LOAD                   "Naloži"
+#define STRING_UNLOAD                 "Izvrzi"
+#define STRING_SLOW_SPEED             "Počasi"
+#define STRING_NORMAL_SPEED           "Normalo"
+#define STRING_FAST_SPEED             "Hitro"
+#define STRING_FAN_FULL_SPEED         "100% moč"
+#define STRING_FAN_HALF_SPEED         "50% moč"
+#define STRING_ROTATE_UI              "Obrni UI"
+#define STRING_TOUCHSCREEN_ADJUST     "Umeri"
+#define STRING_MORE                   "Več"
+#define STRING_SCREEN_INFO            "Info"
+#define STRING_STATUS                 "Info"
+#define STRING_SIMULATOR_BG_COLOR     "Barva ozadja Marlin simulatorja"
+#define STRING_SIMULATOR_FONT_COLOR   "Barva pisave Marlin simulatorja"
+#define STRING_WHITE                  "Belo"
+#define STRING_BLACK                  "Črno"
+#define STRING_BLUE                   "Mordo"
+#define STRING_RED                    "Rdeče"
+#define STRING_GREEN                  "Zeleno"
+#define STRING_CYAN                   "Modrozelena"
+#define STRING_YELLOW                 "Rumena"
+#define STRING_BROWN                  "Rjana"
+#define STRING_GRAY                   "Siva"
+#define STRING_ORANGE                 "Oranžna"
+#define STRING_INDIGO                 "Indigo"
+#define STRING_VIOLET                 "Vijolična"
+#define STRING_MAGENTA                "Magenta"
+#define STRING_PURPLE                 "Temno vijolična"
+#define STRING_LIME                   "Limeta"
+#define STRING_DARKBLUE               "Temno morda"
+#define STRING_DARKGREEN              "Temno zelena"
+#define STRING_DARKGRAY               "Temno siva"
+#define STRING_DISCONNECT             "Odklopi"
+#define STRING_BAUDRATE               "Baud hitr."
+#define STRING_PERCENTAGE             "Procent"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Hitrost"
+#define STRING_PERCENTAGE_FLOW        "Pretok"
+#define STRING_VALUE_ZERO             "Nič"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "Pripravljen"
+#define STRING_BUSY                   "Zaseden s procesiranjem, prosim počakaj..."
+#define STRING_UNCONNECTED            "Nobenega tiskalnika priključenega!"
+#define STRING_DISCONNECT_INFO        "Zdaj lahko upravljaš tiskalnik z računalnikom!"
+#define STRING_LOADING                "Nalagam..."
+#define STRING_POWER_FAILED           "Nadaljuj s tiskanjem?" //Question Sign
+#define STRING_CONTINUE               "Nadaljuj"
+#define STRING_CANCEL                 "\u088F Prekliči" //Cancel Sign
+#define STRING_ADJUST_TITLE           "Kalibracija zaslona na dotik"
+#define STRING_ADJUST_INFO            "Pritisni na rdečo piko"
+#define STRING_ADJUST_OK              "Nastavitev uspešna"
+#define STRING_ADJUST_FAILED          "Nastavitev neuspešna, prosim poskusi ponovno"
+#define STRING_WARNING                "Opozorilo" //Exclamation Sign
+#define STRING_STOP_PRINT             "Ustavim tisk?"
+#define STRING_CONFIRM                "\u088E OK" //Confirm Sign
+#define STRING_TFTSD                  "TFT SD"
+#define STRING_READ_TFTSD_ERROR       "Napaka branja TFT SD kartice!"
+#define STRING_TFTSD_INSERTED         "Kartica vstavljena!"
+#define STRING_TFTSD_REMOVED          "Kartica odstranjena!"
+#define STRING_U_DISK                 "USB disk"
+#define STRING_READ_U_DISK_ERROR      "Napaka branja USB diska!"
+#define STRING_U_DISK_INSERTED        "USB disk vstavljen!"
+#define STRING_U_DISK_REMOVED         "USB disk odstranjen!"
+#define STRING_ONBOARDSD              "SKR SD"
+#define STRING_READ_ONBOARDSD_ERROR   "Napaka branja SKR SD kartice!"
+#define STRING_FILAMENT_SENSOR        "Senzor filamenta"
+#define STRING_FILAMENT_RUNOUT        "Ni več filamenta!"
+#define STRING_PREHEAT                "Predgretje"
+#define STRING_PREHEAT_BOTH           "Oboje"
+#define STRING_IS_PAUSE               "Ne morem estrudirat\nmed tiskanjem.\nPavziram tisk?"
+#define STRING_AUTO_SHUT_DOWN         "Samodejni izklop"
+#define STRING_UNIFIEDMOVE            "Vodenje"
+#define STRING_UNIFIEDHEAT            "Gretje"
+#define STRING_COOLDOWN               "Ohlajanje"
+#define STRING_EMERGENCYSTOP          "EM. STOP"
+#define STRING_TOUCH_TO_EXIT          "Klikni kjerkoli za izhod"
+#define STRING_MAINMENU               "Meni"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Čakam, da se šoba\nohladi pod %d °C"
+#define STRING_FORCE_SHUT_DOWN        "Prisilni izklop"
+#define STRING_SHUTTING_DOWN          "Ugašam..."
+#define STRING_PARAMETER_SETTING      "Parametri"
+#define STRING_ON                     "ON"
+#define STRING_OFF                    "OFF"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Pokaži ACK v terminalu"
+#define STRING_INVERT_XAXIS           "Invertiraj X os"
+#define STRING_INVERT_YAXIS           "Invertiraj Y os"
+#define STRING_INVERT_ZAXIS           "Invertiraj Z os"
+#define STRING_MOVE_SPEED             "Hitr. pomika (X Y Z)"
+#define STRING_KNOB_LED               "LED enkoder gumba"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Pavza (M0 ukaz)"
+#define STRING_SEND_START_GCODE       "Zaženi startno G-kodo"
+#define STRING_SEND_END_GCODE         "Zaženi končno G-kodo"
+#define STRING_SEND_CANCEL_GCODE      "Zaženi G-kodo preklica"
+#define STRING_PERSISTENT_STATUS_INFO "Stalno prikazuj status"
+#define STRING_FILE_LISTMODE          "Prikaz datotek v seznamu"
+#define STRING_CURRENT_SETTING        "Tok driverja mot. (mA)"
+#define STRING_STEPS_SETTING          "Št. korakov na MM"
+#define STRING_MAXFEEDRATE            "Max hitr. dovajanja fil."
+#define STRING_MAXACCELERATION        "Max pospešek"
+#define STRING_ACCELERATION           "Pospešek"
+#define STRING_PRINT_ACCELERATION     "Pospešek tiska"
+#define STRING_RETRACT_ACCELERATION   "Pospešek privleka fil."
+#define STRING_TRAVEL_ACCELERATION    "Pospešek pomika"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC občutljivost trka"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Reset vseh nastavitev na\nprivzete vrednosti?"
+#define STRING_RESET_SETTINGS_DONE    "Reset vseh nastavitev\nuspešna.\nPonovno zaženi napravo."
+#define STRING_INFO                   "Info" //Info Sign
+#define STRING_LCD_BRIGHTNESS         "Svetilnost LCD"
+#define STRING_LCD_BRIGHTNESS_DIM     "Zatemnitev LCD"
+#define STRING_LCD_DIM_IDLE_TIMER     "Zatemnitev po času"
+#define STRING_5_SECONDS              "5 sek."
+#define STRING_10_SECONDS             "10 sek."
+#define STRING_30_SECONDS             "30 sek."
+#define STRING_60_SECONDS             "1 min."
+#define STRING_120_SECONDS            "2 min."
+#define STRING_300_SECONDS            "5 min."
+#define STRING_CUSTOM_SECONDS         "Po meri"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin čez cel zaslon"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset nastavitev"
+#define STRING_SETTING_RESTORE        "Obnovi nastavitve"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Shrani nastavitve tiskalnika\nv EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Naloži nastavitve iz\nEEPROM-a?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start tiska:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Disarm XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Slovenski"
     #define STRING_HEAT                   "Gretje"
     #define STRING_MOVE                   "Pomik"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_tc.h b/TFT/src/User/API/Language/language_tc.h
index 565af512cc..b09fa914cb 100644
--- a/TFT/src/User/API/Language/language_tc.h
+++ b/TFT/src/User/API/Language/language_tc.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_TC_H_
-#define _LANGUAGE_TC_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "正體中文"
+#define STRING_HEAT                   "加熱"
+#define STRING_MOVE                   "移動"
+#define STRING_HOME                   "回原點"
+#define STRING_DISABLE_STEPPERS       "解鎖電機"
+#define STRING_PRINT                  "列印"
+#define STRING_EXTRUDE                "擠出"
+#define STRING_FAN                    "風扇"
+#define STRING_SETTINGS               "設定"
+#define STRING_SCREEN_SETTINGS        "螢幕設定"
+#define STRING_MACHINE_SETTINGS       "機器設定"
+#define STRING_FEATURE_SETTINGS       "功能設定"
+#define STRING_SOUND                  "聲音"
+#define STRING_TOUCH_SOUND            "按鈕聲音"
+#define STRING_TOAST_SOUND            "Toast 提示聲音"
+#define STRING_ALERT_SOUND            "彈窗和提示聲音"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "關閉電源"
+#define STRING_RGB_SETTINGS           "燈光顏色"
+#define STRING_RGB_OFF                "關閉燈光"
+#define STRING_TERMINAL               "終端"
+#define STRING_CUSTOM                 "自定義"
+#define STRING_LEVELING               "調平"
+#define STRING_POINT_1                "第一點"
+#define STRING_POINT_2                "第二點"
+#define STRING_POINT_3                "第三點"
+#define STRING_POINT_4                "第四點"
+#define STRING_POINT_5                "第五點"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "平臺調平完成!"
+#define STRING_BL_SMART_FILL          "部分點未探測，已被自動填充，需要手動保存!"
+#define STRING_BL_ENABLE              "BL:已開啟"
+#define STRING_BL_DISABLE             "BL:已關閉"
+#define STRING_ABL                    "自動調平"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch "
+#define STRING_BLTOUCH_TEST           "BLTouch檢測"
+#define STRING_BLTOUCH_DEPLOY         "探針彈出"
+#define STRING_BLTOUCH_STOW           "探針收回"
+#define STRING_BLTOUCH_REPEAT         "精度測試"
+#define STRING_Z_OFFSET               "Z軸偏移"
+#define STRING_PROBE_OFFSET           "探針偏移"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "降低"
+#define STRING_UP                     "抬升"
+#define STRING_SAVE                   "儲存設定"
+#define STRING_RESTORE                "恢復"
+#define STRING_RESET                  "重設"
+#define STRING_DEFAULT                "默認"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "下一個"
+#define STRING_DISTANCE               "距離"
+#define STRING_INVALID_VALUE          "沒有有效的條件!"
+#define STRING_TIMEOUT_REACHED        "已超時!"
+#define STRING_PROCESS_RUNNING        "正在運行,請稍後"
+#define STRING_PROCESS_COMPLETED      "處理已完成!"
+#define STRING_PROCESS_ABORTED        "處理已被中斷!"
+#define STRING_INC                    "增加"
+#define STRING_DEC                    "減少"
+#define STRING_NOZZLE                 "噴頭"
+#define STRING_BED                    "熱床"
+#define STRING_CHAMBER                "機殼"
+#define STRING_START                  "開始"
+#define STRING_STOP                   "停止"
+#define STRING_BACK                   "返回"
+#define STRING_PAGE_UP                "上一頁"
+#define STRING_PAGE_DOWN              "下一頁"
+#define STRING_PAUSE                  "暫停"
+#define STRING_RESUME                 "繼續"
+#define STRING_LOAD                   "進料"
+#define STRING_UNLOAD                 "退料"
+#define STRING_SLOW_SPEED             "慢速"
+#define STRING_NORMAL_SPEED           "常速"
+#define STRING_FAST_SPEED             "快速"
+#define STRING_FAN_FULL_SPEED         "全速"
+#define STRING_FAN_HALF_SPEED         "半速"
+#define STRING_ROTATE_UI              "顯示方向"
+#define STRING_TOUCHSCREEN_ADJUST     "觸控校正"
+#define STRING_MORE                   "更多"
+#define STRING_SCREEN_INFO            "關於"
+#define STRING_STATUS                 "狀態"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin模式背景顏色"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin模式字體顏色"
+#define STRING_WHITE                  "白"
+#define STRING_BLACK                  "黑"
+#define STRING_BLUE                   "藍"
+#define STRING_RED                    "紅"
+#define STRING_GREEN                  "綠"
+#define STRING_CYAN                   "青"
+#define STRING_YELLOW                 "黃"
+#define STRING_BROWN                  "棕"
+#define STRING_GRAY                   "灰"
+#define STRING_ORANGE                 "橘"
+#define STRING_INDIGO                 "靛藍"
+#define STRING_VIOLET                 "藍紫"
+#define STRING_MAGENTA                "桃紅"
+#define STRING_PURPLE                 "紫"
+#define STRING_LIME                   "萊姆"
+#define STRING_DARKBLUE               "暗藍"
+#define STRING_DARKGREEN              "暗綠"
+#define STRING_DARKGRAY               "深灰"
+#define STRING_DISCONNECT             "中斷連線"
+#define STRING_BAUDRATE               "串列傳輸速率"
+#define STRING_PERCENTAGE             "百分比"
+#define STRING_BABYSTEP               "Z軸微調"
+#define STRING_PERCENTAGE_SPEED       "速度百分比"
+#define STRING_PERCENTAGE_FLOW        "流量百分比"
+#define STRING_VALUE_ZERO             "歸零"
+#define STRING_1_DEGREE               "1℃"
+#define STRING_5_DEGREE               "5℃"
+#define STRING_10_DEGREE              "10℃"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%%"
+#define STRING_READY                  "已準備好"
+#define STRING_BUSY                   "系統繁忙請稍等"
+#define STRING_UNCONNECTED            "尚未連線到主機板"
+#define STRING_DISCONNECT_INFO        "電腦控制模式"
+#define STRING_LOADING                "讀取中"
+#define STRING_POWER_FAILED           "要繼續列印嗎？" //Question Sign
+#define STRING_CONTINUE               "繼續"
+#define STRING_CANCEL                 "取消" //Cancel Sign
+#define STRING_ADJUST_TITLE           "觸控校正"
+#define STRING_ADJUST_INFO            "點擊紅點"
+#define STRING_ADJUST_OK              "校正成功"
+#define STRING_ADJUST_FAILED          "校正失敗"
+#define STRING_WARNING                "警告" //Exclamation Sign
+#define STRING_STOP_PRINT             "要停止列印嗎？"
+#define STRING_CONFIRM                "確定" //Confirm Sign
+#define STRING_TFTSD                  "SD卡"
+#define STRING_READ_TFTSD_ERROR       "SD卡讀取失敗"
+#define STRING_TFTSD_INSERTED         "偵測到SD卡"
+#define STRING_TFTSD_REMOVED          "SD卡已拔出"
+#define STRING_U_DISK                 "隨身碟"
+#define STRING_READ_U_DISK_ERROR      "隨身碟讀取失敗"
+#define STRING_U_DISK_INSERTED        "偵測到隨身碟"
+#define STRING_U_DISK_REMOVED         "隨身碟已拔出"
+#define STRING_ONBOARDSD              "主機板插槽的SD卡"
+#define STRING_READ_ONBOARDSD_ERROR   "主機板插槽的SD卡讀取失敗"
+#define STRING_FILAMENT_SENSOR        "耗材感應器"
+#define STRING_FILAMENT_RUNOUT        "沒偵測到耗材"
+#define STRING_PREHEAT                "預熱"
+#define STRING_PREHEAT_BOTH           "全部"
+#define STRING_IS_PAUSE               "列印時無法擠出耗材，要暫停列印嗎？"
+#define STRING_AUTO_SHUT_DOWN         "自動關機"
+#define STRING_UNIFIEDMOVE            "運動"
+#define STRING_UNIFIEDHEAT            "溫度"
+#define STRING_COOLDOWN               "冷卻"
+#define STRING_EMERGENCYSTOP          "立刻停止"
+#define STRING_TOUCH_TO_EXIT          "觸控任意位置退出頁面"
+#define STRING_MAINMENU               "選單"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "噴頭降溫中，直到%d ℃時自動關機" // The length of the info line is 24 characters, so the "temperatureof" will automatically be divided into "temperature of..."
+#define STRING_FORCE_SHUT_DOWN        "強制關機"
+#define STRING_SHUTTING_DOWN          "關機中"
+#define STRING_PARAMETER_SETTING      "參數設定"
+#define STRING_ON                     "開啟"
+#define STRING_OFF                    "關閉"
+#define STRING_SMART                  "自動"
+#define STRING_TERMINAL_ACK           "在G-code終端顯示溫度"
+#define STRING_INVERT_XAXIS           "X軸反向運轉"
+#define STRING_INVERT_YAXIS           "Y軸反向運轉"
+#define STRING_INVERT_ZAXIS           "Z軸反向運轉"
+#define STRING_MOVE_SPEED             "移動速度(X Y Z)"
+#define STRING_KNOB_LED               "旋鈕LED顏色"
+#define STRING_KNOB_LED_IDLE          "旋鈕LED自動睡眠"
+#define STRING_M0_PAUSE               "M0暫停"
+#define STRING_SEND_START_GCODE       "執行起始G-code"
+#define STRING_SEND_END_GCODE         "執行結尾G-code"
+#define STRING_SEND_CANCEL_GCODE      "中斷執行G-code"
+#define STRING_PERSISTENT_STATUS_INFO "頂部溫度訊息"
+#define STRING_FILE_LISTMODE          "文件預覽列表模式"
+#define STRING_CURRENT_SETTING        "驅動晶片電流設定 (mA)"
+#define STRING_STEPS_SETTING          "電機每毫米步數Steps/mm"
+#define STRING_MAXFEEDRATE            "最大移動速度"
+#define STRING_MAXACCELERATION        "最大加速度"
+#define STRING_ACCELERATION           "加速度"
+#define STRING_PRINT_ACCELERATION     "列印加速度"
+#define STRING_RETRACT_ACCELERATION   "回抽加速度"
+#define STRING_TRAVEL_ACCELERATION    "空跑加速度"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "堵料檢測靈敏度"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "所有設定都會恢復預設值，確定嗎?"
+#define STRING_RESET_SETTINGS_DONE    "重設成功，請重新開機"
+#define STRING_INFO                   "提示" //Info Sign
+#define STRING_LCD_BRIGHTNESS         "螢幕亮度"
+#define STRING_LCD_BRIGHTNESS_DIM     "睡眠狀態螢幕亮度"
+#define STRING_LCD_DIM_IDLE_TIMER     "螢幕進入睡眠時間"
+#define STRING_5_SECONDS              "5秒."
+#define STRING_10_SECONDS             "10秒."
+#define STRING_30_SECONDS             "30秒."
+#define STRING_60_SECONDS             "1分鐘"
+#define STRING_120_SECONDS            "2分鐘"
+#define STRING_300_SECONDS            "5分鐘"
+#define STRING_CUSTOM_SECONDS         "自訂"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "全螢幕Marlin模式"
+#define STRING_PLR_EN                 "断电续打"
+#define STRING_SETTING_SAVE           "保存设置"
+#define STRING_SETTING_RESET          "重置设置"
+#define STRING_SETTING_RESTORE        "保存设置"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "是否保存打印机设置到EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "是否从EEPROM加载设置?"
+#define STRING_EEPROM_RESET_INFO      "重置EEPROM到出厂设置?"
+#define STRING_RETRACT_FEEDRATE       "FW回抽速度"
+#define STRING_RETRACT_LENGTH         "FW回抽长度"
+#define STRING_RETRACT_SWAP_LENGTH    "换料时回抽的长度"
+#define STRING_RETRACT_Z_LIFT         "回抽时Z轴抬升的高度"
+#define STRING_RETRACT_AUTO           "FW自动回抽"
+#define STRING_RECOVER_FEEDRATE       "FW挤出速度"
+#define STRING_SWAP_RECOVER_FEEDRATE  "换料时挤出的速度"
+#define STRING_RECOVER_LENGTH         "额外挤出的长度"
+#define STRING_SWAP_RECOVER_LENGTH    "换料时额外挤出的长度"
+#define STRING_START_PRINT            "是否开始打印:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK 弹窗类型"
+#define STRING_LEVELING_EDGE_DISTANCE "手动调平边沿距离"
+#define STRING_XY_UNLOCK              "解锁XY"
+#define STRING_TUNING                 "调整"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID自动整定"
+#define STRING_PID_START_INFO         "开始PID自动整定,需要几分钟来完成,是否继续?"
+#define STRING_PID_START_INFO_2       "PID 正在自动整定中!"
+#define STRING_PID_START_INFO_3       "不要操作触控屏直到整定完成!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "挤出100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "连接"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "正體中文"
     #define STRING_HEAT                   "加熱"
     #define STRING_MOVE                   "移動"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/language_tr.h b/TFT/src/User/API/Language/language_tr.h
index 6fb87f0281..caeea42687 100644
--- a/TFT/src/User/API/Language/language_tr.h
+++ b/TFT/src/User/API/Language/language_tr.h
@@ -1,6 +1,285 @@
-#ifndef _LANGUAGE_TR_H_
-#define _LANGUAGE_TR_H_
+#pragma once
 
+<<<<<<< HEAD
+#define STRING_LANGUAGE               "Türkçe"
+#define STRING_HEAT                   "Isıt"
+#define STRING_MOVE                   "Hareket"
+#define STRING_HOME                   "Sıfırla"
+#define STRING_DISABLE_STEPPERS       "Disarm All"
+#define STRING_PRINT                  "Yazdır"
+#define STRING_EXTRUDE                "Filament"
+#define STRING_FAN                    "Fan"
+#define STRING_SETTINGS               "Ayarlar"
+#define STRING_SCREEN_SETTINGS        "Ekran"
+#define STRING_MACHINE_SETTINGS       "Makine"
+#define STRING_FEATURE_SETTINGS       "Özellik"
+#define STRING_SOUND                  "Sound"
+#define STRING_TOUCH_SOUND            "Touch sounds"
+#define STRING_TOAST_SOUND            "Toast Notifications"
+#define STRING_ALERT_SOUND            "Popups and Alerts"
+#define STRING_PREHEATDONE_SOUND      "Preheat done notification"
+#define STRING_SHUT_DOWN              "Kapat"
+#define STRING_RGB_SETTINGS           "LED Rengi"
+#define STRING_RGB_OFF                "LED'i Kapat"
+#define STRING_TERMINAL               "Terminal"
+#define STRING_CUSTOM                 "Diğer"
+#define STRING_LEVELING               "Kalibrasyon"
+#define STRING_POINT_1                "1.Nokta"
+#define STRING_POINT_2                "2.Nokta"
+#define STRING_POINT_3                "3.Nokta"
+#define STRING_POINT_4                "4.Nokta"
+#define STRING_POINT_5                "5.Nokta"
+#define STRING_BED_LEVELING           "Bed Level"
+#define STRING_BL_COMPLETE            "Bed Leveling Complete"
+#define STRING_BL_SMART_FILL          "Missing probe points\nhave been smart filled.\n \nNote: remember to save!"
+#define STRING_BL_ENABLE              "BL: on"
+#define STRING_BL_DISABLE             "BL: off"
+#define STRING_ABL                    "ABL"
+#define STRING_BBL                    "BBL"
+#define STRING_UBL                    "UBL"
+#define STRING_MBL                    "MBL"
+#define STRING_MBL_SETTINGS           "Mesh Bed Leveling"
+#define STRING_ABL_SETTINGS           "Auto Bed Leveling"
+#define STRING_ABL_SETTINGS_BBL       "Bilinear Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL       "Unified Bed Leveling"
+#define STRING_ABL_SETTINGS_UBL_SAVE  "Save to slot"
+#define STRING_ABL_SETTINGS_UBL_LOAD  "Load from slot"
+#define STRING_ABL_SLOT0              "Slot 0"
+#define STRING_ABL_SLOT1              "Slot 1"
+#define STRING_ABL_SLOT2              "Slot 2"
+#define STRING_ABL_SLOT3              "Slot 3"
+#define STRING_ABL_SLOT_EEPROM        "Remember slot for next\nreboot? (Save EEPROM)"
+#define STRING_ABL_Z                  "Z Fade"
+#define STRING_BLTOUCH                "BLTouch"
+#define STRING_BLTOUCH_TEST           "Test"
+#define STRING_BLTOUCH_DEPLOY         "Deploy"
+#define STRING_BLTOUCH_STOW           "Stow"
+#define STRING_BLTOUCH_REPEAT         "Repeat"
+#define STRING_Z_OFFSET               "Z Offset"
+#define STRING_PROBE_OFFSET           "Probe Offset"
+#define STRING_HOME_OFFSET            "Home Offset"
+#define STRING_CONFIRMATION           "Are you sure?"
+#define STRING_DOWN                   "Down"
+#define STRING_UP                     "Up"
+#define STRING_SAVE                   "Kaydet"
+#define STRING_RESTORE                "Restore"
+#define STRING_RESET                  "Sıfırla"
+#define STRING_DEFAULT                "Default"
+#define STRING_CLEAR                  "Clear"
+#define STRING_NEXT                   "Next"
+#define STRING_DISTANCE               "Distance"
+#define STRING_INVALID_VALUE          "Invalid value(s)"
+#define STRING_TIMEOUT_REACHED        "Timeout reached!"
+#define STRING_PROCESS_RUNNING        "Process already running!"
+#define STRING_PROCESS_COMPLETED      "Process completed!"
+#define STRING_PROCESS_ABORTED        "Process aborted!"
+#define STRING_INC                    "Arttır"
+#define STRING_DEC                    "Azalt"
+#define STRING_NOZZLE                 "Nozül"
+#define STRING_BED                    "Tabla"
+#define STRING_CHAMBER                "Chamber"
+#define STRING_START                  "Start"
+#define STRING_STOP                   "Durdur"
+#define STRING_BACK                   "Geri"
+#define STRING_PAGE_UP                "Yukarı"
+#define STRING_PAGE_DOWN              "Aşağı"
+#define STRING_PAUSE                  "Duraklat"
+#define STRING_RESUME                 "Devam"
+#define STRING_LOAD                   "Yükle"
+#define STRING_UNLOAD                 "Çıkar"
+#define STRING_SLOW_SPEED             "Yavaş"
+#define STRING_NORMAL_SPEED           "Normal"
+#define STRING_FAST_SPEED             "Hızlı"
+#define STRING_FAN_FULL_SPEED         "Tam"
+#define STRING_FAN_HALF_SPEED         "Yarım"
+#define STRING_ROTATE_UI              "Döndür"
+#define STRING_TOUCHSCREEN_ADJUST     "Kalibre"
+#define STRING_MORE                   "Daha"
+#define STRING_SCREEN_INFO            "Bilgi"
+#define STRING_STATUS                 "Bilgi"
+#define STRING_SIMULATOR_BG_COLOR     "Marlin simulator background color"
+#define STRING_SIMULATOR_FONT_COLOR   "Marlin simulator font color"
+#define STRING_WHITE                  "Beyaz"
+#define STRING_BLACK                  "Siyah"
+#define STRING_BLUE                   "Mavi"
+#define STRING_RED                    "Kırmızı"
+#define STRING_GREEN                  "Yeşil"
+#define STRING_CYAN                   "Camgöbeği"
+#define STRING_YELLOW                 "Sarı"
+#define STRING_BROWN                  "Kahverengi"
+#define STRING_GRAY                   "Gri"
+#define STRING_ORANGE                 "Turuncu"
+#define STRING_INDIGO                 "Çivit Mavisi"
+#define STRING_VIOLET                 "Menekşe"
+#define STRING_MAGENTA                "Eflatun"
+#define STRING_PURPLE                 "Mor"
+#define STRING_LIME                   "Çim Rengi"
+#define STRING_DARKBLUE               "Koyu Mavi"
+#define STRING_DARKGREEN              "Koyu Yeşil"
+#define STRING_DARKGRAY               "Koyu Gri"
+#define STRING_DISCONNECT             "Bağlt. Kes"
+#define STRING_BAUDRATE               "BaudRate"
+#define STRING_PERCENTAGE             "Yüzde"
+#define STRING_BABYSTEP               "BabyStep"
+#define STRING_PERCENTAGE_SPEED       "Hız"
+#define STRING_PERCENTAGE_FLOW        "Akış"
+#define STRING_VALUE_ZERO             "Sıfır"
+#define STRING_1_DEGREE               "1°C"
+#define STRING_5_DEGREE               "5°C"
+#define STRING_10_DEGREE              "10°C"
+#define STRING_X_INC                  "X+"
+#define STRING_Y_INC                  "Y+"
+#define STRING_Z_INC                  "Z+"
+#define STRING_X_DEC                  "X-"
+#define STRING_Y_DEC                  "Y-"
+#define STRING_Z_DEC                  "Z-"
+#define STRING_X                      "X"
+#define STRING_Y                      "Y"
+#define STRING_Z                      "Z"
+#define STRING_001_MM                 "0.01mm"
+#define STRING_01_MM                  "0.1mm"
+#define STRING_1_MM                   "1mm"
+#define STRING_5_MM                   "5mm"
+#define STRING_10_MM                  "10mm"
+#define STRING_100_MM                 "100mm"
+#define STRING_200_MM                 "200mm"
+#define STRING_1_PERCENT              "1%"
+#define STRING_5_PERCENT              "5%"
+#define STRING_10_PERCENT             "10%"
+#define STRING_PERCENT_VALUE          "%d%"
+#define STRING_READY                  "Hazır"
+#define STRING_BUSY                   "İşlem devam ediyor, lütfen bekleyiniz..."
+#define STRING_UNCONNECTED            "Yazıcı bağlı değil!"
+#define STRING_DISCONNECT_INFO        "Artık yazıcıyı\nbilgisayarınızdan kontrol\nedebilirsiniz!"
+#define STRING_LOADING                "Yükleniyor..."
+#define STRING_POWER_FAILED           "Yazdırmaya devam edilsin mi?" //Question Sign
+#define STRING_CONTINUE               "Devam et"
+#define STRING_CANCEL                 "\u088F İptal" //Cancel Sign
+#define STRING_ADJUST_TITLE           "Dokunmatik Ekran Kalibrasyonu"
+#define STRING_ADJUST_INFO            "Lütfen kırmızı noktaya\ntıklayın"
+#define STRING_ADJUST_OK              "Kalibrasyon başarılı."
+#define STRING_ADJUST_FAILED          "Kalibrasyon başarısız,\nlütfen tekrar deneyiniz."
+#define STRING_WARNING                "Uyarı" //Exclamation Sign
+#define STRING_STOP_PRINT             "Baskı durdurulsun mu?"
+#define STRING_CONFIRM                "\u088E Tamam" //Confirm Sign
+#define STRING_TFTSD                  "SD Kart"
+#define STRING_READ_TFTSD_ERROR       "SD kart okunamadı!"
+#define STRING_TFTSD_INSERTED         "SD Kart Takıldı!"
+#define STRING_TFTSD_REMOVED          "SD Kart Çıkarıldı!"
+#define STRING_U_DISK                 "USB Disk"
+#define STRING_READ_U_DISK_ERROR      "USB disk okunamadı!"
+#define STRING_U_DISK_INSERTED        "USB Disk Takıldı!"
+#define STRING_U_DISK_REMOVED         "USB Disk Çıkarıldı!"
+#define STRING_ONBOARDSD              "Dahili SD"
+#define STRING_READ_ONBOARDSD_ERROR   "Dahili SD Okunamadı!"
+#define STRING_FILAMENT_SENSOR        "Filament sensörü"
+#define STRING_FILAMENT_RUNOUT        "Filament Bitti!"
+#define STRING_PREHEAT                "Ön Isıtma"
+#define STRING_PREHEAT_BOTH           "Birlikte"
+#define STRING_IS_PAUSE               "Ekstrüde edilemiyor\nyazdırırken,\nNbaskı duraklatılsın mı?"
+#define STRING_AUTO_SHUT_DOWN         "Auto Power"
+#define STRING_UNIFIEDMOVE            "Hareket"
+#define STRING_UNIFIEDHEAT            "Isıtma/Fan"
+#define STRING_COOLDOWN               "Soğutma"
+#define STRING_EMERGENCYSTOP          "AcilDurdur"
+#define STRING_TOUCH_TO_EXIT          "Çıkmak için herhangi bir yere dokunun"
+#define STRING_MAINMENU               "Menü"
+#define STRING_WAIT_TEMP_SHUT_DOWN    "Wait for the hotend\ntemperature to be\nlower than %d℃" // The length of the info line is 24 characters, so the "temperatureof" will automatically be divided into "temperature of..."
+#define STRING_FORCE_SHUT_DOWN        "Zorlamak"
+#define STRING_SHUTTING_DOWN          "Kapatılıyor..."
+#define STRING_PARAMETER_SETTING      "Parametre Ayarları"
+#define STRING_ON                     "Açık"
+#define STRING_OFF                    "Kapalı"
+#define STRING_SMART                  "SMART"
+#define STRING_TERMINAL_ACK           "Show ACK in Terminal"
+#define STRING_INVERT_XAXIS           "X Eksenini Tersine Çevir"
+#define STRING_INVERT_YAXIS           "Y Eksenini Tersine Çevir"
+#define STRING_INVERT_ZAXIS           "Z Eksenini Tersine Çevir"
+#define STRING_MOVE_SPEED             "Hareket Hızı(X Y Z)"
+#define STRING_KNOB_LED               "Döner Düğme LED"
+#define STRING_KNOB_LED_IDLE          "Rotary Knob LED idle"
+#define STRING_M0_PAUSE               "Paused by M0 command"
+#define STRING_SEND_START_GCODE       "Start Gcode before print"
+#define STRING_SEND_END_GCODE         "End Gcode after print"
+#define STRING_SEND_CANCEL_GCODE      "Gcode'u iptal et"
+#define STRING_PERSISTENT_STATUS_INFO "Dosyaları Liste Şeklinde"
+#define STRING_FILE_LISTMODE          "Dosya Görüntüleyici Liste Modu"
+#define STRING_CURRENT_SETTING        "Sürücü Akımı (mA)"
+#define STRING_STEPS_SETTING          "MM başına adım sayısı"
+#define STRING_MAXFEEDRATE            "Maks. İlerleme Hızı"
+#define STRING_MAXACCELERATION        "Maks. İvmelenme"
+#define STRING_ACCELERATION           "İvmelenme"
+#define STRING_PRINT_ACCELERATION     "Baskı İvmelenmesi"
+#define STRING_RETRACT_ACCELERATION   "Geriçekme İvmelenmesi"
+#define STRING_TRAVEL_ACCELERATION    "Gezinti İvmelenmesi"
+#define STRING_JERK                   "Jerk"
+#define STRING_JUNCTION_DEVIATION     "Junction Deviation"
+#define STRING_BUMP_SENSITIVITY       "TMC çarpma hassasiyeti"
+#define STRING_FWRETRACT              "FW Retraction"
+#define STRING_FWRECOVER              "FW Retraction Recover"
+#define STRING_LIN_ADVANCE            "Linear Advance"
+#define STRING_RESET_SETTINGS_INFO    "Tüm ayarlar varsayılana\nsıfırlanacak değerler.\nDevam edilsin mi?"
+#define STRING_RESET_SETTINGS_DONE    "Tüm ayarları başarıyla\nsıfırlama tamamlandı. Tam\nolarak etkili olması için\nlütfen cihazı yeniden\nbaşlatın."
+#define STRING_INFO                   "Bilgi" //Info Sign
+#define STRING_LCD_BRIGHTNESS         "Ekran Parlaklığı"
+#define STRING_LCD_BRIGHTNESS_DIM     "Ekran Parlaklığı Kısılma Oranı"
+#define STRING_LCD_DIM_IDLE_TIMER     "Ekran Parlaklığı Kısılma Süresi"
+#define STRING_5_SECONDS              "5 Sn."
+#define STRING_10_SECONDS             "10 Sn."
+#define STRING_30_SECONDS             "30 Sn."
+#define STRING_60_SECONDS             "1 Dak."
+#define STRING_120_SECONDS            "2 Dak."
+#define STRING_300_SECONDS            "5 Dak."
+#define STRING_CUSTOM_SECONDS         "Kişisel"
+#define STRING_EVENT_LED_MODE        "Event led mode"
+#define STRING_ST7920_FULLSCREEN      "Marlin mode in fullscreen"
+#define STRING_PLR_EN                 "Power loss recovery"
+#define STRING_SETTING_SAVE           "Save settings"
+#define STRING_SETTING_RESET          "Reset default settings"
+#define STRING_SETTING_RESTORE        "Restore settings"
+#define STRING_EEPROM_SETTINGS        "EEPROM"
+#define STRING_EEPROM_SAVE_INFO       "Save printer settings\nto EEPROM?"
+#define STRING_EEPROM_RESTORE_INFO    "Reload settings from\nEEPROM?"
+#define STRING_EEPROM_RESET_INFO      "Reset EEPROM to stock printer settings?"
+#define STRING_RETRACT_FEEDRATE       "Retract feedrate"
+#define STRING_RETRACT_LENGTH         "Retract length"
+#define STRING_RETRACT_SWAP_LENGTH    "Retract swap length"
+#define STRING_RETRACT_Z_LIFT         "Z lift on retraction"
+#define STRING_RETRACT_AUTO           "Auto Firmware Retract"
+#define STRING_RECOVER_FEEDRATE       "Recover feedrate"
+#define STRING_SWAP_RECOVER_FEEDRATE  "Swap recover feedrate"
+#define STRING_RECOVER_LENGTH         "Extra recover length"
+#define STRING_SWAP_RECOVER_LENGTH    "Extra recover swap length"
+#define STRING_START_PRINT            "Start Printing:\n %s?"
+#define STRING_ACK_NOTIFICATION       "ACK notification style"
+#define STRING_LEVELING_EDGE_DISTANCE "Bed edge distance"
+#define STRING_XY_UNLOCK              "Disarm XY"
+#define STRING_TUNING                 "Tuning"
+#define STRING_PID                    "PID"
+#define STRING_PID_TITLE              "PID autotune"
+#define STRING_PID_START_INFO         "PID autotune may take\nsome time to complete.\nContinue?"
+#define STRING_PID_START_INFO_2       "PID autotune in progress!"
+#define STRING_PID_START_INFO_3       "Do not touch the screen until completed (green LED ON)!"
+#define STRING_TUNE_EXTRUDER          "Tune steps"
+#define STRING_TUNE_EXT_EXTRUDE_100   "Ext. 100mm"
+#define STRING_TUNE_EXT_TEMP          "Extruder tuning | Heat"
+#define STRING_TUNE_EXT_TEMPLOW       "Desired temperature too low!\nMinimum temperature: %d C"
+#define STRING_TUNE_EXT_DESIREDVAL    "Temperature is not yet at the desired value"
+#define STRING_TUNE_EXT_MARK120MM     "Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding"
+#define STRING_TUNE_EXT_HEATOFF       "Turn the heater off?"
+#define STRING_TUNE_EXT_ADJ_ESTEPS    "Adjust E-Steps"
+#define STRING_TUNE_EXT_ESTEPS_SAVED  "New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f"
+#define STRING_TUNE_EXT_MEASURED      "Length remaining:"
+#define STRING_TUNE_EXT_OLD_ESTEP     "Old e-steps: %0.2f"
+#define STRING_TUNE_EXT_NEW_ESTEP     "New e-steps: %0.2f"
+#define STRING_CONNECTION_SETTINGS    "Connection"
+#define STRING_OFFSET_TOOL            "Offset 2nd Nozzle"
+#define STRING_HYBRID_THRESHOLD       "TMC HybridThreshold"
+#define STRING_NOTIFICATIONS          "Notifications"
+#define STRING_MESH_EDITOR            "Mesh edit"
+#define STRING_MESH_TUNER             "Mesh tuner"
+#define STRING_CASE_LIGHT             "Case light"
+=======
     #define STRING_LANGUAGE               "Türkçe"
     #define STRING_HEAT                   "Isıt"
     #define STRING_MOVE                   "Hareket"
@@ -284,3 +563,4 @@
     #define STRING_HEATERS_ON             "Some heaters are still ON.\nDo you want to stop them?"  // translation needed
 
 #endif
+>>>>>>> upstream/master
diff --git a/TFT/src/User/API/Language/utf8_decode.c b/TFT/src/User/API/Language/utf8_decode.c
index f922eee2e3..d4a3bf63a8 100644
--- a/TFT/src/User/API/Language/utf8_decode.c
+++ b/TFT/src/User/API/Language/utf8_decode.c
@@ -122,9 +122,9 @@ static void getBitMapFontInfo(CHAR_INFO *pInfo)
   uint8_t i;
   for (i = 0; i < COUNT(font); i++)
   {
-    if(pInfo->codePoint >= font[i].startCodePoint && pInfo->codePoint <= font[i].endCodePoint)
+    if (pInfo->codePoint >= font[i].startCodePoint && pInfo->codePoint <= font[i].endCodePoint)
     {
-      if(i == 0 && largeFont)
+      if (i == 0 && largeFont)
         i++;
       pInfo->pixelWidth = font[i].pixelWidth;
       pInfo->pixelHeight = font[i].pixelHeight;
@@ -139,7 +139,7 @@ void getCharacterInfo(const uint8_t *ch, CHAR_INFO *pInfo)
 {
   pInfo->bytes = 0;
 
-  if(ch == NULL || *ch == 0) return;
+  if (ch == NULL || *ch == 0) return;
 
   getUTF8EncodeInfo(ch, pInfo);
 
@@ -152,7 +152,7 @@ uint16_t GUI_StrPixelWidth_str(const uint8_t * str)
   uint16_t i = 0, len = 0;
   CHAR_INFO info;
 
-  if(str == NULL) return 0;
+  if (str == NULL) return 0;
   while(str[i])
   {
     getCharacterInfo(str + i, &info);
@@ -174,7 +174,7 @@ uint16_t getUTF8Length(const uint8_t *const str)
  uint16_t i = 0, len = 0;
   CHAR_INFO info;
 
-  if(str == NULL) return 0;
+  if (str == NULL) return 0;
   while(str[i])
   {
     info.bytes = 0;
diff --git a/TFT/src/User/API/Language/utf8_decode.h b/TFT/src/User/API/Language/utf8_decode.h
index 67db426c0a..5d25cc2230 100644
--- a/TFT/src/User/API/Language/utf8_decode.h
+++ b/TFT/src/User/API/Language/utf8_decode.h
@@ -1,54 +1,51 @@
-#ifndef _UTF8_DECODE_H_
-#define _UTF8_DECODE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stdbool.h>
-
-typedef struct {
-  uint32_t startCodePoint; // start unicode code point for language
-  uint32_t endCodePoint; // end unicode code point for language
-  uint8_t  pixelHeight; // font display pixel height
-  uint8_t  pixelWidth; // font display pixel width
-  uint32_t bitMapStartAddr; // dot matrix font library start address in w25qxx
-  uint8_t  bitMapHeight; // dot matrix font library pixel height
-  uint8_t  bitMapWidth; // dot matrix font library pixel width
-  uint32_t bitMapStartCodePoint; // the first character code point in this font bitmap file
-}FONT_BITMAP;
-
-typedef struct
-{
-  // encode info
-  uint8_t bytes; // Number of bytes occupied by one character
-  uint32_t codePoint; // Actual encoding index of characters
-  // font info
-  uint8_t pixelHeight; // The pixel height of a character display
-  uint8_t pixelWidth; // The pixel width of a character display
-  uint32_t bitMapAddr; // the address of font bitmap in w25qxx
-}CHAR_INFO;
-
-//Enable Large font
-void setLargeFont(bool status);
-
-//get status of large font
-bool isLargeFont(void);
-
-void getCharacterInfo(const uint8_t *ch, CHAR_INFO *pInfo);
-uint16_t getUTF8Length(const uint8_t *const str);
-
-uint16_t GUI_StrPixelWidth_str(const uint8_t *str);
-uint16_t GUI_StrPixelWidth_label(int16_t index);
-
-#define GUI_StrPixelWidth(X) _Generic(((X+0)),                         \
-                              const u8*: GUI_StrPixelWidth_str,         \
-                              const u8* const: GUI_StrPixelWidth_str,    \
-                              u8*: GUI_StrPixelWidth_str,                 \
-                              default: GUI_StrPixelWidth_label)(X)
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct {
+  uint32_t startCodePoint; // start unicode code point for language
+  uint32_t endCodePoint; // end unicode code point for language
+  uint8_t  pixelHeight; // font display pixel height
+  uint8_t  pixelWidth; // font display pixel width
+  uint32_t bitMapStartAddr; // dot matrix font library start address in w25qxx
+  uint8_t  bitMapHeight; // dot matrix font library pixel height
+  uint8_t  bitMapWidth; // dot matrix font library pixel width
+  uint32_t bitMapStartCodePoint; // the first character code point in this font bitmap file
+}FONT_BITMAP;
+
+typedef struct
+{
+  // encode info
+  uint8_t bytes; // Number of bytes occupied by one character
+  uint32_t codePoint; // Actual encoding index of characters
+  // font info
+  uint8_t pixelHeight; // The pixel height of a character display
+  uint8_t pixelWidth; // The pixel width of a character display
+  uint32_t bitMapAddr; // the address of font bitmap in w25qxx
+}CHAR_INFO;
+
+//Enable Large font
+void setLargeFont(bool status);
+
+//get status of large font
+bool isLargeFont(void);
+
+void getCharacterInfo(const uint8_t *ch, CHAR_INFO *pInfo);
+uint16_t getUTF8Length(const uint8_t *const str);
+
+uint16_t GUI_StrPixelWidth_str(const uint8_t *str);
+uint16_t GUI_StrPixelWidth_label(int16_t index);
+
+#define GUI_StrPixelWidth(X) _Generic(((X+0)),                         \
+                              const u8*: GUI_StrPixelWidth_str,         \
+                              const u8* const: GUI_StrPixelWidth_str,    \
+                              u8*: GUI_StrPixelWidth_str,                 \
+                              default: GUI_StrPixelWidth_label)(X)
+#ifdef __cplusplus
+}
+#endif
diff --git a/TFT/src/User/API/MachineParameters.c b/TFT/src/User/API/MachineParameters.c
index 20998b34e1..3058098569 100644
--- a/TFT/src/User/API/MachineParameters.c
+++ b/TFT/src/User/API/MachineParameters.c
@@ -65,7 +65,7 @@ const LABEL junction_deviation_disp_ID[] = {LABEL_JUNCTION_DEVIATION};
 
 float getParameter(PARAMETER_NAME name, u8 index)
 {
-  if(index >= parameter_element_count[name]) return 0.0f;
+  if (index >= parameter_element_count[name]) return 0.0f;
   switch (name)
   {
   case P_STEPS_PER_MM:
@@ -109,7 +109,7 @@ float getParameter(PARAMETER_NAME name, u8 index)
 
 void setParameter(PARAMETER_NAME name, u8 index, float val)
 {
-  if(index >= parameter_element_count[name]) return;
+  if (index >= parameter_element_count[name]) return;
     switch (name)
     {
     case P_STEPS_PER_MM:
@@ -193,27 +193,27 @@ void sendParameterCmd(PARAMETER_NAME para, u8 stepper_index, float Value)
   storeCmd(parameter_Cmd[para][stepper_index], Value);
   if (dualstepper[stepper_index] && stepper_index < AXIS_NUM)
     {
-      if(para == P_CURRENT)
+      if (para == P_CURRENT)
         storeCmd(dualStepperParameter_cmd[0][stepper_index], Value);
-      if(para == P_BUMPSENSITIVITY)
+      if (para == P_BUMPSENSITIVITY)
         storeCmd(dualStepperParameter_cmd[1][stepper_index], Value);
-      if(para == P_HYBRID_THRESHOLD)
+      if (para == P_HYBRID_THRESHOLD)
         storeCmd(dualStepperParameter_cmd[2][stepper_index], Value);
     }
 }
 
 void saveEepromSettings(void)
 {
-  if(infoMachineSettings.EEPROM == 1)
+  if (infoMachineSettings.EEPROM == 1)
     mustStoreCmd("M500\n");
 }
 void restoreEepromSettings(void)
 {
-  if(infoMachineSettings.EEPROM == 1)
+  if (infoMachineSettings.EEPROM == 1)
     mustStoreScript("M501\nM503 S0\n");
 }
 void resetEepromSettings(void)
 {
-  if(infoMachineSettings.EEPROM == 1)
+  if (infoMachineSettings.EEPROM == 1)
     mustStoreScript("M502\nM500\nM503 S0\n");
 }
diff --git a/TFT/src/User/API/MachineParameters.h b/TFT/src/User/API/MachineParameters.h
index 215316ab6e..36e6c04933 100644
--- a/TFT/src/User/API/MachineParameters.h
+++ b/TFT/src/User/API/MachineParameters.h
@@ -1,5 +1,4 @@
-#ifndef _MACHINEPARAMETERS_H_
-#define _MACHINEPARAMETERS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -114,5 +113,3 @@ void resetEepromSettings(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Notification.c b/TFT/src/User/API/Notification.c
index 68c011e75f..bfda7a8d39 100644
--- a/TFT/src/User/API/Notification.c
+++ b/TFT/src/User/API/Notification.c
@@ -42,8 +42,10 @@ bool toastAvailable(void)
 {
   for (int i = 0; i < TOAST_MSG_COUNT; i++)
   {
-      if(toastlist[i].isNew == true)
+      if (toastlist[i].isNew == true)
+      {
        return true;
+      }
   }
   return false;
 }
@@ -51,10 +53,10 @@ bool toastAvailable(void)
 //show next notification
 void drawToast(bool redraw)
 {
-  if(!redraw)
+  if (!redraw)
     curToastDisplay = (curToastDisplay + 1) % TOAST_MSG_COUNT;
 
-  if(toastlist[curToastDisplay].isNew == true || redraw)
+  if (toastlist[curToastDisplay].isNew == true || redraw)
   {
     //Set toast notification running status
     _toastRunning = true;
@@ -82,7 +84,9 @@ void drawToast(bool redraw)
     }
 
     if ( cursound >= 0 && !redraw)
+    {
       BUZZER_PLAY(cursound);
+    }
 
     GUI_SetTextMode(GUI_TEXTMODE_TRANS);
     GUI_FillPrect(&toastIconRect);
@@ -99,7 +103,7 @@ void drawToast(bool redraw)
     toastlist[curToastDisplay].isNew = false;
 
     //set new timer if notification is new
-    if(!redraw)
+    if (!redraw)
       nextToastTime = OS_GetTimeMs() + TOAST_DURATION;
 
     GUI_RestoreColorDefault();
@@ -109,7 +113,7 @@ void drawToast(bool redraw)
 //check and control toast notification display
 void loopToast(void)
 {
-  if(getMenuType() == MENU_TYPE_FULLSCREEN)
+  if (getMenuType() == MENU_TYPE_FULLSCREEN)
     return;
 
   if (OS_GetTimeMs() > nextToastTime)
@@ -118,7 +122,7 @@ void loopToast(void)
     {
       drawToast(false);
     }
-    else if(_toastRunning == true)
+    else if (_toastRunning == true)
     {
       _toastRunning = false;
 
diff --git a/TFT/src/User/API/Notification.h b/TFT/src/User/API/Notification.h
index bf8cb66a69..9a3f04aaa8 100644
--- a/TFT/src/User/API/Notification.h
+++ b/TFT/src/User/API/Notification.h
@@ -1,5 +1,4 @@
-#ifndef _NOTIFICATION_H_
-#define _NOTIFICATION_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,5 +46,3 @@ void setNotificationHandler(void (*handler)());
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Printing.c b/TFT/src/User/API/Printing.c
index db937d3e16..241d2236b0 100644
--- a/TFT/src/User/API/Printing.c
+++ b/TFT/src/User/API/Printing.c
@@ -26,9 +26,9 @@ bool isM0_Pause(void)
 //
 void setPrintingTime(uint32_t RTtime)
 {
-  if(RTtime%1000 == 0)
+  if (RTtime%1000 == 0)
   {
-    if(isPrinting() && !isPause())
+    if (isPrinting() && !isPause())
     {
       infoPrinting.time++;
     }
@@ -127,25 +127,29 @@ void sendPrintCodes(uint8_t index)
   }
 }
 
-void setM0Pause(bool m0_pause){
+void setM0Pause(bool m0_pause)
+{
   infoPrinting.m0_pause = m0_pause;
 }
 
 bool setPrintPause(bool is_pause, bool is_m0pause)
 {
   static bool pauseLock = false;
-  if(pauseLock)                      return false;
-  if(!isPrinting())                  return false;
-  if(infoPrinting.pause == is_pause) return false;
+  if (pauseLock)                      return false;
+  if (!isPrinting())                  return false;
+  if (infoPrinting.pause == is_pause) return false;
 
   pauseLock = true;
   switch (infoFile.source)
   {
     case BOARD_SD:
       infoPrinting.pause = is_pause;
-      if (is_pause){
+      if (is_pause)
+      {
         request_M25();
-      } else {
+      }
+      else
+      {
         request_M24(0);
       }
       break;
@@ -153,23 +157,26 @@ bool setPrintPause(bool is_pause, bool is_m0pause)
     case TFT_UDISK:
     case TFT_SD:
       infoPrinting.pause = is_pause;
-      if(infoPrinting.pause == true && is_m0pause == false){
-      while (infoCmd.count != 0) {loopProcess();}
+      if (infoPrinting.pause == true && is_m0pause == false)
+      {
+        while (infoCmd.count != 0) {
+          loopProcess();
+        }
       }
 
       bool isCoorRelative = coorGetRelative();
       bool isExtrudeRelative = eGetRelative();
       static COORDINATE tmp;
 
-      if(infoPrinting.pause)
+      if (infoPrinting.pause)
       {
         //restore status before pause
         //if pause was triggered through M0/M1 then break
-      if(is_m0pause == true) {
+      if (is_m0pause == true) {
         setM0Pause(is_m0pause);
         popupReminder(DIALOG_TYPE_ALERT, LABEL_PAUSE, LABEL_PAUSE);
         break;
-        }
+      }
 
         coordinateGetAll(&tmp);
         if (isCoorRelative == true)     mustStoreCmd("G90\n");
@@ -190,7 +197,7 @@ bool setPrintPause(bool is_pause, bool is_m0pause)
       }
       else
       {
-        if(isM0_Pause() == true)
+        if (isM0_Pause() == true)
         {
           setM0Pause(is_m0pause);
           breakAndContinue();
@@ -204,7 +211,7 @@ bool setPrintPause(bool is_pause, bool is_m0pause)
           mustStoreCmd("G1 X%.3f Y%.3f F%d\n", tmp.axis[X_AXIS], tmp.axis[Y_AXIS], infoSettings.pause_feedrate[X_AXIS]);
           mustStoreCmd("G1 Z%.3f F%d\n", tmp.axis[Z_AXIS], infoSettings.pause_feedrate[Z_AXIS]);
         }
-        if(heatGetCurrentTemp(heatGetCurrentHotend()) > infoSettings.min_ext_temp)
+        if (heatGetCurrentTemp(heatGetCurrentHotend()) > infoSettings.min_ext_temp)
         {
           mustStoreCmd("G1 E%.5f F%d\n", tmp.axis[E_AXIS] - infoSettings.pause_retract_len + infoSettings.resume_purge_len, infoSettings.pause_feedrate[E_AXIS]);
         }
@@ -242,7 +249,8 @@ void endPrinting(void)
   infoPrinting.printing = infoPrinting.pause = false;
   powerFailedClose();
   powerFailedDelete();
-  if(infoSettings.send_end_gcode == 1){
+  if (infoSettings.send_end_gcode == 1)
+  {
     sendPrintCodes(1);
   }
 }
@@ -252,7 +260,7 @@ void printingFinished(void)
 {
   BUZZER_PLAY(sound_success);
   endPrinting();
-  if(infoSettings.auto_off) // Auto shut down after printing
+  if (infoSettings.auto_off) // Auto shut down after printing
   {
     startShutdown();
   }
@@ -290,7 +298,7 @@ void shutdown(void)
 {
   for(u8 i = 0; i < infoSettings.fan_count; i++)
   {
-    if(fanIsType(i, FAN_TYPE_F)) mustStoreCmd("%s S0\n", fanCmd[i]);
+    if (fanIsType(i, FAN_TYPE_F)) mustStoreCmd("%s S0\n", fanCmd[i]);
   }
   mustStoreCmd("M81\n");
   popupReminder(DIALOG_TYPE_INFO, LABEL_SHUT_DOWN, LABEL_SHUTTING_DOWN);
@@ -318,7 +326,7 @@ void startShutdown(void)
 
   for(u8 i = 0; i < infoSettings.fan_count; i++)
   {
-    if(fanIsType(i,FAN_TYPE_F)) mustStoreCmd("%s S255\n", fanCmd[i]);
+    if (fanIsType(i,FAN_TYPE_F)) mustStoreCmd("%s S255\n", fanCmd[i]);
   }
   setDialogText(LABEL_SHUT_DOWN, (u8 *)tempstr, LABEL_FORCE_SHUT_DOWN, LABEL_CANCEL);
   showDialog(DIALOG_TYPE_INFO, shutdown, NULL, shutdownLoop);
@@ -334,17 +342,17 @@ void getGcodeFromFile(void)
   u8      sd_count = 0;
   UINT    br = 0;
 
-  if(isPrinting()==false || infoFile.source == BOARD_SD)  return;
+  if (isPrinting()==false || infoFile.source == BOARD_SD)  return;
 
   powerFailedCache(infoPrinting.file.fptr);
 
-  if(heatHasWaiting() || infoCmd.count || infoPrinting.pause )  return;
+  if (heatHasWaiting() || infoCmd.count || infoPrinting.pause )  return;
 
-  if(moveCacheToCmd() == true) return;
+  if (moveCacheToCmd() == true) return;
 
   for(;infoPrinting.cur < infoPrinting.size;)
   {
-    if(f_read(&infoPrinting.file, &sd_char, 1, &br)!=FR_OK) break;
+    if (f_read(&infoPrinting.file, &sd_char, 1, &br)!=FR_OK) break;
 
     infoPrinting.cur++;
 
@@ -353,7 +361,7 @@ void getGcodeFromFile(void)
     {
       sd_comment_mode = false;   //for new command
       sd_comment_space= true;
-      if(sd_count!=0)
+      if (sd_count!=0)
       {
         infoCmd.queue[infoCmd.index_w].gcode[sd_count++] = '\n';
         infoCmd.queue[infoCmd.index_w].gcode[sd_count] = 0; //terminate string
@@ -371,7 +379,7 @@ void getGcodeFromFile(void)
         sd_comment_mode = true;
       else
       {
-        if(sd_comment_space && (sd_char== 'G'||sd_char == 'M'||sd_char == 'T'))  //ignore ' ' space bytes
+        if (sd_comment_space && (sd_char== 'G'||sd_char == 'M'||sd_char == 'T'))  //ignore ' ' space bytes
           sd_comment_space = false;
         if (!sd_comment_mode && !sd_comment_space && sd_char != '\r')  //normal gcode
           infoCmd.queue[infoCmd.index_w].gcode[sd_count++] = sd_char;
@@ -379,7 +387,7 @@ void getGcodeFromFile(void)
     }
   }
 
-  if((infoPrinting.cur>=infoPrinting.size) && isPrinting())  // end of .gcode file
+  if ((infoPrinting.cur>=infoPrinting.size) && isPrinting())  // end of .gcode file
   {
     printingFinished();
   }
@@ -411,7 +419,7 @@ bool hasPrintingMenu(void)
 void loopCheckPrinting(void)
 {
   #if defined(ST7920_SPI) || defined(LCD2004_simulator)
-    if(infoMenu.menu[infoMenu.cur] == menuMarlinMode) return;
+    if (infoMenu.menu[infoMenu.cur] == menuMarlinMode) return;
   #endif
 
   if (infoHost.printing && !infoPrinting.printing) {
@@ -432,10 +440,10 @@ void loopCheckPrinting(void)
   uint32_t update_time = infoSettings.m27_refresh_time * 1000;
   do
   {  /* WAIT FOR M27  */
-    if(update_waiting == true) {nextTime = OS_GetTimeMs() + update_time; break;}
-    if(OS_GetTimeMs() < nextTime) break;
+    if (update_waiting == true) {nextTime = OS_GetTimeMs() + update_time; break;}
+    if (OS_GetTimeMs() < nextTime) break;
 
-    if(storeCmd("M27\n") == false) break;
+    if (storeCmd("M27\n") == false) break;
 
     nextTime = OS_GetTimeMs() + update_time;
     update_waiting = true;
diff --git a/TFT/src/User/API/Printing.h b/TFT/src/User/API/Printing.h
index f8e82b1598..fb19ad0371 100644
--- a/TFT/src/User/API/Printing.h
+++ b/TFT/src/User/API/Printing.h
@@ -1,5 +1,4 @@
-#ifndef _PRINTING_H_
-#define _PRINTING_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,7 +19,7 @@ extern "C" {
 
 #ifdef RAPID_SERIAL_COMM
 #define rapid_serial_loop()  loopBackEnd()
-#define rapid_serial_comm()  if(isPrinting() == true && infoSettings.serial_alwaysOn != 1){loopBackEnd();}
+#define rapid_serial_comm()  if (isPrinting() == true && infoSettings.serial_alwaysOn != 1){loopBackEnd();}
 #else
 #define rapid_serial_loop()
 #define rapid_serial_comm()
@@ -88,5 +87,3 @@ void loopCheckPrinting(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/ProbeHeightControl.h b/TFT/src/User/API/ProbeHeightControl.h
index 9ca817fd9f..999326738e 100644
--- a/TFT/src/User/API/ProbeHeightControl.h
+++ b/TFT/src/User/API/ProbeHeightControl.h
@@ -1,5 +1,4 @@
-#ifndef _PROBE_HEIGHT_CONTROL_H_
-#define _PROBE_HEIGHT_CONTROL_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,5 +31,3 @@ void probeHeightQueryCoord(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/ProbeOffsetControl.h b/TFT/src/User/API/ProbeOffsetControl.h
index 74fecadb48..0b27cf6461 100644
--- a/TFT/src/User/API/ProbeOffsetControl.h
+++ b/TFT/src/User/API/ProbeOffsetControl.h
@@ -1,5 +1,4 @@
-#ifndef _PROBE_OFFSET_CONTROL_H_
-#define _PROBE_OFFSET_CONTROL_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,5 +37,3 @@ float probeOffsetUpdateValueByEncoder(float unit, int8_t direction);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Settings.c b/TFT/src/User/API/Settings.c
index b812bb0f8e..db0c6147a1 100644
--- a/TFT/src/User/API/Settings.c
+++ b/TFT/src/User/API/Settings.c
@@ -98,11 +98,13 @@ void infoSettingsReset(void)
   infoSettings.touchSound             = ENABLED;
   infoSettings.toastSound             = ENABLED;
   infoSettings.alertSound             = ENABLED;
+  infoSettings.preheatDoneSound       = ENABLED;
   infoSettings.knob_led_color         = STARTUP_KNOB_LED_COLOR;
   infoSettings.knob_led_idle          = ENABLED;
   infoSettings.lcd_brightness         = DEFAULT_LCD_BRIGHTNESS;
   infoSettings.lcd_idle_brightness    = DEFAULT_LCD_IDLE_BRIGHTNESS;
   infoSettings.lcd_idle_timer         = DEFAULT_LCD_IDLE_TIMER;
+  infoSettings.event_led_mode        = DISABLED;
 
 // Start, End & Cancel G-codes
   infoSettings.send_start_gcode       = DISABLED;
@@ -147,7 +149,8 @@ void infoSettingsReset(void)
   resetConfig();
 }
 
-void initMachineSetting(void){
+void initMachineSetting(void)
+{
   // some settings are assumes as active unless reported disabled by marlin
   infoMachineSettings.isMarlinFirmware        = -1; // set fimware type to -1 to avoid repeated ABL gcode on mode change
   infoMachineSettings.EEPROM                  = ENABLED;
@@ -201,6 +204,7 @@ void setupMachine(void)
     infoMachineSettings.emergencyParser         = ENABLED;
     infoMachineSettings.autoReportSDStatus      = DISABLED;
   }
+
   if (infoSettings.onboardSD == ENABLED)
   {
     infoMachineSettings.onboard_sd_support = ENABLED;
@@ -209,6 +213,7 @@ void setupMachine(void)
   {
     infoMachineSettings.onboard_sd_support = DISABLED;
   }
+
   if (infoSettings.longFileName == ENABLED)
   {
     infoMachineSettings.long_filename_support = ENABLED;
@@ -238,7 +243,9 @@ void checkflashSign(void)
   bool statusicon = getFlashSignStatus(icon_sign);
 
   if (!statuslang)
+  {
     infoSettings.language = LANG_DEFAULT;
+  }
 
   if (!statusfont || !statusicon || !statusconfig)
   {
@@ -248,27 +255,43 @@ void checkflashSign(void)
 
     ypos += BYTE_HEIGHT;
     if (statusfont)
+    {
       GUI_DispString(10, ypos, (uint8_t *)"Fonts: OK");
+    }
     else
+    {
       GUI_DispString(10, ypos, (uint8_t *)"Fonts: Update required");
+    }
 
     ypos += BYTE_HEIGHT;
     if (statusconfig)
+    {
       GUI_DispString(10, ypos, (uint8_t *)"Config: OK");
+    }
     else
+    {
       GUI_DispString(10, ypos, (uint8_t *)"Config: Update required");
+    }
 
     ypos += BYTE_HEIGHT;
     if (statuslang)
+    {
       GUI_DispString(10, ypos, (uint8_t *)"Language: OK");
+    }
     else
+    {
       GUI_DispString(10, ypos, (uint8_t *)"Language: Update required(Optional)");
+    }
 
     ypos += BYTE_HEIGHT;
     if (statusicon)
+    {
       GUI_DispString(10, ypos, (uint8_t *)"Icons: OK");
+    }
     else
+    {
       GUI_DispString(10, ypos, (uint8_t *)"Icons: Update required");
+    }
 
     ypos += BYTE_HEIGHT;
     GUI_DispStringInRectEOL(10, ypos + 10, LCD_WIDTH, LCD_HEIGHT, (uint8_t *)"Insert the SD card with the required\n"
diff --git a/TFT/src/User/API/Settings.h b/TFT/src/User/API/Settings.h
index 0024c4b3eb..f87f44e6d7 100644
--- a/TFT/src/User/API/Settings.h
+++ b/TFT/src/User/API/Settings.h
@@ -1,5 +1,4 @@
-#ifndef _SETTINGS_H_
-#define _SETTINGS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,8 +23,8 @@ enum
 #define CONFIG_SUPPPORT 20200810
 
 #define FONT_FLASH_SIGN       20200908 //(YYYYMMDD) change if fonts require updating
-#define CONFIG_FLASH_SIGN     20200908 //(YYYYMMDD) change if any keyword(s) in config.ini is added or removed
-#define LANGUAGE_FLASH_SIGN   20201007 //(YYYYMMDD) change if any keyword(s) in language pack is added or removed
+#define CONFIG_FLASH_SIGN     20201115 //(YYYYMMDD) change if any keyword(s) in config.ini is added or removed
+#define LANGUAGE_FLASH_SIGN   20201115 //(YYYYMMDD) change if any keyword(s) in language pack is added or removed
 #define ICON_FLASH_SIGN       20201028 //(YYYYMMDD) change if any icon(s) is added or removed
 
 #define FONT_CHECK_SIGN       (FONT_FLASH_SIGN + WORD_UNICODE)
@@ -161,16 +160,19 @@ typedef struct
   uint8_t  touchSound;
   uint8_t  toastSound;
   uint8_t  alertSound;
+  uint8_t  preheatDoneSound;
   uint8_t  knob_led_color;
   uint8_t  knob_led_idle;
   uint8_t  lcd_brightness;
   uint8_t  lcd_idle_brightness;
   uint8_t  lcd_idle_timer;
+  uint8_t  event_led_mode;
 
 // Start, End & Cancel G-codes
   uint8_t  send_start_gcode;
   uint8_t  send_end_gcode;
   uint8_t  send_cancel_gcode;
+
 }SETTINGS;
 
 typedef struct
@@ -239,5 +241,3 @@ bool getFlashSignStatus(int index);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/SpeedControl.c b/TFT/src/User/API/SpeedControl.c
index 353f583222..a71e00c790 100644
--- a/TFT/src/User/API/SpeedControl.c
+++ b/TFT/src/User/API/SpeedControl.c
@@ -53,17 +53,17 @@ bool SpeedChanged(u8 i)
 
 void loopSpeed(void)
 {
-  for(u8 i = 0; i < SPEED_NUM;i++)
-    if((curPercent[i] != percent[i]) && (OS_GetTimeMs() > nextSpeedTime))
+  for (u8 i = 0; i < SPEED_NUM;i++)
+    if ((curPercent[i] != percent[i]) && (OS_GetTimeMs() > nextSpeedTime))
     {
-      if(send_waiting[i] == false)
+      if (send_waiting[i] == false)
       {
         send_waiting[i] = true;
         const char *speedCmd[SPEED_NUM] = {"M220","M221"};
         send_waiting[i] = storeCmd("%s S%d\n",speedCmd[i], percent[i]);
       }
-    if (send_waiting[i] == true) curPercent[i] = percent[i];
-    nextSpeedTime = OS_GetTimeMs() + nextSpeedWait; // avoid rapid fire, clogging the queue
+      if (send_waiting[i] == true) curPercent[i] = percent[i];
+      nextSpeedTime = OS_GetTimeMs() + nextSpeedWait; // avoid rapid fire, clogging the queue
     }
 }
 
diff --git a/TFT/src/User/API/SpeedControl.h b/TFT/src/User/API/SpeedControl.h
index 85938ed315..ac7301a317 100644
--- a/TFT/src/User/API/SpeedControl.h
+++ b/TFT/src/User/API/SpeedControl.h
@@ -1,5 +1,4 @@
-#ifndef _SPEEDCONTROL_H_
-#define _SPEEDCONTROL_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,5 +23,3 @@ void speedQuery(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Temperature.c b/TFT/src/User/API/Temperature.c
index eefc8affbf..f84a822f25 100644
--- a/TFT/src/User/API/Temperature.c
+++ b/TFT/src/User/API/Temperature.c
@@ -55,7 +55,7 @@ bool heatHasWaiting(void)
 {
   for(uint8_t i = 0; i < MAX_HEATER_COUNT; i++)
   {
-    if(heater.T[i].waiting != WAIT_NONE)
+    if (heater.T[i].waiting != WAIT_NONE)
       return true;
   }
   return false;
@@ -66,11 +66,11 @@ void heatSetIsWaiting(uint8_t tool, HEATER_WAIT isWaiting)
 {
   heater.T[tool].waiting = isWaiting;
 
-  if(isWaiting != WAIT_NONE) // wait heating now, query more frequently
+  if (isWaiting != WAIT_NONE) // wait heating now, query more frequently
   {
     heatSetUpdateSeconds(TEMPERATURE_QUERY_FAST_SECONDS);
   }
-  else if(heatHasWaiting() == false)
+  else if (heatHasWaiting() == false)
   {
     heatSetUpdateSeconds(TEMPERATURE_QUERY_SLOW_SECONDS);
   }
@@ -88,7 +88,7 @@ void heatClearIsWaiting(void)
 // Set current Tool (Extruder)
 void heatSetCurrentTool(uint8_t tool)
 {
-  if(tool >= infoSettings.ext_count) return;
+  if (tool >= infoSettings.ext_count) return;
   heater.toolIndex = tool;
 }
 
@@ -167,7 +167,11 @@ void loopCheckHeater(void)
   {
     do
     {  // Send M105 query temperature continuously
-      if (heat_update_waiting == true) {updateNextHeatCheckTime();break;}
+      if (heat_update_waiting == true)
+      {
+        updateNextHeatCheckTime();
+        break;
+      }
       if (OS_GetTimeMs() < nextHeatCheckTime)     break;
       if (requestCommandInfoIsRunning())          break; // To avoid colision in Gcode response processing
       if (storeCmd("M105\n") == false)            break;
diff --git a/TFT/src/User/API/Temperature.h b/TFT/src/User/API/Temperature.h
index a1eecf5449..1f207ec210 100644
--- a/TFT/src/User/API/Temperature.h
+++ b/TFT/src/User/API/Temperature.h
@@ -1,5 +1,4 @@
-#ifndef _TEMPERATURE_H_
-#define _TEMPERATURE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,5 +86,3 @@ void loopCheckHeater(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/UI/GUI.c b/TFT/src/User/API/UI/GUI.c
index 826f053916..c9e98ef725 100644
--- a/TFT/src/User/API/UI/GUI.c
+++ b/TFT/src/User/API/UI/GUI.c
@@ -85,7 +85,7 @@ void GUI_CancelRange(void)
 
 void GUI_DrawPixel(int16_t x, int16_t y, uint16_t color)
 {
-  if(pixel_limit_flag == 1
+  if (pixel_limit_flag == 1
     &&(x <  pixel_limit_rect.x0
      ||x >= pixel_limit_rect.x1
      ||y <  pixel_limit_rect.y0
@@ -185,21 +185,21 @@ void GUI_DrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2)
   delta_y = y2 - y1;
   uRow = x1;
   uCol = y1;
-  if(delta_x > 0)
+  if (delta_x > 0)
     incx = 1; //���õ�������
-  else if(delta_x == 0)
+  else if (delta_x == 0)
     incx = 0;//��ֱ��
   else
   { incx = -1; delta_x = -delta_x;}
 
-  if(delta_y > 0)
+  if (delta_y > 0)
     incy = 1;
-  else if(delta_y == 0)
+  else if (delta_y == 0)
     incy = 0;//ˮƽ��
   else
   { incy = -1; delta_y = -delta_y;}
 
-  if(delta_x > delta_y)
+  if (delta_x > delta_y)
     distance = delta_x; //ѡȡ��������������
   else
     distance = delta_y;
@@ -209,12 +209,12 @@ void GUI_DrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2)
     GUI_DrawPoint(uRow,uCol);//����
     xerr += delta_x;
     yerr += delta_y;
-    if(xerr > distance)
+    if (xerr > distance)
     {
       xerr -= distance;
       uRow += incx;
     }
-    if(yerr > distance)
+    if (yerr > distance)
     {
       yerr -= distance;
       uCol += incy;
@@ -289,7 +289,7 @@ void GUI_DrawCircle(uint16_t x0, uint16_t y0, uint16_t r)
     GUI_DrawPoint(x0-b, y0-a);             //7
     a++;
     //ʹ��Bresenham�㷨��Բ
-    if(di<0)
+    if (di<0)
       di += (a<<2) + 6;
     else
     {
@@ -315,26 +315,26 @@ void  GUI_FillCircle(uint16_t x0, uint16_t y0, uint16_t r)
   int16_t  di;						// ���߱���
 
   /* �������� */
-  if(0 == r) return;
+  if (0 == r) return;
 
   /* �����?4�������?(0��90��180��270��)��������ʾ */
   draw_x0 = draw_x1 = x0;
   draw_y0 = draw_y1 = y0 + r;
-  if(draw_y0 < LCD_HEIGHT)
+  if (draw_y0 < LCD_HEIGHT)
   {
     GUI_DrawPoint(draw_x0, draw_y0);	// 90��
   }
 
   draw_x2 = draw_x3 = x0;
   draw_y2 = draw_y3 = y0 - r;
-  if(draw_y2 >= 0)
+  if (draw_y2 >= 0)
   {
     GUI_DrawPoint(draw_x2, draw_y2);	// 270��
   }
 
   draw_x4 = draw_x6 = x0 + r;
   draw_y4 = draw_y6 = y0;
-  if(draw_x4 < LCD_WIDTH)
+  if (draw_x4 < LCD_WIDTH)
   {
     GUI_DrawPoint(draw_x4, draw_y4);	// 0��
     fill_x1 = draw_x4;
@@ -346,18 +346,18 @@ void  GUI_FillCircle(uint16_t x0, uint16_t y0, uint16_t r)
 
   fill_y0 = y0;							// �������������ʼ��fill_x0
   fill_x0 = x0 - r;						// �����������������fill_y1
-  if(fill_x0<0)
+  if (fill_x0<0)
   fill_x0 = 0;
 
   GUI_HLine(fill_x0, fill_y0, fill_x1);
 
   draw_x5 = draw_x7 = x0 - r;
   draw_y5 = draw_y7 = y0;
-  if(draw_x5 >= 0)
+  if (draw_x5 >= 0)
   {
     GUI_DrawPoint(draw_x5, draw_y5);	// 180��
   }
-  if(1==r) return;
+  if (1==r) return;
 
   /* ʹ��Bresenham�����л�Բ */
   di = 3 - 2*r;							// ��ʼ�����߱���
@@ -365,7 +365,7 @@ void  GUI_FillCircle(uint16_t x0, uint16_t y0, uint16_t r)
   yy = r;
   while(xx < yy)
   {
-    if(di<0)
+    if (di<0)
     {
       di += 4*xx + 6;
     }
@@ -395,108 +395,108 @@ void  GUI_FillCircle(uint16_t x0, uint16_t y0, uint16_t r)
     draw_y7--;
 
     /* Ҫ�жϵ�ǰ���Ƿ�����Ч��Χ�� */
-    if((draw_x0 <= LCD_WIDTH) && (draw_y0 >= 0))
+    if ((draw_x0 <= LCD_WIDTH) && (draw_y0 >= 0))
     {
       GUI_DrawPoint(draw_x0, draw_y0);
     }
-    if((draw_x1 >= 0) && (draw_y1 >= 0))
+    if ((draw_x1 >= 0) && (draw_y1 >= 0))
     {
       GUI_DrawPoint(draw_x1, draw_y1);
     }
 
     /* �ڶ���ˮֱ�����?(�°�Բ�ĵ�) */
-    if(draw_x1 >= 0)
+    if (draw_x1 >= 0)
     {  /* �������������ʼ��fill_x0 */
       fill_x0 = draw_x1;
       /* �������������ʼ��fill_y0 */
       fill_y0 = draw_y1;
-      if(fill_y0 > LCD_HEIGHT)
+      if (fill_y0 > LCD_HEIGHT)
         fill_y0 = LCD_HEIGHT;
-      if(fill_y0 < 0)
+      if (fill_y0 < 0)
         fill_y0 = 0;
       /* �����������������fill_x1 */
       fill_x1 = x0*2 - draw_x1;
-      if(fill_x1 > LCD_WIDTH)
+      if (fill_x1 > LCD_WIDTH)
         fill_x1 = LCD_WIDTH;
       GUI_HLine(fill_x0, fill_y0, fill_x1);
     }
 
-    if((draw_x2 <= LCD_WIDTH) && (draw_y2 <= LCD_HEIGHT) )
+    if ((draw_x2 <= LCD_WIDTH) && (draw_y2 <= LCD_HEIGHT) )
     {
       GUI_DrawPoint(draw_x2, draw_y2);
     }
 
-    if((draw_x3 >= 0) && (draw_y3 <= LCD_HEIGHT) )
+    if ((draw_x3 >= 0) && (draw_y3 <= LCD_HEIGHT) )
     {
       GUI_DrawPoint(draw_x3, draw_y3);
     }
 
     /* ���ĵ㴹ֱ�����?(�ϰ�Բ�ĵ�) */
-    if(draw_x3 >= 0)
+    if (draw_x3 >= 0)
     {  /* �������������ʼ��fill_x0 */
       fill_x0 = draw_x3;
       /* �������������ʼ��fill_y0 */
       fill_y0 = draw_y3;
-      if(fill_y0 > LCD_HEIGHT)
+      if (fill_y0 > LCD_HEIGHT)
         fill_y0 = LCD_HEIGHT;
-      if(fill_y0 < 0)
+      if (fill_y0 < 0)
         fill_y0 = 0;
       /* �����������������fill_x1 */
       fill_x1 = x0*2 - draw_x3;
-      if(fill_x1 > LCD_WIDTH)
+      if (fill_x1 > LCD_WIDTH)
         fill_x1 = LCD_WIDTH;
       GUI_HLine(fill_x0, fill_y0, fill_x1);
     }
 
-    if((draw_x4 <= LCD_WIDTH) && (draw_y4 >= 0))
+    if ((draw_x4 <= LCD_WIDTH) && (draw_y4 >= 0))
     {
       GUI_DrawPoint(draw_x4, draw_y4);
     }
-    if((draw_x5 >= 0) && (draw_y5 >= 0))
+    if ((draw_x5 >= 0) && (draw_y5 >= 0))
     {
       GUI_DrawPoint(draw_x5, draw_y5);
     }
 
     /* �����㴹ֱ�����?(�ϰ�Բ�ĵ�) */
-    if(draw_x5 >= 0)
+    if (draw_x5 >= 0)
     {  /* �������������ʼ��fill_x0 */
       fill_x0 = draw_x5;
       /* �������������ʼ��fill_y0 */
       fill_y0 = draw_y5;
-      if(fill_y0 > LCD_HEIGHT)
+      if (fill_y0 > LCD_HEIGHT)
         fill_y0 = LCD_HEIGHT;
-      if(fill_y0 < 0)
+      if (fill_y0 < 0)
         fill_y0 = 0;
       /* �����������������fill_x1 */
       fill_x1 = x0*2 - draw_x5;
-      if(fill_x1 > LCD_WIDTH)
+      if (fill_x1 > LCD_WIDTH)
         fill_x1 = LCD_WIDTH;
       GUI_HLine(fill_x0, fill_y0, fill_x1);
     }
 
-    if((draw_x6 <= LCD_WIDTH) && (draw_y6 <= LCD_HEIGHT))
+    if ((draw_x6 <= LCD_WIDTH) && (draw_y6 <= LCD_HEIGHT))
     {
       GUI_DrawPoint(draw_x6, draw_y6);
     }
 
-    if((draw_x7 >= 0) && (draw_y7 <= LCD_HEIGHT))
+    if ((draw_x7 >= 0) && (draw_y7 <= LCD_HEIGHT))
     {
       GUI_DrawPoint(draw_x7, draw_y7);
     }
 
     /* �ڰ˵㴹ֱ�����?(�ϰ�Բ�ĵ�) */
-    if(draw_x7 >= 0)
+    if (draw_x7 >= 0)
     {  /* �������������ʼ��fill_x0 */
       fill_x0 = draw_x7;
       /* �������������ʼ��fill_y0 */
       fill_y0 = draw_y7;
-      if(fill_y0 > LCD_HEIGHT)
+      if (fill_y0 > LCD_HEIGHT)
         fill_y0 = LCD_HEIGHT;
-      if(fill_y0 < 0)
+      if (fill_y0 < 0)
         fill_y0 = 0;
       /* �����������������fill_x1 */
       fill_x1 = x0*2 - draw_x7;
-      if(fill_x1 > LCD_WIDTH)
+      if (fill_x1 > LCD_WIDTH)
         fill_x1 = LCD_WIDTH;
       GUI_HLine(fill_x0, fill_y0, fill_x1);
     }
@@ -508,7 +508,7 @@ CHAR_INFO GUI_DispOne(int16_t sx, int16_t sy, const uint8_t *p)
 {
   CHAR_INFO info = {.bytes = 0};
 
-  if(p == NULL || *p == 0) return info;
+  if (p == NULL || *p == 0) return info;
 
   getCharacterInfo(p, &info);
 
@@ -532,9 +532,9 @@ CHAR_INFO GUI_DispOne(int16_t sx, int16_t sy, const uint8_t *p)
 
     for(y=0;y < info.pixelHeight;y++)
     {
-      if(temp & (1<<(info.pixelHeight-1)))
+      if (temp & (1<<(info.pixelHeight-1)))
         GUI_DrawPixel(sx, sy+y, foreGroundColor);
-      else if(guiTextMode == GUI_TEXTMODE_NORMAL)
+      else if (guiTextMode == GUI_TEXTMODE_NORMAL)
         GUI_DrawPixel(sx, sy+y, backGroundColor);
       temp <<= 1;
     }
@@ -546,7 +546,7 @@ CHAR_INFO GUI_DispOne(int16_t sx, int16_t sy, const uint8_t *p)
 void _GUI_DispString(int16_t x, int16_t y, const uint8_t *p)
 {
   CHAR_INFO info;
-  if(p == NULL) return;
+  if (p == NULL) return;
 
   while(*p)
   {
@@ -560,16 +560,16 @@ const uint8_t* _GUI_DispLenString(int16_t x, int16_t y, const uint8_t *p, uint16
 {
   CHAR_INFO info;
   uint16_t curPixelWidth = 0;
-  if(p == NULL) return NULL;
+  if (p == NULL) return NULL;
 
-  if(truncate) pixelWidth -= BYTE_HEIGHT;
+  if (truncate) pixelWidth -= BYTE_HEIGHT;
 
   while(curPixelWidth < pixelWidth && *p)
   {
     getCharacterInfo(p, &info);
-    if(curPixelWidth + info.pixelWidth > pixelWidth)
+    if (curPixelWidth + info.pixelWidth > pixelWidth)
     {
-      if(truncate) GUI_DispOne(x, y, (u8*)"…");
+      if (truncate) GUI_DispOne(x, y, (u8*)"…");
       return p;
     }
     GUI_DispOne(x, y, p);
@@ -599,7 +599,7 @@ void _GUI_DispStringInRect(int16_t sx, int16_t sy, int16_t ex, int16_t ey, const
   uint16_t height = ey - sy;
   uint8_t  nline = (stringlen+width-1)/width ;
 
-  if(nline > height/BYTE_HEIGHT)
+  if (nline > height/BYTE_HEIGHT)
   nline = height/BYTE_HEIGHT;
 
   uint16_t x_offset = stringlen >= width ? 0 : ( width-stringlen)>>1;
@@ -633,7 +633,7 @@ void _GUI_DispStringInRectEOL(int16_t sx, int16_t sy, int16_t ex, int16_t ey, co
       sy += info.pixelHeight;
       if (sy + info.pixelHeight > ey) return;
     }
-    if(*p != '\n')
+    if (*p != '\n')
     {
       GUI_DispOne(x, sy, p);
       x += info.pixelWidth;
@@ -662,7 +662,7 @@ void GUI_DispDec(int16_t x, int16_t y, int32_t num, uint8_t len, uint8_t leftOrR
   uint8_t decBuf[64];
   uint8_t bufIndex = 0;
 
-  if(num<0)
+  if (num<0)
   {
     num = -num;
     isNegative = 1;
@@ -671,11 +671,11 @@ void GUI_DispDec(int16_t x, int16_t y, int32_t num, uint8_t len, uint8_t leftOrR
   for(i=0;i<len;i++)
   {
     bit_value=(num/GUI_Pow10[len-i-1])%10;
-    if(notZero == 0)
+    if (notZero == 0)
     {
-      if(bit_value == 0 && i<(len-1))
+      if (bit_value == 0 && i<(len-1))
       {
-        if(leftOrRight==RIGHT)
+        if (leftOrRight==RIGHT)
         {
           decBuf[bufIndex++] = (guiNumMode == GUI_NUMMODE_SPACE) ? ' ' : '0';
         }
@@ -688,7 +688,7 @@ void GUI_DispDec(int16_t x, int16_t y, int32_t num, uint8_t len, uint8_t leftOrR
       else
       {
         notZero = 1;
-        if(isNegative)
+        if (isNegative)
         {
           decBuf[bufIndex++] = '-';
         }
@@ -713,7 +713,7 @@ void GUI_DispFloat(int16_t x, int16_t y, float num, uint8_t llen, uint8_t rlen,
   uint8_t  floatBuf[64];
   uint8_t  bufIndex = 0;
 
-  if(num<0)
+  if (num<0)
   {
     num = -num;
     isNegative = 1;
@@ -726,11 +726,11 @@ void GUI_DispFloat(int16_t x, int16_t y, float num, uint8_t llen, uint8_t rlen,
   for(i=0; i<llen; i++)
   {
     uint8_t bit_value = ((uint32_t)(num/GUI_Pow10[llen+rlen-1-i]))%10;
-    if(notZero == 0)
+    if (notZero == 0)
     {
-      if(bit_value == 0 && i<(llen-1))
+      if (bit_value == 0 && i<(llen-1))
       {
-        if(leftOrRight==RIGHT)
+        if (leftOrRight==RIGHT)
         {
           floatBuf[bufIndex++] = (guiNumMode == GUI_NUMMODE_SPACE) ? ' ' : '0';
           alen++;
@@ -740,7 +740,7 @@ void GUI_DispFloat(int16_t x, int16_t y, float num, uint8_t llen, uint8_t rlen,
       else
       {
         notZero = 1;
-        if(isNegative)
+        if (isNegative)
         {
           floatBuf[bufIndex++] = '-';
         }
@@ -830,7 +830,7 @@ void RADIO_Create(RADIO *radio)
   uint8_t i=0;
   for(i=0;i<radio->num;i++)
   {
-    if(i==radio->select)
+    if (i==radio->select)
       GUI_SetColor(RADIO_SELECTED_COLOR);
     else
       GUI_SetColor(RADIO_IDLE_COLOR);
@@ -845,11 +845,11 @@ void RADIO_Select(RADIO *radio, uint8_t select)
 {
   u16 tmp = GUI_GetColor();
   uint8_t i=0;
-  if(radio->select==select)
+  if (radio->select==select)
   return;
   for(i=0;i<2;i++)
   {
-    if(i==0)
+    if (i==0)
     {
       GUI_SetColor(RADIO_IDLE_COLOR);
     }
@@ -881,18 +881,18 @@ void Scroll_DispString(SCROLL * para, uint8_t align)
   uint16_t i = 0;
   CHAR_INFO info;
 
-  if(para->text == NULL) return;
-  if(para->totalPixelWidth > para->maxPixelWidth)
+  if (para->text == NULL) return;
+  if (para->totalPixelWidth > para->maxPixelWidth)
   {
-    if(OS_GetTimeMs() > para->time)
+    if (OS_GetTimeMs() > para->time)
     {
       para->time = OS_GetTimeMs() + 50; // 50ms
       GUI_SetRange(para->rect->x0, para->rect->y0, para->rect->x1, para->rect->y1);
-      if(para->curByte < para->maxByte)
+      if (para->curByte < para->maxByte)
       {
         getCharacterInfo(&para->text[para->curByte], &info);
         para->off_head++;
-        if(para->off_head == info.pixelWidth)
+        if (para->off_head == info.pixelWidth)
         {
           para->curByte += info.bytes;
           para->off_head = 0;
@@ -901,7 +901,7 @@ void Scroll_DispString(SCROLL * para, uint8_t align)
         GUI_DispLenString(para->rect->x0 - para->off_head, para->rect->y0, &para->text[para->curByte], para->maxPixelWidth + info.pixelWidth, false);
 
         para->curPixelWidth--;
-        if(para->curPixelWidth < para->maxPixelWidth)
+        if (para->curPixelWidth < para->maxPixelWidth)
         {
           for(i = para->rect->y0; i<para->rect->y1; i++)
           {
@@ -910,11 +910,11 @@ void Scroll_DispString(SCROLL * para, uint8_t align)
         }
       }
 
-      if(para->curPixelWidth + 2*BYTE_WIDTH < para->maxPixelWidth)
+      if (para->curPixelWidth + 2*BYTE_WIDTH < para->maxPixelWidth)
       {
         para->off_tail++;
         GUI_DispLenString(para->rect->x1-para->off_tail, para->rect->y0, para->text, para->off_tail, false);
-        if(para->off_tail + para->rect->x0 >= para->rect->x1)
+        if (para->off_tail + para->rect->x0 >= para->rect->x1)
         {
           para->off_head=0;
           para->off_tail=0;
@@ -925,7 +925,7 @@ void Scroll_DispString(SCROLL * para, uint8_t align)
       GUI_CancelRange();
     }
   }
-  else if(!para->has_disp)
+  else if (!para->has_disp)
   {
     switch(align)
     {
@@ -1079,7 +1079,7 @@ void GUI_DrawWindow(const WINDOW *window, const uint8_t *title, const uint8_t *i
 
     //draw info text
     GUI_SetColor(window->info.fontColor);
-    if(GUI_StrPixelWidth(inf) < w_rect.x1 - w_rect.x0)
+    if (GUI_StrPixelWidth(inf) < w_rect.x1 - w_rect.x0)
       GUI_DispStringInRect(w_rect.x0, title_y1, w_rect.x1, action_y0, inf);
     else
       GUI_DispStringInRectEOL(w_rect.x0 + margin, title_y1 + margin, w_rect.x1 - margin, action_y0 - margin, inf);
diff --git a/TFT/src/User/API/UI/GUI.h b/TFT/src/User/API/UI/GUI.h
index 2d56f1c860..5ed13e9a42 100644
--- a/TFT/src/User/API/UI/GUI.h
+++ b/TFT/src/User/API/UI/GUI.h
@@ -1,5 +1,4 @@
-#ifndef _GUI_H_
-#define _GUI_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -191,5 +190,3 @@ void GUI_DrawWindow(const WINDOW *window, const uint8_t *title, const uint8_t *i
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/UI/HD44780_Simulator.c b/TFT/src/User/API/UI/HD44780_Simulator.c
index 4dbb9896dd..b8a17b55c1 100644
--- a/TFT/src/User/API/UI/HD44780_Simulator.c
+++ b/TFT/src/User/API/UI/HD44780_Simulator.c
@@ -69,7 +69,7 @@ void HD44780_BI16_SetCGRAMAddress(uint8_t cmd)
 {
   HD44780_reg.bi.cgrama.reg = cmd;
   uint8_t address = HD44780_reg.bi.cgrama.ac;
-  // Set CGRAM address 
+  // Set CGRAM address
   HD44780.y = (address >> 3) & 0x07;
   HD44780.x = 0;
   HD44780_reg.data_type = HD44780_DATA_CGRAM;
@@ -77,22 +77,26 @@ void HD44780_BI16_SetCGRAMAddress(uint8_t cmd)
 //cmd : 1 << 7
 void HD44780_BI17_SetDDRAMAddress(uint8_t cmd)
 {
-  HD44780_reg.bi.ddrama.reg = cmd;            
-  // Set DDRAM address                     
-  // x is 0-20 . y is 0-4                       
-  if(0x80 <= cmd && cmd <= 0x93){                // First line AC range is  80H … 93h
+  HD44780_reg.bi.ddrama.reg = cmd;
+  // Set DDRAM address
+  // x is 0-20 . y is 0-4
+  if (0x80 <= cmd && cmd <= 0x93)                // First line AC range is  80H … 93h
+  {
     HD44780.y = 0;
     HD44780.x = cmd - 0x80;
   }
-  if(0xC0 <= cmd && cmd <= 0xD3){                // Second line AC range is C0H … D3H
+  if (0xC0 <= cmd && cmd <= 0xD3)                // Second line AC range is C0H … D3H
+  {
     HD44780.y = 1;
     HD44780.x = cmd - 0xC0;
   }
-  if(0x94 <= cmd && cmd <= 0xA7){                // Third line AC range is  94H … A7H
+  if (0x94 <= cmd && cmd <= 0xA7)                // Third line AC range is  94H … A7H
+  {
     HD44780.y = 2;
     HD44780.x = cmd - 0x94;
   }
-  if(0xD4 <= cmd && cmd <= 0xE7){                // Fourth line AC range is D4H … E7H
+  if (0xD4 <= cmd && cmd <= 0xE7)                // Fourth line AC range is D4H … E7H
+  {
     HD44780.y = 3;
     HD44780.x = cmd - 0xD4;
   }
@@ -101,19 +105,21 @@ void HD44780_BI17_SetDDRAMAddress(uint8_t cmd)
 
 void HD44780_DrawPixel(int16_t x, int16_t y, bool isForeGround, bool isFont)
 {
-  if(isFont){
-  GUI_FillRectColor(XSTART + FONT_PIXEL * x,
-                    YSTART + FONT_PIXEL * y,
-                    XSTART + FONT_PIXEL * (x+1),
-                    YSTART + FONT_PIXEL * (y+1),
-                    isForeGround ? infoSettings.marlin_mode_font_color : infoSettings.marlin_mode_bg_color);
+  if (isFont)
+  {
+    GUI_FillRectColor(XSTART + FONT_PIXEL * x,
+                      YSTART + FONT_PIXEL * y,
+                      XSTART + FONT_PIXEL * (x+1),
+                      YSTART + FONT_PIXEL * (y+1),
+                      isForeGround ? infoSettings.marlin_mode_font_color : infoSettings.marlin_mode_bg_color);
   }
-  else{
-  GUI_FillRectColor(XSTART + BITMAP_PIXEL * x,
-                    YSTART + YOFFSET + BITMAP_PIXEL * y,
-                    XSTART + BITMAP_PIXEL * (x+1),
-                    YSTART + YOFFSET + BITMAP_PIXEL * (y+1),
-                    isForeGround ? infoSettings.marlin_mode_font_color : infoSettings.marlin_mode_bg_color);
+  else
+  {
+    GUI_FillRectColor(XSTART + BITMAP_PIXEL * x,
+                      YSTART + YOFFSET + BITMAP_PIXEL * y,
+                      XSTART + BITMAP_PIXEL * (x+1),
+                      YSTART + YOFFSET + BITMAP_PIXEL * (y+1),
+                      isForeGround ? infoSettings.marlin_mode_font_color : infoSettings.marlin_mode_bg_color);
   }
 }
 
@@ -121,12 +127,14 @@ void HD44780_DrawPixel(int16_t x, int16_t y, bool isForeGround, bool isFont)
 void HD44780_DispDDRAM(uint8_t data)
 {
   uint16_t i  = 0,
-           ex = 0,  
+           ex = 0,
            ey = 0;
-  if(data < 8){                          // 5*8 bitmap
+  if (data < 8)                          // 5*8 bitmap
+  {
     ex = HD44780.x * 6 + 6;
     ey = HD44780.y * 12 + 8;
-    for(uint16_t y = HD44780.y * 12; y < ey; y++){
+    for(uint16_t y = HD44780.y * 12; y < ey; y++)
+    {
       uint8_t temp = HD44780_CGRAM[data][i++];
       for (uint16_t x = HD44780.x * 6; x < ex; x++) {
         HD44780_DrawPixel(x, y, temp & 0x10, 0);
@@ -135,7 +143,7 @@ void HD44780_DispDDRAM(uint8_t data)
     }
   }
   else{                                   //font
-    if(data < ' ' || data > '~') return;  
+    if (data < ' ' || data > '~') return;
     ex = HD44780.x * BYTE_WIDTH + BYTE_WIDTH-1;
     ey = HD44780.y * BYTE_HEIGHT + BYTE_HEIGHT-1;
     CHAR_INFO info = {.bytes = 0};
@@ -196,7 +204,7 @@ void HD44780_ParseWCmd(uint8_t cmd)
       (*hd44780CmdCallBack[i])(cmd);
       break;
     }
-  } 
+  }
 }
 
 void HD44780_ParseWData(uint8_t data)
@@ -239,7 +247,7 @@ void HD44780_ParseRecv(uint8_t val)
   }
   else
   {
-    HD44780_ParseWData(rcvData);  
+    HD44780_ParseWData(rcvData);
   }
 }
 
diff --git a/TFT/src/User/API/UI/HD44780_Simulator.h b/TFT/src/User/API/UI/HD44780_Simulator.h
index f4f439badd..85a6874781 100644
--- a/TFT/src/User/API/UI/HD44780_Simulator.h
+++ b/TFT/src/User/API/UI/HD44780_Simulator.h
@@ -1,5 +1,4 @@
-#ifndef _HD44780_SIMULATOR_H_
-#define _HD44780_SIMULATOR_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,9 +9,9 @@ extern "C" {
 
 #define XROWS 20
 #define YROWS 4
-#define FONT_PIXEL  (MIN(LCD_WIDTH/XROWS/BYTE_WIDTH,LCD_HEIGHT/YROWS/BYTE_HEIGHT)) 
+#define FONT_PIXEL  (MIN(LCD_WIDTH/XROWS/BYTE_WIDTH,LCD_HEIGHT/YROWS/BYTE_HEIGHT))
 #define BITMAP_PIXEL (MIN(LCD_WIDTH/XROWS/6,LCD_HEIGHT/YROWS/9))
-#define XSTART ((LCD_WIDTH - FONT_PIXEL*XROWS*BYTE_WIDTH) / 2)  
+#define XSTART ((LCD_WIDTH - FONT_PIXEL*XROWS*BYTE_WIDTH) / 2)
 #define YSTART ((LCD_HEIGHT - FONT_PIXEL*YROWS*BYTE_HEIGHT) / 2)
 #define YOFFSET  (BYTE_HEIGHT*FONT_PIXEL-9*BITMAP_PIXEL)
 
@@ -176,5 +175,3 @@ void HD44780_ParseRecv(uint8_t val);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/UI/Numpad.c b/TFT/src/User/API/UI/Numpad.c
index 6a6eb53333..4f7967f767 100644
--- a/TFT/src/User/API/UI/Numpad.c
+++ b/TFT/src/User/API/UI/Numpad.c
@@ -36,7 +36,7 @@ void keyPress(u8 index, u8 ispressed)
 {
   if (index < KEY_NUM)
   {
-    if(!ispressed)
+    if (!ispressed)
       GUI_SetColor(BLACK);
     GUI_DrawRect(rect_of_numkey[index].x0+2, rect_of_numkey[index].y0+2, rect_of_numkey[index].x1-2, rect_of_numkey[index].y1-2);
     GUI_SetColor(infoSettings.font_color);
@@ -50,7 +50,8 @@ void Draw_keyboard(u8 * title, bool NumberOnly, bool negative)
 
     GUI_SetColor(infoSettings.list_border_color);
      //draw button borders
-    for (int i = 0;i<3;i++){
+    for (int i = 0;i<3;i++)
+    {
       GUI_DrawLine(rect_of_numkey[i].x1,rect_of_numkey[i].y0,rect_of_numkey[12+i].x1,rect_of_numkey[12+i].y1);
       GUI_DrawLine(rect_of_numkey[i*4].x0,rect_of_numkey[i*4].y1,rect_of_numkey[3+i*4].x1,rect_of_numkey[3+i*4].y1);
     }
@@ -62,14 +63,20 @@ void Draw_keyboard(u8 * title, bool NumberOnly, bool negative)
     GUI_SetTextMode(GUI_TEXTMODE_TRANS);
     for(uint8_t i=0 ;i<KEY_NUM ;i++)
     {
-      if( !(i == NUM_KEY_DEC || i == NUM_KEY_MINUS || i == NUM_KEY_OK || i == NUM_KEY_DEL || i == NUM_KEY_EXIT || i == NUM_KEY_RESET) )
+      if ( !(i == NUM_KEY_DEC || i == NUM_KEY_MINUS || i == NUM_KEY_OK || i == NUM_KEY_DEL || i == NUM_KEY_EXIT || i == NUM_KEY_RESET) )
+      {
         GUI_DispStringInPrect(&rect_of_numkey[i],(u8*)numPadKeyChar[i]);
+      }
     }
 
-    if(!NumberOnly)
+    if (!NumberOnly)
+    {
       GUI_DispStringInPrect(&rect_of_numkey[NUM_KEY_DEC],(u8*)numPadKeyChar[NUM_KEY_DEC]);
-    if(negative)
+    }
+    if (negative)
+    {
       GUI_DispStringInPrect(&rect_of_numkey[NUM_KEY_MINUS],(u8*)numPadKeyChar[NUM_KEY_MINUS]);
+    }
 
     DrawCharIcon(&rect_of_numkey[NUM_KEY_OK], MIDDLE, ICONCHAR_OK, false, 0);
     DrawCharIcon(&rect_of_numkey[NUM_KEY_DEL], MIDDLE, ICONCHAR_POINT_LEFT, false, 0);
@@ -146,7 +153,7 @@ float numPadFloat(u8* title, float old_val, float reset_val, bool negative)
       case NUM_KEY_0:
         if (nowIndex < FLOAT_BUFLONG - 1)
         {
-          if(ParameterBuf[0] == '0' && nowIndex == 1)
+          if (ParameterBuf[0] == '0' && nowIndex == 1)
             nowIndex = lastIndex = 0;
           ParameterBuf[nowIndex++] = numPadKeyChar[key_num][0];
           ParameterBuf[nowIndex] = 0;
diff --git a/TFT/src/User/API/UI/Numpad.h b/TFT/src/User/API/UI/Numpad.h
index ceba10f0b9..b70c22de02 100644
--- a/TFT/src/User/API/UI/Numpad.h
+++ b/TFT/src/User/API/UI/Numpad.h
@@ -1,5 +1,4 @@
-#ifndef _NUMPAD_H_
-#define _NUMPAD_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,5 +61,3 @@ int32_t numPadInt(u8* title, int32_t old_val, int32_t reset_val, bool negative);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/UI/ST7920_Simulator.c b/TFT/src/User/API/UI/ST7920_Simulator.c
index 1fb6b803b2..a49d675ac1 100644
--- a/TFT/src/User/API/UI/ST7920_Simulator.c
+++ b/TFT/src/User/API/UI/ST7920_Simulator.c
@@ -322,7 +322,7 @@ void ST7920_ST7920_ParseWData(uint8_t data)
 
 uint8_t ST7920_IsCtrlByte(uint8_t data)
 {
-  if(data == ST7920_WCMD || data == ST7920_WDATA || data == ST7920_RCMD || data == ST7920_RDATA)
+  if (data == ST7920_WCMD || data == ST7920_WDATA || data == ST7920_RCMD || data == ST7920_RDATA)
     return true;
   else
     return false;
diff --git a/TFT/src/User/API/UI/ST7920_Simulator.h b/TFT/src/User/API/UI/ST7920_Simulator.h
index 4a9d300705..2e0d10e4d7 100644
--- a/TFT/src/User/API/UI/ST7920_Simulator.h
+++ b/TFT/src/User/API/UI/ST7920_Simulator.h
@@ -1,5 +1,4 @@
-#ifndef _ST7920_SIMULATOR_H_
-#define _ST7920_SIMULATOR_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -211,5 +210,3 @@ void ST7920_ParseRecv(uint8_t val);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/UI/list_item.c b/TFT/src/User/API/UI/list_item.c
index c7705e0013..4d4aff202c 100644
--- a/TFT/src/User/API/UI/list_item.c
+++ b/TFT/src/User/API/UI/list_item.c
@@ -238,38 +238,50 @@ char * IconChar(uint8_t sel)
   return (char *)GET_ICONCHAR[sel];
 }
 
-void setDynamicLabel(uint8_t i, char *label){
+void setDynamicLabel(uint8_t i, char *label)
+{
   dynamic_label[i] = label;
 }
 
 // get dynamic text label ( i : index of the label position)
-char * getDynamicLabel(uint8_t i){
+char * getDynamicLabel(uint8_t i)
+{
   return dynamic_label[i];
 }
 
 // save dynamic text value (upto 7 characters) ( i : index of the text value position, txt: char * to the text value)
-void setDynamicTextValue(uint8_t i, char *txt){
+void setDynamicTextValue(uint8_t i, char *txt)
+{
   //dynamic_text_value[i] = txt;
   strcpy(dynamic_text_value[i],txt);
 }
 
 // get dynamic text value ( i : index of the text value position)
-char * getDynamicTextValue(uint8_t i){
+char * getDynamicTextValue(uint8_t i)
+{
   return dynamic_text_value[i];
 }
 
 // save dynamic value (upto 7 digits) ( i : index of the value position, value:float value)
-void setDynamicValue(uint8_t i,float value){
-  if(value < 1.0f)
+void setDynamicValue(uint8_t i,float value)
+{
+  if (value < 1.0f)
+  {
     sprintf(dynamic_text_value[i], "%.3f", value);
+  }
   else if (value < 1000.0f)
+  {
     sprintf(dynamic_text_value[i], "%.2f", value);
+  }
   else
+  {
     sprintf(dynamic_text_value[i], "%.1f", value);
+  }
 }
 
 // get the text starting point on screen based on rectangle edges and desired icon position
-GUI_POINT getTextStartPoint(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, ICON_POS pos, const char * textchar){
+GUI_POINT getTextStartPoint(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, ICON_POS pos, const char * textchar)
+{
 
   GUI_POINT point_item = {sx, sy};
   uint16_t w = ex- sx;
@@ -333,11 +345,11 @@ GUI_POINT getTextStartPoint(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey,
 }
 
 //draw icons in item
-void DrawCharIcon(const GUI_RECT * rect,ICON_POS iconalign, uint16_t iconindex,bool drawBgColor, uint16_t btn_color){
-
+void DrawCharIcon(const GUI_RECT * rect,ICON_POS iconalign, uint16_t iconindex,bool drawBgColor, uint16_t btn_color)
+{
       GUI_POINT icon_p = getTextStartPoint(rect->x0, rect->y0, rect->x1,rect->y1,iconalign,GET_ICONCHAR[iconindex]);
       GUI_SetColor(ICON_COLOR[iconindex]);
-      if(drawBgColor)
+      if (drawBgColor)
       {
         GUI_SetBkColor(btn_color);
         GUI_ClearPrect(rect);
@@ -348,7 +360,8 @@ void DrawCharIcon(const GUI_RECT * rect,ICON_POS iconalign, uint16_t iconindex,b
 }
 
 //draw item pressed feedback
-void DrawListItemPress(const GUI_RECT * rect, bool pressed){
+void DrawListItemPress(const GUI_RECT * rect, bool pressed)
+{
       if (pressed != false)
       {
         GUI_SetColor(WHITE);
@@ -371,8 +384,9 @@ void ListItem_Display(const GUI_RECT* rect, uint8_t position, const LISTITEM * c
   //draw navigation icons
   if (getMenuType() != MENU_TYPE_LISTVIEW) return;
 
-  if(position >= LISTITEM_PER_PAGE){
-    if(curitem->icon != ICONCHAR_BACKGROUND)
+  if (position >= LISTITEM_PER_PAGE)
+  {
+    if (curitem->icon != ICONCHAR_BACKGROUND)
     {
       if (curitem->icon != ICONCHAR_BLANK)
       {
@@ -397,14 +411,15 @@ void ListItem_Display(const GUI_RECT* rect, uint8_t position, const LISTITEM * c
       GUI_RestoreColorDefault();
   }
   //draw list tiems
-  else if (curitem->icon != ICONCHAR_BACKGROUND){
+  else if (curitem->icon != ICONCHAR_BACKGROUND)
+  {
 
     GUI_POINT pos = getTextStartPoint(rect->x0, rect->y0, rect->x1,rect->y1,LEFT_CENTER,GET_ICONCHAR[curitem->icon]);
     int textarea_width;
     switch (curitem->itemType)
     {
     case LIST_LABEL:
-      if(curitem->icon != ICONCHAR_BLANK) {
+      if (curitem->icon != ICONCHAR_BLANK) {
         DrawCharIcon(rect,LEFT_CENTER,curitem->icon, true, infoSettings.bg_color);
         pos.x += (BYTE_HEIGHT + 1);
        }
@@ -430,7 +445,7 @@ void ListItem_Display(const GUI_RECT* rect, uint8_t position, const LISTITEM * c
     case LIST_MOREBUTTON:
       GUI_ClearPrect(rect);
 
-      if(curitem->icon != ICONCHAR_BLANK) {
+      if (curitem->icon != ICONCHAR_BLANK) {
         DrawCharIcon(rect,LEFT_CENTER,curitem->icon, true, infoSettings.bg_color);
         pos.x += (BYTE_HEIGHT + 1);
        }
@@ -446,7 +461,7 @@ void ListItem_Display(const GUI_RECT* rect, uint8_t position, const LISTITEM * c
       break;
 
     case LIST_CUSTOMVALUE:
-      if(curitem->icon != ICONCHAR_BLANK) {
+      if (curitem->icon != ICONCHAR_BLANK) {
         DrawCharIcon(rect,LEFT_CENTER,curitem->icon, true, infoSettings.bg_color);
         pos.x += (BYTE_HEIGHT + 3);
       }
@@ -473,15 +488,18 @@ void ListItem_Display(const GUI_RECT* rect, uint8_t position, const LISTITEM * c
 }
 
 //draw title text of list item
-void draw_itemtitle(GUI_POINT pos,LABEL label, uint8_t position, int textarea_width){
+void draw_itemtitle(GUI_POINT pos,LABEL label, uint8_t position, int textarea_width)
+{
   if (label.index != LABEL_BACKGROUND)
   {
     int textarea_width = LISTITEM_WIDTH - (pos.x + 1); //width after removing the width for icon
     if (label.index == LABEL_DYNAMIC)
-    {GUI_DispLenString(pos.x, pos.y, (u8*)getDynamicLabel(position),textarea_width, true);
+    {
+      GUI_DispLenString(pos.x, pos.y, (u8*)getDynamicLabel(position),textarea_width, true);
     }
     else
-    {GUI_DispLenString(pos.x, pos.y, labelGetAddress(&label), textarea_width, true);
+    {
+      GUI_DispLenString(pos.x, pos.y, labelGetAddress(&label), textarea_width, true);
     }
   }
 }
diff --git a/TFT/src/User/API/UI/list_item.h b/TFT/src/User/API/UI/list_item.h
index f55ee18d52..1edcd05f93 100644
--- a/TFT/src/User/API/UI/list_item.h
+++ b/TFT/src/User/API/UI/list_item.h
@@ -1,7 +1,6 @@
 // *List View Mode ** Author: Gurmeet Athwal https://github.com/guruathwal **
 
-#ifndef _LIST_ITEM_H_
-#define _LIST_ITEM_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,5 +66,3 @@ GUI_POINT getTextStartPoint(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey,
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/UI/list_widget.h b/TFT/src/User/API/UI/list_widget.h
index f5b5cb06e7..5460626220 100644
--- a/TFT/src/User/API/UI/list_widget.h
+++ b/TFT/src/User/API/UI/list_widget.h
@@ -1,5 +1,4 @@
-#ifndef _LIST_WIDGET_H_
-#define _LIST_WIDGET_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,5 +18,3 @@ uint8_t listWidgetGetCurPage(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/UI/touch_process.c b/TFT/src/User/API/UI/touch_process.c
index dafe601af4..befa7ad3db 100644
--- a/TFT/src/User/API/UI/touch_process.c
+++ b/TFT/src/User/API/UI/touch_process.c
@@ -64,7 +64,7 @@ u8 calibrationEnsure(u16 x,u16 y)
   lcd_y = (D*tp_x+E*tp_y+F)/K;
 
 
-  if(lcd_x < x+TS_ERR_RANGE && lcd_x>x-TS_ERR_RANGE  && lcd_y > y-TS_ERR_RANGE && lcd_y<y+TS_ERR_RANGE)
+  if (lcd_x < x+TS_ERR_RANGE && lcd_x>x-TS_ERR_RANGE  && lcd_y > y-TS_ERR_RANGE && lcd_y<y+TS_ERR_RANGE)
   {
     GUI_DispStringCenter(LCD_WIDTH/2, LCD_HEIGHT-40, (int32_t)LABEL_ADJUST_OK);
     Delay_ms(1000);
@@ -134,10 +134,10 @@ u16 Key_value(u8 total_rect,const GUI_RECT* menuRect)
   TS_Get_Coordinates(&x,&y);
   for(i=0;i<total_rect;i++)
   {
-    if((x>menuRect[i].x0)&&(x<menuRect[i].x1)&&(y>menuRect[i].y0)&&(y<menuRect[i].y1))
+    if ((x>menuRect[i].x0)&&(x<menuRect[i].x1)&&(y>menuRect[i].y0)&&(y<menuRect[i].y1))
     {
       #ifdef BUZZER_PIN
-        if(touchSound == true) BUZZER_PLAY(sound_keypress);
+        if (touchSound == true) BUZZER_PLAY(sound_keypress);
       #endif
       return i;
     }
@@ -148,9 +148,9 @@ u16 Key_value(u8 total_rect,const GUI_RECT* menuRect)
 void loopTouchScreen(void) // Handle in interrupt
 {
   static u8 touch;
-  if(!XPT2046_Read_Pen())
+  if (!XPT2046_Read_Pen())
   {
-    if(touch >= 20) // 20ms
+    if (touch >= 20) // 20ms
     {
       touchScreenIsPress = true;
     }
@@ -183,11 +183,11 @@ u16 KEY_GetValue(u8 total_rect,const GUI_RECT* menuRect)
 
   if (touchScreenIsPress)
   {
-    if(firstPress)
+    if (firstPress)
     {
       key_num = Key_value(total_rect, menuRect);
       firstPress = false;
-      if(TSC_ReDrawIcon)
+      if (TSC_ReDrawIcon)
         TSC_ReDrawIcon(key_num, 1);
     }
   }
@@ -195,7 +195,7 @@ u16 KEY_GetValue(u8 total_rect,const GUI_RECT* menuRect)
   {
     if (firstPress == false )
     {
-      if(TSC_ReDrawIcon)
+      if (TSC_ReDrawIcon)
         TSC_ReDrawIcon(key_num, 0);
       key_return = key_num;
       key_num = IDLE_TOUCH;
@@ -230,7 +230,7 @@ typedef enum
 
 //  static KEY_STATUS nowStatus = NO_CLICK;    //������ǰ��״̬
 
-//  if(touchScreenIsPress)
+//  if (touchScreenIsPress)
 //  {
 //    switch(nowStatus)
 //    {
@@ -241,7 +241,7 @@ typedef enum
 //        break;
 
 //      case FIRST_CLICK:
-//        if(OS_GetTime()-first_time>KEY_LONG_PRESS_START)
+//        if (OS_GetTime()-first_time>KEY_LONG_PRESS_START)
 //        {
 //          nowStatus  = LONG_PRESS;
 //          first_key |= KEY_LONG_CLICK;
@@ -249,7 +249,7 @@ typedef enum
 //        break;
 
 //      case FIRST_RELEASE:
-//        if(first_key == Key_value(total_rect,menuRect))
+//        if (first_key == Key_value(total_rect,menuRect))
 //        {
 //          nowStatus  = SECOND_CLICK;
 //          first_key |= KEY_DOUBLE_CLICK;
@@ -261,7 +261,7 @@ typedef enum
 //        break;
 
 //      case SECOND_CLICK:
-//        if(OS_GetTime()-first_time>KEY_LONG_PRESS_START)
+//        if (OS_GetTime()-first_time>KEY_LONG_PRESS_START)
 //        {
 //          nowStatus  = LONG_PRESS;
 //          first_key |= KEY_LONG_CLICK;
@@ -269,9 +269,9 @@ typedef enum
 //        break;
 
 //      case LONG_PRESS:
-//        if(OS_GetTime()-first_time>long_press_space)
+//        if (OS_GetTime()-first_time>long_press_space)
 //        {
-//          if(long_press_space>KEY_LONG_PRESS_SPACE_MIN)
+//          if (long_press_space>KEY_LONG_PRESS_SPACE_MIN)
 //            long_press_space--;
 //          first_time=OS_GetTime();
 //          key_return = first_key;
@@ -291,7 +291,7 @@ typedef enum
 //        break;
 
 //      case FIRST_RELEASE:
-//        if(OS_GetTime()-first_time>KEY_DOUOBLE_SPACE)
+//        if (OS_GetTime()-first_time>KEY_DOUOBLE_SPACE)
 //        {
 //        nowStatus  = NO_CLICK;
 //        key_return = first_key;
@@ -323,15 +323,15 @@ u16 KNOB_GetRV(GUI_RECT *knob)
   static u16 oldx=0,oldy=0;
   static u32 mytime;
 
-  if(touchScreenIsPress && OS_GetTimeMs() > mytime)
+  if (touchScreenIsPress && OS_GetTimeMs() > mytime)
   {
     mytime = OS_GetTimeMs() + 10;
     TS_Get_Coordinates(&x,&y);
-    if(x>knob->x0&&x<knob->x1&&y>knob->y0&&y<knob->y1)
+    if (x>knob->x0&&x<knob->x1&&y>knob->y0&&y<knob->y1)
     {
-      if(x>oldx+5)
+      if (x>oldx+5)
       {
-        if(oldy>(knob->y0+knob->y1)/2)
+        if (oldy>(knob->y0+knob->y1)/2)
         {
           key_return=KNOB_DEC;
         }
@@ -340,9 +340,9 @@ u16 KNOB_GetRV(GUI_RECT *knob)
           key_return=KNOB_INC;
         }
       }
-      else if(x<oldx-5)
+      else if (x<oldx-5)
       {
-        if(oldy>(knob->y0+knob->y1)/2)
+        if (oldy>(knob->y0+knob->y1)/2)
         {
           key_return=KNOB_INC;
         }
@@ -351,9 +351,9 @@ u16 KNOB_GetRV(GUI_RECT *knob)
           key_return=KNOB_DEC;
         }
       }
-      if(y>oldy+5)
+      if (y>oldy+5)
       {
-        if(x>(knob->x0+knob->x1)/2)
+        if (x>(knob->x0+knob->x1)/2)
         {
           key_return=KNOB_INC;
         }
@@ -362,9 +362,9 @@ u16 KNOB_GetRV(GUI_RECT *knob)
           key_return=KNOB_DEC;
         }
       }
-      else if(y<oldy-5)
+      else if (y<oldy-5)
       {
-        if(x>(knob->x0+knob->x1)/2)
+        if (x>(knob->x0+knob->x1)/2)
         {
           key_return=KNOB_DEC;
         }
@@ -375,7 +375,7 @@ u16 KNOB_GetRV(GUI_RECT *knob)
       }
     }
   }
-  if(key_return != IDLE_TOUCH)
+  if (key_return != IDLE_TOUCH)
   {
     oldx=x;
     oldy=y;
diff --git a/TFT/src/User/API/UI/touch_process.h b/TFT/src/User/API/UI/touch_process.h
index e3cce31523..08f4a323fb 100644
--- a/TFT/src/User/API/UI/touch_process.h
+++ b/TFT/src/User/API/UI/touch_process.h
@@ -1,5 +1,4 @@
-#ifndef _TOUCH_PROCESS_H_
-#define _TOUCH_PROCESS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,5 +35,3 @@ extern void TS_Get_Coordinates(u16 *x, u16 *y);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/UI/ui_draw.c b/TFT/src/User/API/UI/ui_draw.c
index 9164f75368..dc52da7c37 100644
--- a/TFT/src/User/API/UI/ui_draw.c
+++ b/TFT/src/User/API/UI/ui_draw.c
@@ -72,7 +72,7 @@ bool model_DirectDisplay(GUI_POINT pos, char *gcode)
 {
   FIL  gcodeFile;
 
-  if(f_open(&gcodeFile, gcode, FA_OPEN_EXISTING | FA_READ) != FR_OK) return false;
+  if (f_open(&gcodeFile, gcode, FA_OPEN_EXISTING | FA_READ) != FR_OK) return false;
   // Move the file cursor to the corresponding resolution area
   f_lseek(&gcodeFile, MODEL_PREVIEW_OFFSET);
   // Check whether the icon size matches
@@ -103,7 +103,7 @@ bool model_DecodeToFlash(char *gcode)
   uint8_t buf[256];
   FIL  gcodeFile;
 
-  if(f_open(&gcodeFile, gcode, FA_OPEN_EXISTING | FA_READ) != FR_OK) return false;
+  if (f_open(&gcodeFile, gcode, FA_OPEN_EXISTING | FA_READ) != FR_OK) return false;
   // Move the file cursor to the corresponding resolution area
   f_lseek(&gcodeFile, MODEL_PREVIEW_OFFSET);
   // Check whether the icon size matches
@@ -127,7 +127,7 @@ bool model_DecodeToFlash(char *gcode)
       buf[bnum++]=(uint8_t)(color >> 8);
       buf[bnum++]=(uint8_t)(color & 0xFF);
 
-      if(bnum == 256)
+      if (bnum == 256)
       {
         W25Qxx_WritePage(buf,addr,256);
         addr+=256;
diff --git a/TFT/src/User/API/UI/ui_draw.h b/TFT/src/User/API/UI/ui_draw.h
index 50cc6c2e16..6831cb08a2 100644
--- a/TFT/src/User/API/UI/ui_draw.h
+++ b/TFT/src/User/API/UI/ui_draw.h
@@ -1,5 +1,4 @@
-#ifndef _UI_DRAW_H_
-#define _UI_DRAW_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,5 +37,3 @@ void ICON_PressedDisplay(u16 sx,u16 sy, u8 icon);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/Vfs/vfs.c b/TFT/src/User/API/Vfs/vfs.c
index 70b9603403..e10540a9f2 100644
--- a/TFT/src/User/API/Vfs/vfs.c
+++ b/TFT/src/User/API/Vfs/vfs.c
@@ -86,7 +86,7 @@ bool scanPrintFiles(void)
 */
 bool EnterDir(char *nextdir)
 {
-  if(strlen(infoFile.title)+strlen(nextdir)+2>=MAX_PATH_LEN) return 0;
+  if (strlen(infoFile.title)+strlen(nextdir)+2>=MAX_PATH_LEN) return 0;
   strcat(infoFile.title,"/");
   strcat(infoFile.title,nextdir);
   return 1;
@@ -115,7 +115,7 @@ static bool volumeSrcStatus[FF_VOLUMES] = {false, false};
 
 bool isVolumeExist(u8 src)
 {
-  if(src >= FF_VOLUMES) return true;
+  if (src >= FF_VOLUMES) return true;
   return volumeSrcStatus[src];
 }
 
@@ -125,7 +125,7 @@ void loopVolumeSource(void)
 {
   for (u8 i = 0; i < FF_VOLUMES; i++)
   {
-    if(volumeSrcStatus[i] != (*volumeInserted[i])())
+    if (volumeSrcStatus[i] != (*volumeInserted[i])())
     {
       const int16_t labelSDStates[FF_VOLUMES][2] = {{LABEL_TFTSD_REMOVED,  LABEL_TFTSD_INSERTED},
                                                   {LABEL_U_DISK_REMOVED, LABEL_U_DISK_INSERTED}};
diff --git a/TFT/src/User/API/Vfs/vfs.h b/TFT/src/User/API/Vfs/vfs.h
index 55e2c3767f..b7efddd155 100644
--- a/TFT/src/User/API/Vfs/vfs.h
+++ b/TFT/src/User/API/Vfs/vfs.h
@@ -1,5 +1,4 @@
-#ifndef _VFS_H_
-#define _VFS_H_
+#pragma once
 
 #include "stdint.h"
 #include "stdbool.h"
@@ -41,5 +40,3 @@ bool IsRootDir(void);
 
 bool isVolumeExist(uint8_t src);
 void loopVolumeSource(void);
-
-#endif
diff --git a/TFT/src/User/API/boot.c b/TFT/src/User/API/boot.c
index b460a97ca6..0e0e4b16ab 100644
--- a/TFT/src/User/API/boot.c
+++ b/TFT/src/User/API/boot.c
@@ -44,14 +44,14 @@ bool bmpDecode(char *bmp, u32 addr)
 
   GUI_COLOR pix;
 
-  if(f_open(&bmpFile,bmp,FA_OPEN_EXISTING | FA_READ)!=FR_OK)
+  if (f_open(&bmpFile,bmp,FA_OPEN_EXISTING | FA_READ)!=FR_OK)
   {
     bmp_stat = BMP_NOTFOUND;
     return false;
   }
   f_read(&bmpFile, magic, 2 ,&mybr);
-  if (memcmp(magic, "BM", 2)){
-    f_close(&bmpFile);
+  if (memcmp(magic, "BM", 2))
+{    f_close(&bmpFile);
     bmp_stat = BMP_INVALIDFILE;
     return false;
   }
@@ -66,14 +66,15 @@ bool bmpDecode(char *bmp, u32 addr)
   bmp_size.y = h;
   f_lseek(&bmpFile, 28);
   f_read(&bmpFile, &bpp, sizeof(short),&mybr);
-  if(bpp<24){
+  if (bpp<24)
+  {
     f_close(&bmpFile);
     bmp_stat = BMP_NOT24BIT;
     return false;
   }
   bpp >>=3;
   bytePerLine=w*bpp;
-  if(bytePerLine%4 !=0) //bmp
+  if (bytePerLine%4 !=0) //bmp
     bytePerLine=(bytePerLine/4+1)*4;
 
   for(bnum=0; bnum<(w*h*2+W25QXX_SECTOR_SIZE-1)/W25QXX_SECTOR_SIZE; bnum++)
@@ -104,7 +105,7 @@ bool bmpDecode(char *bmp, u32 addr)
       buf[bnum++]=(u8)(pix.color>>8);
       buf[bnum++]=(u8)(pix.color&0xFF);
 
-      if(bnum == 256)
+      if (bnum == 256)
       {
         W25Qxx_WritePage(buf,addr,256);
         addr+=256;
@@ -195,7 +196,7 @@ bool updateIcon(void)
     notfound++;
     dispIconFail((u8 *)(BMP_ROOT_DIR "/InfoBox.bmp"));
   }
-  if(notfound == 0)
+  if (notfound == 0)
     return true;
   else
     return false;
@@ -254,12 +255,12 @@ bool updateFont(char *font, u32 addr)
     W25Qxx_EraseSector(addr + offset);
     W25Qxx_WriteBuffer(tempbuf, addr + offset, W25QXX_SECTOR_SIZE);
     offset += rnum;
-    if(progress != offset * 100 / f_size(&myfp))
+    if (progress != offset * 100 / f_size(&myfp))
     {
       progress = offset * 100 / f_size(&myfp);
       GUI_DispDec(0 + BYTE_WIDTH*9, 140, progress, 3, RIGHT);
     }
-    if(rnum !=W25QXX_SECTOR_SIZE)break;
+    if (rnum !=W25QXX_SECTOR_SIZE)break;
   }
 
   f_close(&myfp);
@@ -334,7 +335,7 @@ void scanUpdates(void)
   uint32_t cur_flash_sign[sign_count];
   W25Qxx_ReadBuffer((uint8_t*)&cur_flash_sign, FLASH_SIGN_ADDR, sizeof(cur_flash_sign));
 
-  if(mountSDCard()) {
+  if (mountSDCard()) {
     if (f_dir_exists(FONT_ROOT_DIR))
     {
       if (updateFont(FONT_ROOT_DIR "/byte_ascii.fon", BYTE_ASCII_ADDR) &&
diff --git a/TFT/src/User/API/boot.h b/TFT/src/User/API/boot.h
index fa773d984e..9630e1d7d6 100644
--- a/TFT/src/User/API/boot.h
+++ b/TFT/src/User/API/boot.h
@@ -1,5 +1,4 @@
-#ifndef _BOOT_H_
-#define _BOOT_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -104,5 +103,3 @@ bool bmpDecode(char *bmp, u32 addr);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/config.c b/TFT/src/User/API/config.c
index 3ee5c778da..20aee173ac 100644
--- a/TFT/src/User/API/config.c
+++ b/TFT/src/User/API/config.c
@@ -89,7 +89,7 @@ bool getLangFromFile(void)
   char langpath[256];
   sprintf(langpath, "0:%s", f.fname);
 
-  if(!f_file_exists(langpath))
+  if (!f_file_exists(langpath))
     return false;
 
   char cur_line_buffer[MAX_LANG_LABEL_LENGTH + 100];
@@ -300,7 +300,9 @@ static void config_set_color(uint16_t *color_src)
 {
   if (config_is_hex()) {
     *color_src = RGB888_to_RGB565(config_hex());
-  } else if (inLimit(config_int(), 0, LCD_COLOR_COUNT-1)){
+  }
+  else if (inLimit(config_int(), 0, LCD_COLOR_COUNT-1))
+  {
     *color_src = lcd_colors[config_int()];
   }
 }
@@ -308,7 +310,8 @@ static void config_set_color(uint16_t *color_src)
 //check keywords in the config line in buffer
 void parseConfigLine(void)
 {
-  for (u16 i = 0; i < CONFIG_COUNT; i++){
+  for (u16 i = 0; i < CONFIG_COUNT; i++)
+  {
     if (key_seen(config_keywords[i]))
     {
       PRINTDEBUG("\n");
@@ -375,7 +378,8 @@ void saveConfig(void)
   #endif
 }
 
-void writeConfig(uint8_t* dataBytes, uint16_t numBytes, uint32_t addr, uint32_t maxSize){
+void writeConfig(uint8_t* dataBytes, uint16_t numBytes, uint32_t addr, uint32_t maxSize)
+{
   //do not proceed if data size is larger than reserved max size.
   if (numBytes > maxSize)
     {
@@ -386,7 +390,8 @@ void writeConfig(uint8_t* dataBytes, uint16_t numBytes, uint32_t addr, uint32_t
   int sectorCount =maxSize/W25QXX_SECTOR_SIZE;
 
   //erase part of flash to be rewritten
-  for (int i = 0; i < sectorCount;i++){
+  for (int i = 0; i < sectorCount;i++)
+  {
     W25Qxx_EraseSector(addr+(i*W25QXX_SECTOR_SIZE));
   }
   Delay_ms(100); //give time for spi flash to settle
@@ -414,10 +419,11 @@ void resetConfig(void)
   int n = 0;
   for (int i = 0; i < CUSTOM_GCODES_COUNT;i++)
   {
-    if(cg_enabled[i] == 1){
-    strcpy(tempCG.gcode[n],cg_list[i]);
-    strcpy(tempCG.name[n],cg_names[i]);
-    n++;
+    if (cg_enabled[i] == 1)
+    {
+      strcpy(tempCG.gcode[n],cg_list[i]);
+      strcpy(tempCG.name[n],cg_names[i]);
+      n++;
     }
   }
   tempCG.count = n;
@@ -450,7 +456,8 @@ void drawProgressPage(u8 * title)
   GUI_DrawPrect(&rectProgressframe);
 }
 
-void drawProgress(void){
+void drawProgress(void)
+{
   char tempstr[50];
   sprintf(tempstr,"Total keywords found: %d",foundkeys);
   GUI_DispString(pointProgressText.x,pointProgressText.y,(u8*)tempstr);
@@ -755,61 +762,97 @@ void parseConfigKey(u16 index)
 
   case C_INDEX_BUILD_MIN:
     if (key_seen("X"))
-    { if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+    {
+      if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+      {
         infoSettings.machine_size_min[X_AXIS] = config_int();
+      }
     }
     if (key_seen("Y"))
-    { if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+    {
+      if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+      {
         infoSettings.machine_size_min[Y_AXIS] = config_int();
+      }
     }
     if (key_seen("Z"))
-    { if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+    {
+      if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+      {
         infoSettings.machine_size_min[Z_AXIS] = config_int();
+      }
     }
     break;
 
   case C_INDEX_BUILD_MAX:
     if (key_seen("X"))
-    { if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+    {
+      if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+      {
         infoSettings.machine_size_max[X_AXIS] = config_int();
+      }
     }
     if (key_seen("Y"))
-    { if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+    {
+      if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+      {
         infoSettings.machine_size_max[Y_AXIS] = config_int();
+      }
     }
     if (key_seen("Z"))
-    { if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+    {
+      if (inLimit(config_int(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+      {
         infoSettings.machine_size_max[Z_AXIS] = config_int();
+      }
     }
     break;
 
   case C_INDEX_MOVE_SPEED:
     if (key_seen("S"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.axis_speed[0] = config_int();
+      }
     }
     if (key_seen("N"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.axis_speed[1] = config_int();
+      }
     }
     if (key_seen("F"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.axis_speed[2] = config_int();
+      }
     }
     break;
 
   case C_INDEX_EXT_SPEED:
     if (key_seen("S"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.ext_speed[0] = config_int();
+      }
     }
     if (key_seen("N"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.ext_speed[1] = config_int();
+      }
     }
     if (key_seen("F"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.ext_speed[2] = config_int();
+      }
     }
     break;
 
@@ -821,13 +864,17 @@ void parseConfigKey(u16 index)
     {
       u8 i = config_int();
       if (inLimit(i,0,2))
+      {
         infoSettings.onboardSD = i;
+      }
       break;
     }
 
   case C_INDEX_M27_DELAY:
     if (inLimit(config_int(), MIN_DELAY_SEC, MAX_DELAY_SEC))
+    {
       infoSettings.m27_refresh_time = config_int();
+    }
     break;
 
   case C_INDEX_M27_KEEP_ON:
@@ -838,7 +885,9 @@ void parseConfigKey(u16 index)
     {
       u8 i = config_int();
       if (inLimit(i,0,2))
+      {
         infoSettings.longFileName = i;
+      }
       break;
     }
 
@@ -848,77 +897,118 @@ void parseConfigKey(u16 index)
 
   case C_INDEX_PAUSE_RETRACT:
     if (key_seen("R"))
-    { if (inLimit(config_float(), MIN_RETRACT_LIMIT, MAX_RETRACT_LIMIT))
+    {
+      if (inLimit(config_float(), MIN_RETRACT_LIMIT, MAX_RETRACT_LIMIT))
+      {
         infoSettings.pause_retract_len = config_float();
+      }
     }
     if (key_seen("P"))
-    { if (inLimit(config_float(), MIN_RETRACT_LIMIT, MAX_RETRACT_LIMIT))
+    {
+      if (inLimit(config_float(), MIN_RETRACT_LIMIT, MAX_RETRACT_LIMIT))
+      {
         infoSettings.resume_purge_len = config_float();
+      }
     }
     break;
 
   case C_INDEX_PAUSE_POS:
     if (key_seen("X"))
-    { if (inLimit(config_float(), MIN_POS_LIMIT, MAX_SIZE_LIMIT))
+    {
+      if (inLimit(config_float(), MIN_POS_LIMIT, MAX_SIZE_LIMIT))
+      {
         infoSettings.pause_pos[X_AXIS] = config_float();
+      }
     }
     if (key_seen("Y"))
-    { if (inLimit(config_float(), MIN_POS_LIMIT, MAX_SIZE_LIMIT))
+    {
+      if (inLimit(config_float(), MIN_POS_LIMIT, MAX_SIZE_LIMIT))
+      {
         infoSettings.pause_pos[Y_AXIS] = config_float();
+      }
     }
     break;
 
   case C_INDEX_PAUSE_Z_RAISE:
     if (inLimit(config_float(), MIN_POS_LIMIT, MAX_SIZE_LIMIT))
+    {
       infoSettings.pause_z_raise = config_float();
+    }
     break;
 
   case C_INDEX_PAUSE_FEEDRATE:
     if (key_seen("X"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.pause_feedrate[0] = config_int();
+      }
     }
     if (key_seen("Y"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.pause_feedrate[1] = config_int();
+      }
     }
     if (key_seen("Z"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.pause_feedrate[2] = config_int();
+      }
     }
     if (key_seen("E"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.pause_feedrate[3] = config_int();
+      }
     }
     break;
 
   case C_INDEX_LEVEL_EDGE:
     if (inLimit(config_int(), MIN_POS_LIMIT, MAX_SIZE_LIMIT))
+    {
       infoSettings.level_edge = config_int();
+    }
     break;
 
   case C_INDEX_LEVEL_Z_POS:
     if (inLimit(config_float(), MIN_POS_LIMIT, MAX_SIZE_LIMIT))
+    { 
       infoSettings.level_z_pos = config_float();
+    }  
     break;
 
   case C_INDEX_LEVEL_Z_RAISE:
     if (inLimit(config_float(), MIN_POS_LIMIT, MAX_SIZE_LIMIT))
+    {
       infoSettings.level_z_raise = config_float();
+    }
     break;
 
   case C_INDEX_LEVEL_FEEDRATE:
     if (key_seen("X"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.level_feedrate[0] = config_int();
+      }
     }
     if (key_seen("Y"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.level_feedrate[1] = config_int();
+      }
     }
     if (key_seen("Z"))
-    { if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+    {
+      if (inLimit(config_int(), MIN_SPEED_LIMIT, MAX_SPEED_LIMIT))
+      {
         infoSettings.level_feedrate[2] = config_int();
+      }
     }
     break;
 
@@ -933,8 +1023,11 @@ void parseConfigKey(u16 index)
     strcpy(pchr, strrchr(cur_line, ':') + 1);
       int utf8len = getUTF8Length((u8*)pchr);
       int bytelen = strlen(pchr) + 1;
-      if (inLimit(utf8len,NAME_MIN_LENGTH,MAX_STRING_LENGTH) && inLimit(bytelen,NAME_MIN_LENGTH,MAX_GCODE_LENGTH))
-      strcpy(configStringsStore->preheat_name[index - C_INDEX_PREHEAT_NAME_1], pchr);
+      if (inLimit(utf8len,NAME_MIN_LENGTH,MAX_STRING_LENGTH) &&
+          inLimit(bytelen,NAME_MIN_LENGTH,MAX_GCODE_LENGTH))
+      {
+        strcpy(configStringsStore->preheat_name[index - C_INDEX_PREHEAT_NAME_1], pchr);
+      }
   }
 
     break;
@@ -948,138 +1041,186 @@ void parseConfigKey(u16 index)
     {
         int val_index = index - C_INDEX_PREHEAT_TEMP_1;
       if (key_seen("B"))
-      { if (inLimit(config_int(), MIN_BED_TEMP, MAX_BED_TEMP))
+      {
+        if (inLimit(config_int(), MIN_BED_TEMP, MAX_BED_TEMP))
+        {
           infoSettings.preheat_bed[val_index] = config_int();
+        }
       }
       if (key_seen("T"))
-      { if (inLimit(config_int(), MIN_TOOL_TEMP, MAX_TOOL_TEMP))
+      {
+        if (inLimit(config_int(), MIN_TOOL_TEMP, MAX_TOOL_TEMP))
+        {
           infoSettings.preheat_temp[val_index] = config_int();
+        }
       }
     }
     break;
 
   //---------------------------------------------------------Power Supply Settings (if connected to TFT Controller):
 
-#ifdef PS_ON_PIN
+  #ifdef PS_ON_PIN
 
-  case C_INDEX_PS_ON:
-    if (config_int() == 1)
-      infoSettings.auto_off = 1;
-    else if(config_int() == 2)
-      infoSettings.auto_off = 2;
-    else
-      infoSettings.auto_off = 0;
-    break;
+    case C_INDEX_PS_ON:
+      if (config_int() == 1)
+      {
+        infoSettings.auto_off = 1;
+      }
+      else if (config_int() == 2)
+      {
+        infoSettings.auto_off = 2;
+      }
+      else
+      {
+        infoSettings.auto_off = 0;
+      }
+      break;
 
-  case C_INDEX_PS_LOGIC:
-      infoSettings.powerloss_invert = getOnOff();
-    break;
+    case C_INDEX_PS_LOGIC:
+        infoSettings.powerloss_invert = getOnOff();
+      break;
 
-  case C_INDEX_SHUTDOWN_TEMP:
-    if (inLimit(config_int(), MIN_BED_TEMP, MAX_BED_TEMP))
-        infoSettings.auto_off_temp = config_int();
-    break;
+    case C_INDEX_SHUTDOWN_TEMP:
+      if (inLimit(config_int(), MIN_BED_TEMP, MAX_BED_TEMP))
+      {
+          infoSettings.auto_off_temp = config_int();
+      }
+      break;
 
-#endif
+  #endif
 
   //---------------------------------------------------------Power Loss Recovery & BTT UPS Settings (if connected to TFT Controller:
 
-#ifdef BTT_MINI_UPS
+  #ifdef BTT_MINI_UPS
 
-  case C_INDEX_POWERLOSS_EN:
-      infoSettings.powerloss_en = getOnOff();
-    break;
+    case C_INDEX_POWERLOSS_EN:
+        infoSettings.powerloss_en = getOnOff();
+      break;
 
-  case C_INDEX_POWERLOSS_HOME:
-      infoSettings.powerloss_home = getOnOff();
-    break;
+    case C_INDEX_POWERLOSS_HOME:
+        infoSettings.powerloss_home = getOnOff();
+      break;
 
-  case C_INDEX_POWERLOSS_ZRAISE:
-    if (inLimit(config_float(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
-          infoSettings.powerloss_z_raise = config_float();
-    break;
+    case C_INDEX_POWERLOSS_ZRAISE:
+      if (inLimit(config_float(),  MIN_SIZE_LIMIT, MAX_SIZE_LIMIT))
+      {
+        infoSettings.powerloss_z_raise = config_float();
+      }
+      break;
 
-  case C_INDEX_BTT_MINIUPS:
-      infoSettings.btt_ups = getOnOff();
-    break;
+    case C_INDEX_BTT_MINIUPS:
+        infoSettings.btt_ups = getOnOff();
+      break;
 
-#endif
+  #endif
 
   //---------------------------------------------------------Filament Runout Settings (if connected to TFT Controller):
 
-#ifdef FIL_RUNOUT_PIN
-  case C_INDEX_RUNOUT:
-      infoSettings.runout = getOnOff();
-    break;
+  #ifdef FIL_RUNOUT_PIN
+    case C_INDEX_RUNOUT:
+        infoSettings.runout = getOnOff();
+      break;
 
-  case C_INDEX_RUNOUT_LOGIC:
-      infoSettings.runout_invert = getOnOff();
-    break;
+    case C_INDEX_RUNOUT_LOGIC:
+        infoSettings.runout_invert = getOnOff();
+      break;
 
-  case C_INDEX_RUNOUT_NOISE:
-    if (inLimit(config_int(), MIN_DELAY_MS, MAX_DELAY_MS))
-          infoSettings.runout_noise_ms = config_int();
-    break;
+    case C_INDEX_RUNOUT_NOISE:
+      if (inLimit(config_int(), MIN_DELAY_MS, MAX_DELAY_MS))
+      {
+        infoSettings.runout_noise_ms = config_int();
+      }
+      break;
+
+    case C_INDEX_RUNOUT_DISTANCE:
+      if (inLimit(config_int(), MIN_RUNOUT_DISTANCE, MAX_RUNOUT_DISTANCE))
+      {
+            infoSettings.runout_distance = config_int();
+      }
+      break;
+  #endif
 
-  case C_INDEX_RUNOUT_DISTANCE:
-    if (inLimit(config_int(), MIN_RUNOUT_DISTANCE, MAX_RUNOUT_DISTANCE))
-          infoSettings.runout_distance = config_int();
-    break;
-#endif
   //---------------------------------------------------------other device specific settings
-#ifdef BUZZER_PIN
-  case C_INDEX_TOUCH_SOUND:
-    if (inLimit(config_int(),0,1))
+  #ifdef BUZZER_PIN
+    case C_INDEX_TOUCH_SOUND:
+      if (inLimit(config_int(),0,1))
       {
         infoSettings.touchSound = config_int();
       }
-    break;
+      break;
 
-  case C_INDEX_TOAST_SOUND:
-    if (inLimit(config_int(),0,1))
+    case C_INDEX_TOAST_SOUND:
+      if (inLimit(config_int(),0,1))
       {
         infoSettings.toastSound = config_int();
       }
-    break;
+      break;
 
-  case C_INDEX_ALERT_SOUND:
-    if (inLimit(config_int(),0,1))
+    case C_INDEX_ALERT_SOUND:
+      if (inLimit(config_int(),0,1))
       {
         infoSettings.alertSound = config_int();
       }
-    break;
-#endif
+      break;
 
-#ifdef LED_COLOR_PIN
-  case C_INDEX_KNOB_COLOR:
-    if (inLimit(config_int(), 0, LED_COLOR_NUM-1))
-      infoSettings.knob_led_color = config_int();
-    break;
+    case C_INDEX_PREHEATDONE_SOUND:
+      if (inLimit(config_int(),0,1))
+      {
+        infoSettings.preheatDoneSound = config_int();
+      }
+
+  #endif
+
+  #ifdef LED_COLOR_PIN
+    case C_INDEX_KNOB_COLOR:
+      if (inLimit(config_int(), 0, LED_COLOR_NUM-1))
+      {
+        infoSettings.knob_led_color = config_int();
+      }
+      break;
+
+    #ifdef LCD_LED_PWM_CHANNEL
+      case C_INDEX_KNOB_LED_IDLE:
+        if (inLimit(config_int(), 0, 1))
+        {
+          infoSettings.knob_led_idle = config_int();
+        }
+        break;
+    #endif //lcd_led_pwm
+  #endif
+
+  #ifdef LCD_LED_PWM_CHANNEL
+    case C_INDEX_BRIGHTNESS:
+      if (inLimit(config_int(), 0, ITEM_BRIGHTNESS_NUM - 1))
+      {
+        infoSettings.lcd_brightness = config_int();
+      }
+      if (infoSettings.lcd_brightness == 0)
+      {
+        infoSettings.lcd_brightness = 1; //If someone set it to 0 set it to 1
+      }
+      break;
+    case C_INDEX_BRIGHTNESS_IDLE:
+      if (inLimit(config_int(), 0, ITEM_BRIGHTNESS_NUM-1))
+      {
+        infoSettings.lcd_idle_brightness = config_int();
+      }
+      break;
+    case C_INDEX_BRIGHTNESS_IDLE_DELAY:
+      if (inLimit(config_int(), 0, ITEM_SECONDS_NUM-1))
+      {
+        infoSettings.lcd_idle_timer = config_int();
+      }
+      break;
+  #endif
 
-#ifdef LCD_LED_PWM_CHANNEL
-  case C_INDEX_KNOB_LED_IDLE:
+  case C_INDEX_EVENT_LED_MODE:
     if (inLimit(config_int(), 0, 1))
-      infoSettings.knob_led_idle = config_int();
+    {
+      infoSettings.event_led_mode = config_int();
+    }
     break;
-#endif //lcd_led_pwm
-#endif
 
-#ifdef LCD_LED_PWM_CHANNEL
-  case C_INDEX_BRIGHTNESS:
-    if (inLimit(config_int(), 0, ITEM_BRIGHTNESS_NUM - 1))
-      infoSettings.lcd_brightness = config_int();
-    if (infoSettings.lcd_brightness == 0)
-      infoSettings.lcd_brightness = 1; //If someone set it to 0 set it to 1
-    break;
-  case C_INDEX_BRIGHTNESS_IDLE:
-    if (inLimit(config_int(), 0, ITEM_BRIGHTNESS_NUM-1))
-      infoSettings.lcd_idle_brightness = config_int();
-    break;
-  case C_INDEX_BRIGHTNESS_IDLE_DELAY:
-    if (inLimit(config_int(), 0, ITEM_SECONDS_NUM-1))
-      infoSettings.lcd_idle_timer = config_int();
-    break;
-#endif
   //---------------------------------------------------------CustomG-Code Commands upto 15 custom G-code
   case C_INDEX_CUSTOM_LABEL_1:
   case C_INDEX_CUSTOM_LABEL_2:
@@ -1110,8 +1251,7 @@ void parseConfigKey(u16 index)
       {
         customcode_good[index - C_INDEX_CUSTOM_LABEL_1] = 0;//set name was not ok
       }
-    break;
-    }
+    }break;
   case C_INDEX_CUSTOM_GCODE_1:
   case C_INDEX_CUSTOM_GCODE_2:
   case C_INDEX_CUSTOM_GCODE_3:
@@ -1133,26 +1273,25 @@ void parseConfigKey(u16 index)
       strcpy(pchr,strrchr(cur_line,':') + 1);
       int len = strlen(pchr) + 1;
       if (inLimit(len,GCODE_MIN_LENGTH,MAX_GCODE_LENGTH) && (customcode_good[fileindex] == 1)) //check if gcode length is ok and the name was ok
-        {
-          strcpy(configCustomGcodes->gcode[customcode_index-1], pchr);
-        }
+      {
+        strcpy(configCustomGcodes->gcode[customcode_index-1], pchr);
+      }
       else if (customcode_good[fileindex] == 1) //if name was ok but gcode is not ok then reduce count
-        {
-          customcode_index--;
-        }
-    break;
-    }
+      {
+        customcode_index--;
+      }
+    }break;
   //---------------------------------------------------------Start, End & Cancel G-codes
   case C_INDEX_START_GCODE_ON:
-        infoSettings.send_start_gcode = getOnOff();
+    infoSettings.send_start_gcode = getOnOff();
     break;
 
   case C_INDEX_END_GCODE_ON:
-        infoSettings.send_end_gcode = getOnOff();
+    infoSettings.send_end_gcode = getOnOff();
     break;
 
   case C_INDEX_CANCEL_GCODE_ON:
-        infoSettings.send_cancel_gcode = getOnOff();
+    infoSettings.send_cancel_gcode = getOnOff();
     break;
 
   case C_INDEX_START_GCODE:
@@ -1163,12 +1302,12 @@ void parseConfigKey(u16 index)
       if (inLimit(len,GCODE_MIN_LENGTH,MAX_GCODE_LENGTH))
       {
         strcpy(configPrintGcodes->start_gcode, pchr);
-      #ifdef CONFIG_DEBUG
-        GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, (u8*)configPrintGcodes->start_gcode);
-        Delay_ms(1000);
-        Delay_ms(1000);
+        #ifdef CONFIG_DEBUG
+          GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, (u8*)configPrintGcodes->start_gcode);
+          Delay_ms(1000);
+          Delay_ms(1000);
 
-      #endif
+        #endif
       }
 
     }
@@ -1181,11 +1320,11 @@ void parseConfigKey(u16 index)
       if (inLimit(len,GCODE_MIN_LENGTH,MAX_GCODE_LENGTH))
       {
         strcpy(configPrintGcodes->end_gcode, pchr);
-      #ifdef CONFIG_DEBUG
-        GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, (u8*)configPrintGcodes->end_gcode);
-        Delay_ms(1000);
-        Delay_ms(1000);
-      #endif
+        #ifdef CONFIG_DEBUG
+          GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, (u8*)configPrintGcodes->end_gcode);
+          Delay_ms(1000);
+          Delay_ms(1000);
+        #endif
       }
 
     }
@@ -1198,11 +1337,11 @@ void parseConfigKey(u16 index)
       if (inLimit(len,GCODE_MIN_LENGTH,MAX_GCODE_LENGTH))
       {
         strcpy(configPrintGcodes->cancel_gcode, pchr);
-      #ifdef CONFIG_DEBUG
-        GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, (u8*)configPrintGcodes->cancel_gcode);
-        Delay_ms(1000);
-        Delay_ms(1000);
-      #endif
+        #ifdef CONFIG_DEBUG
+          GUI_DispStringInRect(recterrortxt.x0, recterrortxt.y0 + (BYTE_HEIGHT * 2), recterrortxt.x1, recterrortxt.y1, (u8*)configPrintGcodes->cancel_gcode);
+          Delay_ms(1000);
+          Delay_ms(1000);
+        #endif
       }
 
     }
diff --git a/TFT/src/User/API/config.h b/TFT/src/User/API/config.h
index f3a99310ac..7b8c95a033 100644
--- a/TFT/src/User/API/config.h
+++ b/TFT/src/User/API/config.h
@@ -1,5 +1,4 @@
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -104,11 +103,14 @@ extern "C" {
 #define CONFIG_TOUCH_SOUND             "touch_sound:"
 #define CONFIG_TOAST_SOUND             "toast_sound:"
 #define CONFIG_ALERT_SOUND             "alert_sound:"
+#define CONFIG_PREHEATDONE_SOUND       "preheatdone_sound:"
 #define CONFIG_KNOB_COLOR              "knob_led_color:"
 #define CONFIG_KNOB_LED_IDLE           "knob_led_idle:"
 #define CONFIG_BRIGHTNESS              "lcd_brightness:"
 #define CONFIG_BRIGHTNESS_IDLE         "lcd_idle_brightness:"
 #define CONFIG_BRIGHTNESS_IDLE_DELAY   "lcd_idle_delay:"
+#define CONFIG_EVENT_LED_MODE         "event_led_mode:"
+
 //-----------------------------Custom G-Code Commands (up to 15 custom G-code)
 #define CONFIG_CUSTOM_LABEL_1   "custom_label_1:"
 #define CONFIG_CUSTOM_LABEL_2   "custom_label_2:"
@@ -226,4 +228,3 @@ enum
 }
 #endif
 
-#endif
diff --git a/TFT/src/User/API/config.inc b/TFT/src/User/API/config.inc
index a09a6b7889..099d346fa8 100644
--- a/TFT/src/User/API/config.inc
+++ b/TFT/src/User/API/config.inc
@@ -93,11 +93,13 @@ X_CONFIG(RUNOUT_DISTANCE)
 X_CONFIG(TOUCH_SOUND)
 X_CONFIG(TOAST_SOUND)
 X_CONFIG(ALERT_SOUND)
+X_CONFIG(PREHEATDONE_SOUND)
 X_CONFIG(KNOB_COLOR)
 X_CONFIG(KNOB_LED_IDLE)
 X_CONFIG(BRIGHTNESS)
 X_CONFIG(BRIGHTNESS_IDLE)
 X_CONFIG(BRIGHTNESS_IDLE_DELAY)
+X_CONFIG(EVENT_LED_MODE)
 //-----------------------------CustomG-Code Commands upto 15 custom G-code
 X_CONFIG(CUSTOM_LABEL_1)
 X_CONFIG(CUSTOM_LABEL_2)
diff --git a/TFT/src/User/API/coordinate.c b/TFT/src/User/API/coordinate.c
index 639e66256e..e05d10c09c 100644
--- a/TFT/src/User/API/coordinate.c
+++ b/TFT/src/User/API/coordinate.c
@@ -52,7 +52,7 @@ void coordinateSetAxisTarget(AXIS axis,float position)
           ? relative_e || relative_mode
           : relative_mode;
 
-  if(r==false)
+  if (r==false)
   {
     targetPosition.axis[axis] = position;
   }
diff --git a/TFT/src/User/API/coordinate.h b/TFT/src/User/API/coordinate.h
index a89a382e4c..0ce144ef3d 100644
--- a/TFT/src/User/API/coordinate.h
+++ b/TFT/src/User/API/coordinate.h
@@ -1,5 +1,4 @@
-#ifndef _COORDINATE_H_
-#define _COORDINATE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,5 +46,3 @@ void coordinateQuery(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/event_led_mode.c b/TFT/src/User/API/event_led_mode.c
new file mode 100644
index 0000000000..e717161b67
--- /dev/null
+++ b/TFT/src/User/API/event_led_mode.c
@@ -0,0 +1,240 @@
+#include "event_led_mode.h"
+#include "includes.h"
+
+#define MAXCOLD_TEMP 50
+#define DEFAULT_COLDTEMP 25
+
+uint8_t prevPixelColor = 0;
+uint8_t waitForNext = 0;
+bool heatingDone = false;
+bool finishedPrint = false;
+#ifdef LED_COLOR_PIN
+  #ifdef LCD_LED_PWM_CHANNEL
+    bool idle_ledmode_previous = false;
+  #endif
+#endif
+uint16_t coldTemperature = 0;
+
+void setEventLedModeColor (void)
+{
+  if (waitForNext > 0)
+  {
+    waitForNext--;
+    return;
+  }
+  // Set the waitForNext to a certain number to prevent that this function is
+  // executes a lot
+  // This means that after 'X' cycles it will be back in this function
+  waitForNext = 200;
+
+  // Let's estimate the room temperature
+  if (coldTemperature == 0)
+  {
+    uint16_t hotendCurrentTemp = heatGetCurrentTemp(0);
+    uint16_t bedCurrentTemp    = heatGetCurrentTemp(BED);
+    uint8_t divider = 0;
+    if (hotendCurrentTemp < MAXCOLD_TEMP)
+    {
+      coldTemperature = hotendCurrentTemp;
+      divider++;
+    }
+    if (bedCurrentTemp < MAXCOLD_TEMP)
+    {
+      coldTemperature = bedCurrentTemp;
+      divider++;
+    }
+    if (coldTemperature == 0)
+    {
+      coldTemperature = DEFAULT_COLDTEMP;
+    }
+    else
+    {
+      coldTemperature = coldTemperature / divider;
+    }
+  }
+
+  if (!isPrinting())
+  {
+    // Not printing/
+    // Check if the previous color has been set.
+    // If not, return to reduce cycletime
+    if (prevPixelColor == 0) return;
+
+    // There was a previous color.
+    // Set every led to the correct color.
+
+    // Reset flag heating done
+    heatingDone = false;
+
+    if (infoMenu.menu[infoMenu.cur] != menuPrinting)
+    {
+      #ifdef LED_COLOR_PIN
+        #ifdef LCD_LED_PWM_CHANNEL
+          // Make sure that the knob_led_idle is back in business
+          if (idle_ledmode_previous)
+          {
+            idle_ledmode_previous = false;
+            infoSettings.knob_led_idle = 1;
+          }
+        #endif
+      #endif
+
+      // Restore colors to default value
+      prevPixelColor = 0;
+
+      // Reset print fineshed bool
+      finishedPrint = false;
+
+      // Turn off neopixels and set knob led back to default
+      storeCmd("M150 R0 U0 B0 P0\n");
+
+      #ifdef LED_COLOR_PIN
+        #ifdef LCD_LED_PWM_CHANNEL
+          // set the screen to the max brightness
+          // The encoder knob will get it's default color.
+          lcd_dim.dimmed = true; // Force dimmed mode
+          wakeLCD();
+        #endif
+      #endif
+      return;
+    }
+
+  
+    if (finishedPrint)
+    {
+      // Check if print is already marked as ready.
+      // No need to change the LED's  again
+      return;
+    }
+
+    #ifdef LED_COLOR_PIN
+      #ifdef LCD_LED_PWM_CHANNEL
+      // set the knob_led_idle temperorly to OFF
+      if (infoSettings.knob_led_idle && !idle_ledmode_previous)
+      {
+        idle_ledmode_previous = true;
+        infoSettings.knob_led_idle = 0; //Temperory turn off led idle
+      }
+      #endif
+    #endif
+
+    // Set neopixel and ledknob to green
+    storeCmd("M150 R0 U255 B0 P255\n");
+
+    #ifdef LED_COLOR_PIN
+      WS2812_Send_DAT(LED_GREEN);
+    #endif
+
+    finishedPrint = true;
+    return;
+  }
+  else
+  {
+
+    if (heatingDone)
+    {
+      return; // Go back when preheating is finished
+    }
+
+    // Store current target temperature values to reduce cycle time
+    uint16_t hotendTargetTemp = heatGetTargetTemp(0);
+    uint16_t bedTargetTemp = heatGetTargetTemp(BED);
+
+    if (hotendTargetTemp == 0 && bedTargetTemp == 0)
+    {
+      return; //No temperature set "yet". Do nothing.
+    }
+
+    #ifdef LED_COLOR_PIN
+      #ifdef LCD_LED_PWM_CHANNEL
+        // set the knob_led_idle temperorly to OFF
+        if (infoSettings.knob_led_idle && !idle_ledmode_previous)
+        {
+          idle_ledmode_previous = true;
+          infoSettings.knob_led_idle = 0; //Temperory turn off led idle
+        }
+      #endif
+    #endif
+
+    // Store current temperature values to reduce cycle time
+    uint16_t hotendCurrentTemp = heatGetCurrentTemp(0);
+    uint16_t bedCurrentTemp = heatGetCurrentTemp(BED);
+
+    // Check if the temperature already reached it's target temperature
+    if (hotendTargetTemp > 0 && bedTargetTemp > 0 &&
+        hotendCurrentTemp >= hotendTargetTemp - 5 &&
+        bedCurrentTemp >= bedTargetTemp - 5)
+    {
+      // Bed and hotend are on temperature. Set neopixel to white
+      storeCmd("M150 R255 U255 B255 P255\n");
+
+      // Restore the encoder to the previous state
+      #ifdef LED_COLOR_PIN
+        #ifdef LCD_LED_PWM_CHANNEL
+          // Set the knob_led_idle on again
+          if (idle_ledmode_previous)
+          {
+            idle_ledmode_previous = false;
+            infoSettings.knob_led_idle = 1;
+          }
+        #endif
+      #endif
+
+      // set the screen to the max brightness
+      // The encoder knob will get it's default color.
+      wakeLCD();
+
+      // Set the flag heating done to true
+      heatingDone = true;
+      return;
+    }
+
+    uint8_t newLedValue = 0;
+    if (hotendTargetTemp > 0 && bedTargetTemp > 0 &&
+        bedCurrentTemp >= bedTargetTemp - 5)
+    {
+      // Only use total temperature when hotend and bed heat up at the same time
+      uint16_t totalTemperature = hotendTargetTemp + bedTargetTemp;
+      newLedValue = map(hotendCurrentTemp + bedCurrentTemp, coldTemperature, totalTemperature, 0, 255);
+    }
+    else
+    {
+      if (hotendTargetTemp == 0)
+      {
+        newLedValue = map(bedCurrentTemp, coldTemperature, bedTargetTemp, 0, 125);
+      }
+      else
+      {
+        newLedValue = map(hotendCurrentTemp, coldTemperature, hotendTargetTemp, 125, 255);
+      }
+    }
+
+    if (!(newLedValue > prevPixelColor))
+    {
+      // Previous led value is the same as the current one.
+      // Rest of the code is not needed to execute.
+      return;
+    }
+
+    // Set the neopixel color
+    storeCmd("M150 R%i U0 B%i P255\n", newLedValue, 255 - newLedValue);
+
+    #ifdef LED_COLOR_PIN
+      uint32_t newPixelColor = 0;
+      newPixelColor |= (uint32_t)(newLedValue) << 8;
+      newPixelColor |= (uint32_t)(255 - newLedValue);
+
+      //WEG
+      //char tempstr[60];
+      //sprintf(tempstr, "NEW %i | R:%i B:%i | LV: %i", newPixelColor, colorRed, colorBlue, newLedValue);
+      //GUI_DispString(100, 0, (u8 *)tempstr);
+      //END WEG
+
+      // Color the Knob led when available
+      WS2812_Send_DAT(newPixelColor);
+    #endif
+
+    prevPixelColor = newLedValue;
+    return;
+  }
+}
diff --git a/TFT/src/User/API/event_led_mode.h b/TFT/src/User/API/event_led_mode.h
new file mode 100644
index 0000000000..3ef6694e66
--- /dev/null
+++ b/TFT/src/User/API/event_led_mode.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void setEventLedModeColor (void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/TFT/src/User/API/extend.c b/TFT/src/User/API/extend.c
index 0e9d57fbba..4380e55b96 100644
--- a/TFT/src/User/API/extend.c
+++ b/TFT/src/User/API/extend.c
@@ -132,10 +132,10 @@ bool FIL_SmartRunoutDetect(void)
 
   do
   {  /* Send M114 E query extrude position continuously	*/
-    if(update_waiting == true)        {nextTime=OS_GetTimeMs()+update_time;break;}
-    if(OS_GetTimeMs()<nextTime)       break;
-    if(requestCommandInfoIsRunning()) break; //to avoid colision in Gcode response processing
-    if(storeCmd("M114 E\n")==false)   break;
+    if (update_waiting == true)        {nextTime=OS_GetTimeMs()+update_time;break;}
+    if (OS_GetTimeMs()<nextTime)       break;
+    if (requestCommandInfoIsRunning()) break; //to avoid colision in Gcode response processing
+    if (storeCmd("M114 E\n")==false)   break;
 
     nextTime=OS_GetTimeMs()+update_time;
     update_waiting=true;
diff --git a/TFT/src/User/API/extend.h b/TFT/src/User/API/extend.h
index 7ed228b0db..c92a438cd7 100644
--- a/TFT/src/User/API/extend.h
+++ b/TFT/src/User/API/extend.h
@@ -1,5 +1,4 @@
-#ifndef _EXTEND_H_
-#define _EXTEND_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,5 +24,3 @@ void loopFrontEndFILRunoutDetect(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/flashStore.c b/TFT/src/User/API/flashStore.c
index ee93463721..e23f4aa193 100644
--- a/TFT/src/User/API/flashStore.c
+++ b/TFT/src/User/API/flashStore.c
@@ -2,7 +2,7 @@
 #include "STM32_Flash.h"
 
 #define TSC_SIGN  0x20200512 // DO NOT MODIFY
-#define PARA_SIGN 0x20201021 // (YYYYMMDD) If a new setting parameter is added,
+#define PARA_SIGN 0x20201102 // (YYYYMMDD) If a new setting parameter is added,
                              // modify here and initialize the initial value
                              // in the "infoSettingsReset()" function
 
@@ -49,7 +49,7 @@ void readStoredPara(void)
   STM32_FlashRead(data, PARA_SIZE);
 
   sign = byteToWord(data + (index += 4), 4);
-  if(sign == TSC_SIGN)
+  if (sign == TSC_SIGN)
   {
     paraStatus |= PARA_TSC_EXIST;    // If the touch screen calibration parameter already exists
     for(int i=0; i<sizeof(TSC_Para)/sizeof(TSC_Para[0]); i++)
@@ -64,7 +64,7 @@ void readStoredPara(void)
   }
 
   sign = byteToWord(data + (index += 4), 4);
-  if(sign != PARA_SIGN) // If the settings parameter is illegal, reset settings parameter
+  if (sign != PARA_SIGN) // If the settings parameter is illegal, reset settings parameter
   {
     paraStatus |= PARA_WAS_RESTORED;
     infoSettingsReset();
@@ -90,6 +90,7 @@ void readStoredPara(void)
   infoSettings.touchSound           = byteToWord(data + (index += 4), 4);
   infoSettings.toastSound           = byteToWord(data + (index += 4), 4);
   infoSettings.alertSound           = byteToWord(data + (index += 4), 4);
+  infoSettings.preheatDoneSound     = byteToWord(data + (index += 4), 4);
 
   infoSettings.terminalACK          = byteToWord(data + (index += 4), 4);
   infoSettings.move_speed           = byteToWord(data + (index += 4), 4);
@@ -103,6 +104,8 @@ void readStoredPara(void)
   infoSettings.lcd_idle_brightness  = byteToWord(data + (index += 4), 4);
   infoSettings.lcd_idle_timer       = byteToWord(data + (index += 4), 4);
 
+  infoSettings.event_led_mode      = byteToWord(data + (index += 4), 4);
+
   infoSettings.serial_alwaysOn            = byteToWord(data + (index += 4), 4);
   infoSettings.marlin_mode_bg_color       = byteToWord(data + (index += 4), 4);
   infoSettings.marlin_mode_font_color     = byteToWord(data + (index += 4), 4);
@@ -228,6 +231,7 @@ void storePara(void)
   wordToByte(infoSettings.touchSound,                 data + (index += 4));
   wordToByte(infoSettings.toastSound,                 data + (index += 4));
   wordToByte(infoSettings.alertSound,                 data + (index += 4));
+  wordToByte(infoSettings.preheatDoneSound,           data + (index += 4));
 
   wordToByte(infoSettings.terminalACK,                data + (index += 4));
   wordToByte(infoSettings.move_speed,                 data + (index += 4));
@@ -241,6 +245,8 @@ void storePara(void)
   wordToByte(infoSettings.lcd_idle_brightness,        data + (index += 4));
   wordToByte(infoSettings.lcd_idle_timer,             data + (index += 4));
 
+  wordToByte(infoSettings.event_led_mode,            data + (index += 4));
+
   wordToByte(infoSettings.serial_alwaysOn,            data + (index += 4));
   wordToByte(infoSettings.marlin_mode_bg_color,       data + (index += 4));
   wordToByte(infoSettings.marlin_mode_font_color,     data + (index += 4));
diff --git a/TFT/src/User/API/flashStore.h b/TFT/src/User/API/flashStore.h
index 7471b3d03c..c9f49982f4 100644
--- a/TFT/src/User/API/flashStore.h
+++ b/TFT/src/User/API/flashStore.h
@@ -1,5 +1,4 @@
-#ifndef _FLASHSTORE_H_
-#define _FLASHSTORE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,5 +18,3 @@ bool readIsRestored(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/interfaceCmd.c b/TFT/src/User/API/interfaceCmd.c
index d9207a7217..1c5ceaf48b 100644
--- a/TFT/src/User/API/interfaceCmd.c
+++ b/TFT/src/User/API/interfaceCmd.c
@@ -14,7 +14,7 @@ static bool cmd_seen(char code)
 {
   for(cmd_index = 0; infoCmd.queue[infoCmd.index_r].gcode[cmd_index] != 0 && cmd_index < CMD_MAX_CHAR; cmd_index++)
   {
-    if(infoCmd.queue[infoCmd.index_r].gcode[cmd_index] == code)
+    if (infoCmd.queue[infoCmd.index_r].gcode[cmd_index] == code)
     {
       cmd_index += 1;
       return true;
@@ -83,7 +83,7 @@ void mustStoreCmd(const char * format,...)
 
   GCODE_QUEUE *pQueue = &infoCmd;
 
-  if(pQueue->count >= CMD_MAX_LIST) reminderMessage(LABEL_BUSY, STATUS_BUSY);
+  if (pQueue->count >= CMD_MAX_LIST) reminderMessage(LABEL_BUSY, STATUS_BUSY);
 
   while (pQueue->count >= CMD_MAX_LIST)
   {
@@ -154,7 +154,7 @@ void mustStoreCacheCmd(const char * format,...)
 {
   GCODE_QUEUE *pQueue = &infoCacheCmd;
 
-  if(pQueue->count == CMD_MAX_LIST) reminderMessage(LABEL_BUSY, STATUS_BUSY);
+  if (pQueue->count == CMD_MAX_LIST) reminderMessage(LABEL_BUSY, STATUS_BUSY);
 
   while (pQueue->count >= CMD_MAX_LIST)
   {
@@ -170,8 +170,8 @@ void mustStoreCacheCmd(const char * format,...)
 // Move gcode cmd from infoCacheCmd to infoCmd queue.
 bool moveCacheToCmd(void)
 {
-  if(infoCmd.count >= CMD_MAX_LIST) return false;
-  if(infoCacheCmd.count == 0) return false;
+  if (infoCmd.count >= CMD_MAX_LIST) return false;
+  if (infoCacheCmd.count == 0) return false;
 
   storeCmd("%s", infoCacheCmd.queue[infoCacheCmd.index_r].gcode);
   infoCacheCmd.count--;
@@ -197,8 +197,8 @@ void purgeLastCmd(void)
 // Parse and send gcode cmd in infoCmd.
 void sendQueueCmd(void)
 {
-  if(infoHost.wait == true)    return;
-  if(infoCmd.count == 0)       return;
+  if (infoHost.wait == true)    return;
+  if (infoCmd.count == 0)       return;
 
   bool avoid_terminal = false;
   u16  cmd=0;
@@ -255,7 +255,7 @@ void sendQueueCmd(void)
           if (!fromTFT)
           {
             if (startsWith("M20 SD:", infoCmd.queue[infoCmd.index_r].gcode) ||startsWith("M20 U:", infoCmd.queue[infoCmd.index_r].gcode))   {
-            if(startsWith("M20 SD:", infoCmd.queue[infoCmd.index_r].gcode)) infoFile.source = TFT_SD;
+            if (startsWith("M20 SD:", infoCmd.queue[infoCmd.index_r].gcode)) infoFile.source = TFT_SD;
             else infoFile.source = TFT_UDISK;
             strncpy(infoFile.title, &infoCmd.queue[infoCmd.index_r].gcode[cmd_index + 4], MAX_PATH_LEN);
             // strip out any checksum that might be in the string
@@ -268,7 +268,8 @@ void sendQueueCmd(void)
                 }
               }
             Serial_Puts(SERIAL_PORT_2, "Begin file list\n");
-            if (mountFS() == true && scanPrintFiles() == true){
+            if (mountFS() == true && scanPrintFiles() == true)
+            {
               for (uint16_t i = 0; i < infoFile.f_num; i++) {
                 Serial_Puts(SERIAL_PORT_2,infoFile.file[i]);
                 Serial_Puts(SERIAL_PORT_2,"\n");
@@ -291,7 +292,7 @@ void sendQueueCmd(void)
           {
             if (startsWith("M23 SD:", infoCmd.queue[infoCmd.index_r].gcode) || startsWith("M23 U:", infoCmd.queue[infoCmd.index_r].gcode))
             {
-              if(startsWith("M23 SD:", infoCmd.queue[infoCmd.index_r].gcode))
+              if (startsWith("M23 SD:", infoCmd.queue[infoCmd.index_r].gcode))
                 infoFile.source = TFT_SD;
               else
                 infoFile.source = TFT_UDISK;
@@ -372,17 +373,18 @@ void sendQueueCmd(void)
           {
             if (isPrinting() && !infoHost.printing)
             {
-              if (cmd_seen('C')){
+              if (cmd_seen('C'))
+              {
                 Serial_Puts(SERIAL_PORT_2, "Current file: ");
                 Serial_Puts(SERIAL_PORT_2, infoFile.title);
                 Serial_Puts(SERIAL_PORT_2, ".\n");
               }
-                char buf[55];
-                sprintf(buf, "%s printing byte %d/%d\n",(infoFile.source==TFT_SD)?"TFT SD":"TFT USB", getPrintCur(),getPrintSize());
-                Serial_Puts(SERIAL_PORT_2, buf);
-                Serial_Puts(SERIAL_PORT_2, "ok\n");
-                purgeLastCmd();
-                return;
+              char buf[55];
+              sprintf(buf, "%s printing byte %d/%d\n",(infoFile.source==TFT_SD)?"TFT SD":"TFT USB", getPrintCur(),getPrintSize());
+              Serial_Puts(SERIAL_PORT_2, buf);
+              Serial_Puts(SERIAL_PORT_2, "ok\n");
+              purgeLastCmd();
+              return;
             }
           }
           else
@@ -409,7 +411,7 @@ void sendQueueCmd(void)
           {
             if (startsWith("M30 SD:", infoCmd.queue[infoCmd.index_r].gcode) || startsWith("M30 U:", infoCmd.queue[infoCmd.index_r].gcode))
             {
-              if(startsWith("M30 SD:", infoCmd.queue[infoCmd.index_r].gcode)) infoFile.source = TFT_SD;
+              if (startsWith("M30 SD:", infoCmd.queue[infoCmd.index_r].gcode)) infoFile.source = TFT_SD;
               else infoFile.source = TFT_UDISK;
               TCHAR filepath[MAX_PATH_LEN];
               strncpy(filepath, &infoCmd.queue[infoCmd.index_r].gcode[cmd_index + 4], MAX_PATH_LEN);
@@ -496,10 +498,10 @@ void sendQueueCmd(void)
           break;
 
         case 92: //M92 Steps per unit
-          if(cmd_seen('X')) setParameter(P_STEPS_PER_MM, X_AXIS, cmd_float());
-          if(cmd_seen('Y')) setParameter(P_STEPS_PER_MM, Y_AXIS, cmd_float());
-          if(cmd_seen('Z')) setParameter(P_STEPS_PER_MM, Z_AXIS, cmd_float());
-          if(cmd_seen('E')) setParameter(P_STEPS_PER_MM, E_AXIS, cmd_float());
+          if (cmd_seen('X')) setParameter(P_STEPS_PER_MM, X_AXIS, cmd_float());
+          if (cmd_seen('Y')) setParameter(P_STEPS_PER_MM, Y_AXIS, cmd_float());
+          if (cmd_seen('Z')) setParameter(P_STEPS_PER_MM, Z_AXIS, cmd_float());
+          if (cmd_seen('E')) setParameter(P_STEPS_PER_MM, E_AXIS, cmd_float());
           break;
 
         case 105: //M105
@@ -530,7 +532,8 @@ void sendQueueCmd(void)
         case 106: //M106
         {
           uint8_t i = cmd_seen('P') ? cmd_value() : 0;
-          if(cmd_seen('S') && fanIsType(i, FAN_TYPE_F) ) {
+          if (cmd_seen('S') && fanIsType(i, FAN_TYPE_F))
+          {
             fanSetCurSpeed(i, cmd_value());
             fanSetSendWaiting(i, false);
           }
@@ -553,8 +556,14 @@ void sendQueueCmd(void)
         case 710: //M710 Controller Fan
         {
           u8 i = 0;
-          if(cmd_seen('S')) i = fanGetTypID(i,FAN_TYPE_CTRL_S);
-          if(cmd_seen('I')) i = fanGetTypID(i=0,FAN_TYPE_CTRL_I);
+          if(cmd_seen('S'))
+          {
+            i = fanGetTypID(i,FAN_TYPE_CTRL_S);
+          }
+          if(cmd_seen('I'))
+          {
+            i = fanGetTypID(i=0,FAN_TYPE_CTRL_I);
+          }
           fanSetCurSpeed(i, cmd_value());
           fanSetSendWaiting(i, false);
           break;
@@ -580,7 +589,7 @@ void sendQueueCmd(void)
           if (fromTFT)
           {
             uint8_t i = cmd_seen('T') ? cmd_value() : heatGetCurrentHotend();
-            if(cmd_seen('S'))
+            if (cmd_seen('S'))
             {
               heatSyncTargetTemp(i, cmd_value());
             }
@@ -686,52 +695,52 @@ void sendQueueCmd(void)
           }
           break;
         case 201: //M201 Maximum Acceleration (units/s2)
-          if(cmd_seen('X')) setParameter(P_MAX_ACCELERATION, X_AXIS, cmd_float());
-          if(cmd_seen('Y')) setParameter(P_MAX_ACCELERATION, Y_AXIS, cmd_float());
-          if(cmd_seen('Z')) setParameter(P_MAX_ACCELERATION, Z_AXIS, cmd_float());
-          if(cmd_seen('E')) setParameter(P_MAX_ACCELERATION, E_AXIS, cmd_float());
+          if (cmd_seen('X')) setParameter(P_MAX_ACCELERATION, X_AXIS, cmd_float());
+          if (cmd_seen('Y')) setParameter(P_MAX_ACCELERATION, Y_AXIS, cmd_float());
+          if (cmd_seen('Z')) setParameter(P_MAX_ACCELERATION, Z_AXIS, cmd_float());
+          if (cmd_seen('E')) setParameter(P_MAX_ACCELERATION, E_AXIS, cmd_float());
           break;
         case 203: //M203 Maximum feedrates (units/s)
-          if(cmd_seen('X')) setParameter(P_MAX_FEED_RATE, X_AXIS, cmd_float());
-          if(cmd_seen('Y')) setParameter(P_MAX_FEED_RATE, Y_AXIS, cmd_float());
-          if(cmd_seen('Z')) setParameter(P_MAX_FEED_RATE, Z_AXIS, cmd_float());
-          if(cmd_seen('E')) setParameter(P_MAX_FEED_RATE, E_AXIS, cmd_float());
+          if (cmd_seen('X')) setParameter(P_MAX_FEED_RATE, X_AXIS, cmd_float());
+          if (cmd_seen('Y')) setParameter(P_MAX_FEED_RATE, Y_AXIS, cmd_float());
+          if (cmd_seen('Z')) setParameter(P_MAX_FEED_RATE, Z_AXIS, cmd_float());
+          if (cmd_seen('E')) setParameter(P_MAX_FEED_RATE, E_AXIS, cmd_float());
           break;
         case 204: //M204 Acceleration (units/s2)
-          if(cmd_seen('P')) setParameter(P_ACCELERATION, 0, cmd_float());
-          if(cmd_seen('R')) setParameter(P_ACCELERATION, 1, cmd_float());
-          if(cmd_seen('T')) setParameter(P_ACCELERATION, 2, cmd_float());
+          if (cmd_seen('P')) setParameter(P_ACCELERATION, 0, cmd_float());
+          if (cmd_seen('R')) setParameter(P_ACCELERATION, 1, cmd_float());
+          if (cmd_seen('T')) setParameter(P_ACCELERATION, 2, cmd_float());
           break;
         case 205: //M205 - Set Advanced Settings
-          if(cmd_seen('X')) setParameter(P_JERK, X_AXIS, cmd_float());
-          if(cmd_seen('Y')) setParameter(P_JERK, Y_AXIS, cmd_float());
-          if(cmd_seen('Z')) setParameter(P_JERK, Z_AXIS, cmd_float());
-          if(cmd_seen('E')) setParameter(P_JERK, E_AXIS, cmd_float());
-          if(cmd_seen('J')) setParameter(P_JUNCTION_DEVIATION, 0, cmd_float());
+          if (cmd_seen('X')) setParameter(P_JERK, X_AXIS, cmd_float());
+          if (cmd_seen('Y')) setParameter(P_JERK, Y_AXIS, cmd_float());
+          if (cmd_seen('Z')) setParameter(P_JERK, Z_AXIS, cmd_float());
+          if (cmd_seen('E')) setParameter(P_JERK, E_AXIS, cmd_float());
+          if (cmd_seen('J')) setParameter(P_JUNCTION_DEVIATION, 0, cmd_float());
           break;
         case 206: //M206 Home offset
-          if(cmd_seen('X')) setParameter(P_HOME_OFFSET, X_AXIS, cmd_float());
-          if(cmd_seen('Y')) setParameter(P_HOME_OFFSET, Y_AXIS, cmd_float());
-          if(cmd_seen('Z')) setParameter(P_HOME_OFFSET, Z_AXIS, cmd_float());
+          if (cmd_seen('X')) setParameter(P_HOME_OFFSET, X_AXIS, cmd_float());
+          if (cmd_seen('Y')) setParameter(P_HOME_OFFSET, Y_AXIS, cmd_float());
+          if (cmd_seen('Z')) setParameter(P_HOME_OFFSET, Z_AXIS, cmd_float());
           break;
         case 207: //M207 FW Retract
-          if(cmd_seen('S')) setParameter(P_FWRETRACT, 0, cmd_float());
-          if(cmd_seen('W')) setParameter(P_FWRETRACT, 1, cmd_float());
-          if(cmd_seen('F')) setParameter(P_FWRETRACT, 2, cmd_float());
-          if(cmd_seen('Z')) setParameter(P_FWRETRACT, 3, cmd_float());
+          if (cmd_seen('S')) setParameter(P_FWRETRACT, 0, cmd_float());
+          if (cmd_seen('W')) setParameter(P_FWRETRACT, 1, cmd_float());
+          if (cmd_seen('F')) setParameter(P_FWRETRACT, 2, cmd_float());
+          if (cmd_seen('Z')) setParameter(P_FWRETRACT, 3, cmd_float());
           break;
         case 208: //M208 FW Retract recover
-          if(cmd_seen('S')) setParameter(P_FWRECOVER, 0, cmd_float());
-          if(cmd_seen('W')) setParameter(P_FWRECOVER, 1, cmd_float());
-          if(cmd_seen('F')) setParameter(P_FWRECOVER, 2, cmd_float());
-          if(cmd_seen('R')) setParameter(P_FWRECOVER, 3, cmd_float());
+          if (cmd_seen('S')) setParameter(P_FWRECOVER, 0, cmd_float());
+          if (cmd_seen('W')) setParameter(P_FWRECOVER, 1, cmd_float());
+          if (cmd_seen('F')) setParameter(P_FWRECOVER, 2, cmd_float());
+          if (cmd_seen('R')) setParameter(P_FWRECOVER, 3, cmd_float());
           break;
         case 220: //M220
-          if(cmd_seen('S'))
+          if (cmd_seen('S'))
             speedSetPercent(0,cmd_value());
           break;
         case 221: //M221
-          if(cmd_seen('S'))
+          if (cmd_seen('S'))
             speedSetPercent(1,cmd_value());
           break;
 
@@ -755,11 +764,13 @@ void sendQueueCmd(void)
         #endif
         case 355: //M355
         {
-          if(cmd_seen('S')) {
+          if (cmd_seen('S'))
+          {
             caseLightSetState(cmd_value() > 0);
             caseLightSendWaiting(false);
           }
-          if(cmd_seen('P')){
+          if (cmd_seen('P'))
+          {
             caseLightSetBrightness(cmd_value());
             caseLightSendWaiting(false);
           }
@@ -769,7 +780,7 @@ void sendQueueCmd(void)
         case 420: //M420
           //ABL state will be set through parsACK.c after receiving confirmation message from the printer
           // to prevent wrong state in case of error.
-          if(cmd_seen('Z')) setParameter(P_ABL_STATE,1,cmd_float());
+          if (cmd_seen('Z')) setParameter(P_ABL_STATE,1,cmd_float());
         break;
 
         #ifdef NOZZLE_PAUSE_M600_M601
@@ -793,44 +804,44 @@ void sendQueueCmd(void)
         #endif
 
         case 851: //M851 Z probe offset
-          if(cmd_seen('X')) setParameter(P_PROBE_OFFSET, X_AXIS, cmd_float());
-          if(cmd_seen('Y')) setParameter(P_PROBE_OFFSET, Y_AXIS, cmd_float());
-          if(cmd_seen('Z')) setParameter(P_PROBE_OFFSET, Z_AXIS, cmd_float());
+          if (cmd_seen('X')) setParameter(P_PROBE_OFFSET, X_AXIS, cmd_float());
+          if (cmd_seen('Y')) setParameter(P_PROBE_OFFSET, Y_AXIS, cmd_float());
+          if (cmd_seen('Z')) setParameter(P_PROBE_OFFSET, Z_AXIS, cmd_float());
           break;
         case 900: //M900 Linear advance
           if (cmd_seen('K')) setParameter(P_LIN_ADV, 0, cmd_float());
           break;
         case 906: //M906 Stepper driver current
-          if(cmd_seen('X')) setParameter(P_CURRENT, X_AXIS, cmd_value());
-          if(cmd_seen('Y')) setParameter(P_CURRENT, Y_AXIS, cmd_value());
-          if(cmd_seen('Z')) setParameter(P_CURRENT, Z_AXIS, cmd_value());
-          if(cmd_seen('E')) setParameter(P_CURRENT, E_AXIS, cmd_value());
-          if(cmd_seen('I'))
+          if (cmd_seen('X')) setParameter(P_CURRENT, X_AXIS, cmd_value());
+          if (cmd_seen('Y')) setParameter(P_CURRENT, Y_AXIS, cmd_value());
+          if (cmd_seen('Z')) setParameter(P_CURRENT, Z_AXIS, cmd_value());
+          if (cmd_seen('E')) setParameter(P_CURRENT, E_AXIS, cmd_value());
+          if (cmd_seen('I'))
           {
-            if(cmd_seen('X')) setDualStepperStatus(X_STEPPER,true);
-            if(cmd_seen('Y')) setDualStepperStatus(Y_STEPPER,true);
-            if(cmd_seen('Z')) setDualStepperStatus(Z_STEPPER,true);
+            if (cmd_seen('X')) setDualStepperStatus(X_STEPPER,true);
+            if (cmd_seen('Y')) setDualStepperStatus(Y_STEPPER,true);
+            if (cmd_seen('Z')) setDualStepperStatus(Z_STEPPER,true);
           }
-          if(cmd_seen('T') && cmd_value() == 0)
+          if (cmd_seen('T') && cmd_value() == 0)
           {
-            if(cmd_seen('E')) setParameter(P_CURRENT,E_STEPPER,cmd_value());
+            if (cmd_seen('E')) setParameter(P_CURRENT,E_STEPPER,cmd_value());
           }
-          if(cmd_seen('T') && cmd_value() == 1)
+          if (cmd_seen('T') && cmd_value() == 1)
           {
-            if(cmd_seen('E')) setParameter(P_CURRENT,E2_STEPPER,cmd_value());
+            if (cmd_seen('E')) setParameter(P_CURRENT,E2_STEPPER,cmd_value());
             setDualStepperStatus(E_STEPPER,true);
           }
           break;
         case 914: //parse and store TMC Bump sensitivity values
-          if(cmd_seen('X')) setParameter(P_BUMPSENSITIVITY, X_STEPPER, cmd_float());
-          if(cmd_seen('Y')) setParameter(P_BUMPSENSITIVITY, Y_STEPPER, cmd_float());
-          if(cmd_seen('Z')) setParameter(P_BUMPSENSITIVITY, Z_STEPPER, cmd_float());
+          if (cmd_seen('X')) setParameter(P_BUMPSENSITIVITY, X_STEPPER, cmd_float());
+          if (cmd_seen('Y')) setParameter(P_BUMPSENSITIVITY, Y_STEPPER, cmd_float());
+          if (cmd_seen('Z')) setParameter(P_BUMPSENSITIVITY, Z_STEPPER, cmd_float());
           break;
         case 913: //M913 Hybrid Threshold Speed
-          if(cmd_seen('X')) setParameter(P_HYBRID_THRESHOLD, X_STEPPER, cmd_value());
-          if(cmd_seen('Y')) setParameter(P_HYBRID_THRESHOLD, Y_STEPPER, cmd_value());
-          if(cmd_seen('Z')) setParameter(P_HYBRID_THRESHOLD, Z_STEPPER, cmd_value());
-          if(cmd_seen('E')) setParameter(P_HYBRID_THRESHOLD, E_STEPPER, cmd_value());
+          if (cmd_seen('X')) setParameter(P_HYBRID_THRESHOLD, X_STEPPER, cmd_value());
+          if (cmd_seen('Y')) setParameter(P_HYBRID_THRESHOLD, Y_STEPPER, cmd_value());
+          if (cmd_seen('Z')) setParameter(P_HYBRID_THRESHOLD, Z_STEPPER, cmd_value());
+          if (cmd_seen('E')) setParameter(P_HYBRID_THRESHOLD, E_STEPPER, cmd_value());
           break;
       }
       break; //end parsing M-codes
@@ -845,12 +856,12 @@ void sendQueueCmd(void)
           AXIS i;
           for(i=X_AXIS;i<TOTAL_AXIS;i++)
           {
-            if(cmd_seen(axis_id[i]))
+            if (cmd_seen(axis_id[i]))
             {
               coordinateSetAxisTarget(i,cmd_float());
             }
           }
-          if(cmd_seen('F'))
+          if (cmd_seen('F'))
           {
             coordinateSetFeedRate(cmd_value());
           }
@@ -866,12 +877,12 @@ void sendQueueCmd(void)
         #if ENABLE_BL_VALUE > 0              // if not Disabled
           case 29: //G29
             {
-              if(cmd_seen('A'))
+              if (cmd_seen('A'))
               {
                 setParameter(P_ABL_STATE,0,1);
                 storeCmd("M117 UBL active\n");
               }
-              if(cmd_seen('D'))
+              if (cmd_seen('D'))
               {
                 setParameter(P_ABL_STATE,0,0);
                 storeCmd("M117 UBL inactive\n");
@@ -898,7 +909,7 @@ void sendQueueCmd(void)
           eSetRelative(false);
           for(i=X_AXIS;i<TOTAL_AXIS;i++)
           {
-            if(cmd_seen(axis_id[i]))
+            if (cmd_seen(axis_id[i]))
             {
               coordinateSetAxisTarget(i,cmd_float());
             }
@@ -920,7 +931,8 @@ void sendQueueCmd(void)
 
   setCurrentAckSrc(infoCmd.queue[infoCmd.index_r].src);
   Serial_Puts(SERIAL_PORT, infoCmd.queue[infoCmd.index_r].gcode);
-  if (avoid_terminal != true){
+  if (avoid_terminal != true)
+  {
     sendGcodeTerminalCache(infoCmd.queue[infoCmd.index_r].gcode, TERMINAL_GCODE);
   }
   purgeLastCmd();
diff --git a/TFT/src/User/API/interfaceCmd.h b/TFT/src/User/API/interfaceCmd.h
index d8647f583b..9171e0c15a 100644
--- a/TFT/src/User/API/interfaceCmd.h
+++ b/TFT/src/User/API/interfaceCmd.h
@@ -1,5 +1,4 @@
-#ifndef _INTERFACECMD_H_
-#define _INTERFACECMD_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,5 +41,3 @@ void sendQueueCmd(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/ledcolor.h b/TFT/src/User/API/ledcolor.h
index 1d133d22e1..564aae1792 100644
--- a/TFT/src/User/API/ledcolor.h
+++ b/TFT/src/User/API/ledcolor.h
@@ -1,5 +1,4 @@
-#ifndef _LEDCOLOR_H_
-#define _LEDCOLOR_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -173,5 +172,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/menu.c b/TFT/src/User/API/menu.c
index e6ac5ace6a..afc36bedef 100644
--- a/TFT/src/User/API/menu.c
+++ b/TFT/src/User/API/menu.c
@@ -3,7 +3,6 @@
 #include "list_item.h"
 #include "Notification.h"
 
-
 // exhibitRect is 2 ICON Space in the Upper Row and 2 Center column.
 const GUI_RECT exhibitRect = {
    1*ICON_WIDTH+1*SPACE_X+START_X,  0*ICON_HEIGHT+0*SPACE_Y+ICON_START_Y,  3*ICON_WIDTH+2*SPACE_X+START_X,  1*ICON_HEIGHT+0*SPACE_Y+ICON_START_Y
@@ -119,66 +118,68 @@ const GUI_RECT rect_of_keySS[SS_RECT_COUNT] = {
   {1*ICON_WIDTH+1*SPACE_X+START_X,  1*ICON_HEIGHT+1*SPACE_Y+ICON_START_Y,  3*ICON_WIDTH+2*SPACE_X+START_X,  2*ICON_HEIGHT+1*SPACE_Y+ICON_START_Y},
   
 
-#endif
+  #endif
 };
 
-const GUI_RECT rect_of_keyListView[ITEM_PER_PAGE + 1]={
-  //8 icons area
-  {START_X,  0*LISTITEM_HEIGHT+ICON_START_Y,  LISTITEM_WIDTH+START_X,  1*LISTITEM_HEIGHT+ICON_START_Y},
-  {START_X,  1*LISTITEM_HEIGHT+ICON_START_Y,  LISTITEM_WIDTH+START_X,  2*LISTITEM_HEIGHT+ICON_START_Y},
-  {START_X,  2*LISTITEM_HEIGHT+ICON_START_Y,  LISTITEM_WIDTH+START_X,  3*LISTITEM_HEIGHT+ICON_START_Y},
-  {START_X,  3*LISTITEM_HEIGHT+ICON_START_Y,  LISTITEM_WIDTH+START_X,  4*LISTITEM_HEIGHT+ICON_START_Y},
-  {START_X,  4*LISTITEM_HEIGHT+ICON_START_Y,  LISTITEM_WIDTH+START_X,  5*LISTITEM_HEIGHT+ICON_START_Y},
+const GUI_RECT rect_of_keyListView[ITEM_PER_PAGE + 1] = {
+    //8 icons area
+    {START_X, 0 * LISTITEM_HEIGHT + ICON_START_Y, LISTITEM_WIDTH + START_X, 1 * LISTITEM_HEIGHT + ICON_START_Y},
+    {START_X, 1 * LISTITEM_HEIGHT + ICON_START_Y, LISTITEM_WIDTH + START_X, 2 * LISTITEM_HEIGHT + ICON_START_Y},
+    {START_X, 2 * LISTITEM_HEIGHT + ICON_START_Y, LISTITEM_WIDTH + START_X, 3 * LISTITEM_HEIGHT + ICON_START_Y},
+    {START_X, 3 * LISTITEM_HEIGHT + ICON_START_Y, LISTITEM_WIDTH + START_X, 4 * LISTITEM_HEIGHT + ICON_START_Y},
+    {START_X, 4 * LISTITEM_HEIGHT + ICON_START_Y, LISTITEM_WIDTH + START_X, 5 * LISTITEM_HEIGHT + ICON_START_Y},
 
-  {2*START_X + LISTITEM_WIDTH,  0*LIST_ICON_HEIGHT+0*LISTICON_SPACE_Y+ICON_START_Y,  2*START_X + LISTITEM_WIDTH + 1*LIST_ICON_WIDTH,  1*LIST_ICON_HEIGHT+0*LISTICON_SPACE_Y+ICON_START_Y},
-  {2*START_X + LISTITEM_WIDTH,  1*LIST_ICON_HEIGHT+1*LISTICON_SPACE_Y+ICON_START_Y,  2*START_X + LISTITEM_WIDTH + 1*LIST_ICON_WIDTH,  2*LIST_ICON_HEIGHT+1*LISTICON_SPACE_Y+ICON_START_Y},
-  {2*START_X + LISTITEM_WIDTH,  2*LIST_ICON_HEIGHT+2*LISTICON_SPACE_Y+ICON_START_Y,  2*START_X + LISTITEM_WIDTH + 1*LIST_ICON_WIDTH,  3*LIST_ICON_HEIGHT+2*LISTICON_SPACE_Y+ICON_START_Y},
+    {2 * START_X + LISTITEM_WIDTH, 0 * LIST_ICON_HEIGHT + 0 * LISTICON_SPACE_Y + ICON_START_Y, 2 * START_X + LISTITEM_WIDTH + 1 * LIST_ICON_WIDTH, 1 * LIST_ICON_HEIGHT + 0 * LISTICON_SPACE_Y + ICON_START_Y},
+    {2 * START_X + LISTITEM_WIDTH, 1 * LIST_ICON_HEIGHT + 1 * LISTICON_SPACE_Y + ICON_START_Y, 2 * START_X + LISTITEM_WIDTH + 1 * LIST_ICON_WIDTH, 2 * LIST_ICON_HEIGHT + 1 * LISTICON_SPACE_Y + ICON_START_Y},
+    {2 * START_X + LISTITEM_WIDTH, 2 * LIST_ICON_HEIGHT + 2 * LISTICON_SPACE_Y + ICON_START_Y, 2 * START_X + LISTITEM_WIDTH + 1 * LIST_ICON_WIDTH, 3 * LIST_ICON_HEIGHT + 2 * LISTICON_SPACE_Y + ICON_START_Y},
 
-  //title bar area
-  {0 ,0 ,LCD_WIDTH, ICON_START_Y}
-};
+    //title bar area
+    {0, 0, LCD_WIDTH, ICON_START_Y}};
 
 // titlebar touch area
 const GUI_RECT rect_of_titleBar[] = {
-  {0 ,0 ,LCD_WIDTH, ICON_START_Y}
-};
+    {0, 0, LCD_WIDTH, ICON_START_Y}};
 
 //Clean up the gaps outside icons
 #ifdef TFT70_V3_0
 
 void menuClearGaps(void)
 {
-  const GUI_RECT gapsMenu[]={
-  {0,                  0,                  LCD_WIDTH,          TITLE_END_Y},
-  {0,                  TITLE_END_Y,        LCD_WIDTH,          rect_of_key[0].y0},
-  {0,                  rect_of_key[0].y0,  rect_of_key[0].x0,  LCD_HEIGHT},
-  {rect_of_key[0].x1,  rect_of_key[0].y0,  rect_of_key[1].x0,  LCD_HEIGHT},
-  {rect_of_key[1].x1,  rect_of_key[0].y0,  rect_of_key[2].x0,  LCD_HEIGHT},
-  {rect_of_key[2].x1,  rect_of_key[0].y0,  rect_of_key[3].x0,  LCD_HEIGHT},
-  {rect_of_key[3].x1,  rect_of_key[0].y0,  LCD_WIDTH,          LCD_HEIGHT}};
-
-  const GUI_RECT gapsSS[]={
-  {0,                   0,                    LCD_WIDTH,            TITLE_END_Y},
-  {0,                   TITLE_END_Y,          LCD_WIDTH,            rect_of_keySS[0].y0},
-  {0,                   rect_of_keySS[0].y0,  rect_of_keySS[0].x0,  LCD_HEIGHT},
-  {rect_of_keySS[4].y0, rect_of_keySS[0].y0,  LCD_WIDTH,            LCD_HEIGHT},
-  //1ST ROW
-  {rect_of_keySS[0].x1,  rect_of_keySS[0].y0,  rect_of_keySS[1].x0,  rect_of_keySS[0].y1},
-  {rect_of_keySS[1].x1,  rect_of_keySS[0].y0,  rect_of_keySS[2].x0,  rect_of_keySS[0].y1},
-  {rect_of_keySS[2].x1,  rect_of_keySS[0].y0,  rect_of_keySS[3].x0,  rect_of_keySS[0].y1},
-  {rect_of_keySS[3].x1,  rect_of_keySS[0].y0,  rect_of_keySS[4].x0,  rect_of_keySS[0].y1},
-  //gantry rect
-  {rect_of_keySS[0].x0,  rect_of_keySS[0].y1,  rect_of_keySS[7].x0,  rect_of_keySS[7].y0},
-  //2ND ROW
-  {rect_of_keySS[5].x1,  rect_of_keySS[5].y0,  rect_of_keySS[17].x0,  rect_of_keySS[5].y1},
-  {rect_of_keySS[17].x1,  rect_of_keySS[5].y0,  rect_of_keySS[7].x0,  rect_of_keySS[5].y1}};
+  const GUI_RECT gapsMenu[] = {
+      {0, 0, LCD_WIDTH, TITLE_END_Y},
+      {0, TITLE_END_Y, LCD_WIDTH, rect_of_key[0].y0},
+      {0, rect_of_key[0].y0, rect_of_key[0].x0, LCD_HEIGHT},
+      {rect_of_key[0].x1, rect_of_key[0].y0, rect_of_key[1].x0, LCD_HEIGHT},
+      {rect_of_key[1].x1, rect_of_key[0].y0, rect_of_key[2].x0, LCD_HEIGHT},
+      {rect_of_key[2].x1, rect_of_key[0].y0, rect_of_key[3].x0, LCD_HEIGHT},
+      {rect_of_key[3].x1, rect_of_key[0].y0, LCD_WIDTH, LCD_HEIGHT}};
+
+  const GUI_RECT gapsSS[] = {
+      {0, 0, LCD_WIDTH, TITLE_END_Y},
+      {0, TITLE_END_Y, LCD_WIDTH, rect_of_keySS[0].y0},
+      {0, rect_of_keySS[0].y0, rect_of_keySS[0].x0, LCD_HEIGHT},
+      {rect_of_keySS[4].y0, rect_of_keySS[0].y0, LCD_WIDTH, LCD_HEIGHT},
+      //1ST ROW
+      {rect_of_keySS[0].x1, rect_of_keySS[0].y0, rect_of_keySS[1].x0, rect_of_keySS[0].y1},
+      {rect_of_keySS[1].x1, rect_of_keySS[0].y0, rect_of_keySS[2].x0, rect_of_keySS[0].y1},
+      {rect_of_keySS[2].x1, rect_of_keySS[0].y0, rect_of_keySS[3].x0, rect_of_keySS[0].y1},
+      {rect_of_keySS[3].x1, rect_of_keySS[0].y0, rect_of_keySS[4].x0, rect_of_keySS[0].y1},
+      //gantry rect
+      {rect_of_keySS[0].x0, rect_of_keySS[0].y1, rect_of_keySS[7].x0, rect_of_keySS[7].y0},
+      //2ND ROW
+      {rect_of_keySS[5].x1, rect_of_keySS[5].y0, rect_of_keySS[17].x0, rect_of_keySS[5].y1},
+      {rect_of_keySS[17].x1, rect_of_keySS[5].y0, rect_of_keySS[7].x0, rect_of_keySS[5].y1}};
 
   GUI_SetBkColor(infoSettings.title_bg_color);
 
   if (infoMenu.menu[infoMenu.cur] == menuStatus)
+  {
     GUI_ClearPrect(gapsMenu);
+  }
   else
+  {
     GUI_ClearPrect(gapsSS);
+  }
 
   GUI_SetBkColor(infoSettings.bg_color);
 
@@ -202,24 +203,25 @@ void menuClearGaps(void)
 
 void menuClearGaps(void)
 {
-  const GUI_RECT gaps[]={
-  {0,                  0,                  LCD_WIDTH,          TITLE_END_Y},
-  {0,                  TITLE_END_Y,        LCD_WIDTH,          rect_of_key[0].y0},
-  {0,                  rect_of_key[0].y0,  rect_of_key[0].x0,  LCD_HEIGHT},
-  {rect_of_key[0].x1,  rect_of_key[0].y0,  rect_of_key[1].x0,  LCD_HEIGHT},
-  {rect_of_key[1].x1,  rect_of_key[0].y0,  rect_of_key[2].x0,  LCD_HEIGHT},
-  {rect_of_key[2].x1,  rect_of_key[0].y0,  rect_of_key[3].x0,  LCD_HEIGHT},
-  {rect_of_key[3].x1,  rect_of_key[0].y0,  LCD_WIDTH,          LCD_HEIGHT}};
+  const GUI_RECT gaps[] = {
+      {0, 0, LCD_WIDTH, TITLE_END_Y},
+      {0, TITLE_END_Y, LCD_WIDTH, rect_of_key[0].y0},
+      {0, rect_of_key[0].y0, rect_of_key[0].x0, LCD_HEIGHT},
+      {rect_of_key[0].x1, rect_of_key[0].y0, rect_of_key[1].x0, LCD_HEIGHT},
+      {rect_of_key[1].x1, rect_of_key[0].y0, rect_of_key[2].x0, LCD_HEIGHT},
+      {rect_of_key[2].x1, rect_of_key[0].y0, rect_of_key[3].x0, LCD_HEIGHT},
+      {rect_of_key[3].x1, rect_of_key[0].y0, LCD_WIDTH, LCD_HEIGHT}};
 
   GUI_SetBkColor(infoSettings.title_bg_color);
   GUI_ClearPrect(gaps);
   GUI_SetBkColor(infoSettings.bg_color);
-  for(uint8_t i = 1; i < COUNT(gaps); i++)
+  for (uint8_t i = 1; i < COUNT(gaps); i++)
     GUI_ClearPrect(gaps + i);
 }
 #endif
 
-void GUI_RestoreColorDefault(void){
+void GUI_RestoreColorDefault(void)
+{
   GUI_SetBkColor(infoSettings.bg_color);
   GUI_SetColor(infoSettings.font_color);
   GUI_SetTextMode(GUI_TEXTMODE_NORMAL);
@@ -227,16 +229,16 @@ void GUI_RestoreColorDefault(void){
   setLargeFont(false);
 }
 
-static const MENUITEMS *curMenuItems = NULL;   //current menu
+static const MENUITEMS *curMenuItems = NULL; //current menu
 
-static const LISTITEMS *curListItems = NULL;   //current listmenu
+static const LISTITEMS *curListItems = NULL; //current listmenu
 
-static const void (* curMenuCustom)(void) = NULL; //current custom menu
+static const void (*curMenuCustom)(void) = NULL; //current custom menu
 
 static MENU_TYPE menuType = MENU_TYPE_ICON;
-static LABEL * curTitle = NULL;
+static LABEL *curTitle = NULL;
 static const GUI_RECT *curRect = NULL; //current menu layout grid
-static u16 curRectCount = 0;    //current menu layout rect count
+static u16 curRectCount = 0;           //current menu layout rect count
 
 static REMINDER reminder = {{0, 0, LCD_WIDTH, TITLE_END_Y}, 0, STATUS_UNCONNECT, LABEL_UNCONNECTED};
 static REMINDER volumeReminder = {{0, 0, LCD_WIDTH, TITLE_END_Y}, 0, STATUS_IDLE, LABEL_BACKGROUND};
@@ -244,21 +246,28 @@ static REMINDER busySign = {{LCD_WIDTH - 5, 0, LCD_WIDTH, 5}, 0, STATUS_BUSY, LA
 
 MENUITEMS *getCurMenuItems(void)
 {
-return (MENUITEMS *)curMenuItems;
+  return (MENUITEMS *)curMenuItems;
 }
 
 LISTITEMS *getCurListItems(void)
 {
-return (LISTITEMS *)curListItems;
+  return (LISTITEMS *)curListItems;
 }
 
 uint8_t *labelGetAddress(const LABEL *label)
 {
-  if (label->index == LABEL_BACKGROUND) return NULL;  // No content in label
+  if (label->index == LABEL_BACKGROUND)
+  {
+    return NULL;                // No content in label
+  }
   if (label->index < LABEL_NUM) // Index of language
+  {
     return textSelect(label->index);
+  }
   else // Address of string
+  {
     return label->address;
+  }
 }
 
 void menuDrawItem(const ITEM *item, uint8_t position)
@@ -266,28 +275,38 @@ void menuDrawItem(const ITEM *item, uint8_t position)
   uint8_t *content = labelGetAddress(&item->label);
   const GUI_RECT *rect = curRect + position;
   if (item->icon != ICON_BACKGROUND)
+  {
     ICON_ReadDisplay(rect->x0, rect->y0, item->icon);
+  }
   else
+  {
     GUI_ClearPrect(rect);
+  }
 
   rect = curRect + ITEM_PER_PAGE + position;
   GUI_ClearPrect(rect);
   if (content)
+  {
     GUI_DispStringInPrect(rect, content);
+  }
 }
 
 void menuDrawIconOnly(const ITEM *item, uint8_t position)
 {
   const GUI_RECT *rect = curRect + position;
-  if(item->icon != ICON_BACKGROUND)
+  if (item->icon != ICON_BACKGROUND)
+  {
     ICON_ReadDisplay(rect->x0, rect->y0, item->icon);
+  }
   else
+  {
     GUI_ClearPrect(rect);
+  }
 }
 
- void menuDrawListItem(const LISTITEM *item, uint8_t position)
+void menuDrawListItem(const LISTITEM *item, uint8_t position)
 {
-   const GUI_RECT *rect = rect_of_keyListView + position;
+  const GUI_RECT *rect = rect_of_keyListView + position;
   if (item->icon == ICONCHAR_BACKGROUND)
   {
     GUI_ClearPrect(rect);
@@ -298,13 +317,13 @@ void menuDrawIconOnly(const ITEM *item, uint8_t position)
   }
 }
 
-void menuRefreshListPage(void){
- for (uint8_t i = 0; i < ITEM_PER_PAGE; i++)
-    {
-      menuDrawListItem(&curListItems->items[i], i);
-      rapid_serial_comm()//perform backend printing loop between drawing icons to avoid printer idling
-    }
-
+void menuRefreshListPage(void)
+{
+  for (uint8_t i = 0; i < ITEM_PER_PAGE; i++)
+  {
+    menuDrawListItem(&curListItems->items[i], i);
+    rapid_serial_comm() //perform backend printing loop between drawing icons to avoid printer idling
+  }
 }
 
 void setMenuType(MENU_TYPE type)
@@ -317,7 +336,7 @@ MENU_TYPE getMenuType(void)
   return menuType;
 }
 
-void setMenu(MENU_TYPE menu_type, LABEL * title, u16 rectCount, const GUI_RECT * menuRect, void(*action_redraw)(u8 position, u8 is_press))
+void setMenu(MENU_TYPE menu_type, LABEL *title, u16 rectCount, const GUI_RECT *menuRect, void (*action_redraw)(u8 position, u8 is_press))
 {
   menuType = menu_type;
   curRect = menuRect;
@@ -326,7 +345,7 @@ void setMenu(MENU_TYPE menu_type, LABEL * title, u16 rectCount, const GUI_RECT *
   TSC_ReDrawIcon = action_redraw;
 }
 
-void setMenuTypeCustom(void (* redrawCallback)(void))
+void setMenuTypeCustom(void (*redrawCallback)(void))
 {
   menuType = MENU_TYPE_CUSTOM;
   curMenuCustom = redrawCallback;
@@ -335,7 +354,9 @@ void setMenuTypeCustom(void (* redrawCallback)(void))
 void menuRedrawCustom()
 {
   if (menuType == MENU_TYPE_CUSTOM && curMenuCustom != NULL)
+  {
     curMenuCustom();
+  }
 }
 
 void reminderSetUnConnected(void)
@@ -346,8 +367,10 @@ void reminderSetUnConnected(void)
 
 void reminderMessage(int16_t inf, SYS_STATUS status)
 {
-  if(toastRunning() || menuType == MENU_TYPE_FULLSCREEN)
+  if (toastRunning() || menuType == MENU_TYPE_FULLSCREEN)
+  {
     return;
+  }
   reminder.inf = inf;
   GUI_SetColor(infoSettings.reminder_color);
   GUI_SetBkColor(infoSettings.title_bg_color);
@@ -360,8 +383,10 @@ void reminderMessage(int16_t inf, SYS_STATUS status)
 void volumeReminderMessage(int16_t inf, SYS_STATUS status)
 {
   wakeLCD();
-  if(toastRunning() || menuType == MENU_TYPE_FULLSCREEN)
+  if (toastRunning() || menuType == MENU_TYPE_FULLSCREEN)
+  {
     return;
+  }
   volumeReminder.inf = inf;
   GUI_SetColor(infoSettings.sd_reminder_color);
   GUI_SetBkColor(infoSettings.title_bg_color);
@@ -373,10 +398,12 @@ void volumeReminderMessage(int16_t inf, SYS_STATUS status)
 
 void busyIndicator(SYS_STATUS status)
 {
-  if(status == STATUS_BUSY)
+  if (status == STATUS_BUSY)
   {
     GUI_SetColor(YELLOW);
-    GUI_FillCircle(busySign.rect.x0, (busySign.rect.y1 - busySign.rect.y0) / 2, (busySign.rect.x1-busySign.rect.x0)/2);
+    GUI_FillCircle(busySign.rect.x0,
+                   (busySign.rect.y1 - busySign.rect.y0) / 2,
+                   (busySign.rect.x1 - busySign.rect.x0) / 2);
     GUI_SetColor(infoSettings.font_color);
   }
   busySign.status = status;
@@ -385,102 +412,107 @@ void busyIndicator(SYS_STATUS status)
 
 void loopReminderClear(void)
 {
-  switch(reminder.status)
+  switch (reminder.status)
   {
-    case STATUS_IDLE:
-      return;
+  case STATUS_IDLE:
+    return;
 
-    case STATUS_BUSY:
-      if(infoCmd.count == CMD_MAX_LIST)
-        return;
-      break;
-
-    case STATUS_UNCONNECT:
-      if(infoHost.connected == false)
-        return;
-      break;
-
-    case STATUS_NORMAL:
-      if(OS_GetTimeMs() < reminder.time)
-        return;
-      break;
-    default:
-      return;
+  case STATUS_BUSY:
+    if (infoCmd.count == CMD_MAX_LIST) return;
+    break;
+
+  case STATUS_UNCONNECT:
+    if (infoHost.connected == false) return;
+    break;
+
+  case STATUS_NORMAL:
+    if (OS_GetTimeMs() < reminder.time) return;
+    break;
+  default:
+    return;
   }
 
   /* Clear warning message */
   reminder.status = STATUS_IDLE;
 
   if (menuType == MENU_TYPE_CUSTOM)
+  {
     menuRedrawCustom();
+  }
   else
+  {
     menuReDrawCurTitle();
+  }
 }
 
 void loopVolumeReminderClear(void)
 {
-  switch(volumeReminder.status)
+  switch (volumeReminder.status)
   {
-    case STATUS_NORMAL:
-      if(OS_GetTimeMs() < volumeReminder.time)
-        return;
-      break;
-    default:
-      return;
+  case STATUS_NORMAL:
+    if (OS_GetTimeMs() < volumeReminder.time) return;
+    break;
+  default:
+    return;
   }
 
   /* Clear warning message */
   volumeReminder.status = STATUS_IDLE;
 
   if (menuType == MENU_TYPE_CUSTOM)
+  {
     menuRedrawCustom();
+  }
   else
+  {
     menuReDrawCurTitle();
+  }
 }
 
 void loopBusySignClear(void)
 {
-  switch(busySign.status)
+  switch (busySign.status)
   {
-    case STATUS_IDLE:
-      return;
+  case STATUS_IDLE:
+    return;
 
-    case STATUS_BUSY:
-     if(OS_GetTimeMs() < busySign.time)
-        return;
-     break;
+  case STATUS_BUSY:
+    if (OS_GetTimeMs() < busySign.time) return;
+    break;
   }
 
   /* End Busy display sing */
   busySign.status = STATUS_IDLE;
 
   if (menuType == MENU_TYPE_CUSTOM)
+  {
     menuRedrawCustom();
+  }
   else
   {
     GUI_SetColor(infoSettings.title_bg_color);
-    GUI_FillCircle(busySign.rect.x0, (busySign.rect.y1 - busySign.rect.y0) / 2, (busySign.rect.x1-busySign.rect.x0)/2);
+    GUI_FillCircle(busySign.rect.x0, (busySign.rect.y1 - busySign.rect.y0) / 2, (busySign.rect.x1 - busySign.rect.x0) / 2);
     GUI_SetColor(infoSettings.font_color);
   }
 }
 
 void notificationDot(void)
 {
-  if(hasNotification())
-    {
-      GUI_SetColor(infoSettings.font_color);
-    }
+  if (hasNotification())
+  {
+    GUI_SetColor(infoSettings.font_color);
+  }
   else
-    {
-      GUI_SetColor(infoSettings.title_bg_color);
-    }
-    GUI_FillCircle(3, 3, 3);
-    GUI_RestoreColorDefault();
+  {
+    GUI_SetColor(infoSettings.title_bg_color);
+  }
+  GUI_FillCircle(3, 3, 3);
+  GUI_RestoreColorDefault();
 }
 
 void menuDrawTitle(const uint8_t *content) //(const MENUITEMS * menuItems)
 {
-  if(menuType == MENU_TYPE_FULLSCREEN) return;
+  if (menuType == MENU_TYPE_FULLSCREEN) return;
   if (toastRunning())
   {
     drawToast(true);
@@ -494,13 +526,16 @@ void menuDrawTitle(const uint8_t *content) //(const MENUITEMS * menuItems)
   {
     GUI_DispLenString(10, start_y, content, LCD_WIDTH - 20, true);
     start_x += GUI_StrPixelWidth(content);
-    if (start_x > LCD_WIDTH-20) start_x = LCD_WIDTH - 20;
+    if (start_x > LCD_WIDTH - 20)
+    {
+      start_x = LCD_WIDTH - 20;
+    }
   }
-  GUI_ClearRect(start_x, start_y, end_x, start_y+BYTE_HEIGHT);
+  GUI_ClearRect(start_x, start_y, end_x, start_y + BYTE_HEIGHT);
 
   notificationDot();
   GUI_SetBkColor(infoSettings.bg_color);
-  if(reminder.status == STATUS_IDLE) return;
+  if (reminder.status == STATUS_IDLE) return;
   GUI_SetColor(infoSettings.reminder_color);
   GUI_SetBkColor(infoSettings.title_bg_color);
   GUI_DispStringInPrect(&reminder.rect, reminder.inf);
@@ -511,16 +546,18 @@ void menuReDrawCurTitle(void)
 {
   if (menuType == MENU_TYPE_LISTVIEW)
   {
-    if(curListItems == NULL) return;
-    if(curListItems->title.index < LABEL_BACKGROUND)
-    menuDrawTitle(labelGetAddress(&curListItems->title));
+    if (curListItems == NULL) return;
+    if (curListItems->title.index < LABEL_BACKGROUND)
+    {
+      menuDrawTitle(labelGetAddress(&curListItems->title));
+    }
   }
-  else if(menuType == MENU_TYPE_ICON)
+  else if (menuType == MENU_TYPE_ICON)
   {
-    if(curMenuItems == NULL) return;
+    if (curMenuItems == NULL) return;
     menuDrawTitle(labelGetAddress(&curMenuItems->title));
   }
-  else if(menuType == MENU_TYPE_OTHER)
+  else if (menuType == MENU_TYPE_OTHER)
   {
     menuDrawTitle(labelGetAddress(curTitle));
   }
@@ -542,7 +579,7 @@ void menuDrawPage(const MENUITEMS *menuItems)
   for (i = 0; i < ITEM_PER_PAGE; i++)
   {
     menuDrawItem(&menuItems->items[i], i);
-    rapid_serial_comm()//perform backend printing loop between drawing icons to avoid printer idling
+    rapid_serial_comm() //perform backend printing loop between drawing icons to avoid printer idling
   }
 }
 
@@ -566,26 +603,33 @@ void menuDrawListPage(const LISTITEMS *listItems)
   {
     //const GUI_RECT *rect = rect_of_keyListView + i;
     if (curListItems->items[i].icon != ICONCHAR_BACKGROUND)
+    {
       menuDrawListItem(&curListItems->items[i], i);
-    rapid_serial_comm()//perform backend printing loop between drawing icons to avoid printer idling
+    }
+    rapid_serial_comm() //perform backend printing loop between drawing icons to avoid printer idling
   }
 }
 
 //Show live info text on icons
-void showLiveInfo(uint8_t index, const LIVE_INFO * liveicon, const ITEM * item)
+void showLiveInfo(uint8_t index, const LIVE_INFO *liveicon, const ITEM *item)
 {
   if (item != NULL)
-    menuDrawIconOnly(item,index);
+    menuDrawIconOnly(item, index);
 
   for (uint8_t i = 0; i < LIVEICON_LINES; i++)
   {
     if (liveicon->enabled[i] == true)
     {
       if (sizeof(lcd_colors) > liveicon->lines[i].fn_color)
+      {
         GUI_SetColor(lcd_colors[liveicon->lines[i].fn_color]);
+      }
 
-      if (liveicon->lines[i].text_mode != GUI_TEXTMODE_TRANS && sizeof(lcd_colors) > liveicon->lines[i].bk_color)
+      if (liveicon->lines[i].text_mode != GUI_TEXTMODE_TRANS &&
+          sizeof(lcd_colors) > liveicon->lines[i].bk_color)
+      {
         GUI_SetBkColor(lcd_colors[liveicon->lines[i].bk_color]);
+      }
 
       GUI_SetTextMode(liveicon->lines[i].text_mode);
 
@@ -637,32 +681,40 @@ void itemDrawIconPress(u8 position, u8 is_press)
   if (menuType == MENU_TYPE_ICON)
   {
     if (curMenuItems == NULL) return;
-    if (curMenuItems->items[position].icon == ICON_BACKGROUND) return;
+    if (curMenuItems->items[position].icon == ICON_BACKGROUND)
+    {
+      return;
+    }
 
     const GUI_RECT *rect = curRect + position;
 
     if (is_press) // Turn green when pressed
+    {
       ICON_PressedDisplay(rect->x0, rect->y0, curMenuItems->items[position].icon);
+    }
     else // Redraw normal icon when released
-      ICON_ReadDisplay(rect->x0, rect->y0,curMenuItems->items[position].icon);
+    {
+      ICON_ReadDisplay(rect->x0, rect->y0, curMenuItems->items[position].icon);
+    }
   }
   else if (menuType == MENU_TYPE_LISTVIEW)
   { //draw rec over list item if pressed
-    if (curListItems == NULL)
-    return;
+    if (curListItems == NULL) return;
 
     const GUI_RECT *rect = rect_of_keyListView + position;
 
     if (curListItems->items[position].icon == ICONCHAR_BACKGROUND)
     {
-    GUI_ClearPrect(rect);
-    return;
+      GUI_ClearPrect(rect);
+      return;
     }
-    if (is_press){
-    ListItem_Display(rect,position,&curListItems->items[position], true);
+    if (is_press)
+    {
+      ListItem_Display(rect, position, &curListItems->items[position], true);
     }
-    else{
-    ListItem_Display(rect,position,&curListItems->items[position], false);
+    else
+    {
+      ListItem_Display(rect, position, &curListItems->items[position], false);
     }
   }
 }
@@ -677,14 +729,15 @@ KEY_VALUES menuKeyGetValue(void)
     {
       tempkey = (KEY_VALUES)KEY_GetValue(COUNT(rect_of_keySS), rect_of_keySS);
     }
-    else if((infoMenu.menu[infoMenu.cur] == menuHeat) || 
-            (infoMenu.menu[infoMenu.cur] == menuPid)  || 
+    else if((infoMenu.menu[infoMenu.cur] == menuHeat)         || 
+            (infoMenu.menu[infoMenu.cur] == menuPid)          || 
             (infoMenu.menu[infoMenu.cur] == menuTuneExtruder) || 
-            (infoMenu.menu[infoMenu.cur] == menuFan) || 
-            (infoMenu.menu[infoMenu.cur] == menuExtrude) || 
-            (infoMenu.menu[infoMenu.cur] == menuSpeed) ||
-			(infoMenu.menu[infoMenu.cur] == menuProbeOffset) ||
-			(infoMenu.menu[infoMenu.cur] == menuMBL))
+            (infoMenu.menu[infoMenu.cur] == menuFan)          || 
+            (infoMenu.menu[infoMenu.cur] == menuExtrude)      || 
+            (infoMenu.menu[infoMenu.cur] == menuSpeed)        ||
+			      (infoMenu.menu[infoMenu.cur] == menuProbeOffset)  ||
+			      (infoMenu.menu[infoMenu.cur] == menuMBL)
+           )
     {
       tempkey = (KEY_VALUES)KEY_GetValue(COUNT(rect_of_keysIN), rect_of_keysIN);
     }
@@ -697,14 +750,18 @@ KEY_VALUES menuKeyGetValue(void)
   {
     tempkey = (KEY_VALUES)KEY_GetValue(COUNT(rect_of_keyListView), rect_of_keyListView); //for listview
   }
-  else if(menuType == MENU_TYPE_OTHER)
+  else if (menuType == MENU_TYPE_OTHER)
   {
     if ((KEY_VALUES)KEY_GetValue(1, rect_of_titleBar) == 0)
+    {
       tempkey = KEY_TITLEBAR;
+    }
     else
-      return(KEY_VALUES)KEY_GetValue(curRectCount, curRect);
+    {
+      return (KEY_VALUES)KEY_GetValue(curRectCount, curRect);
+    }
   }
-  else if(menuType == MENU_TYPE_FULLSCREEN)
+  else if (menuType == MENU_TYPE_FULLSCREEN)
   {
     return tempkey = (KEY_VALUES)KEY_GetValue(curRectCount, curRect);
   }
@@ -721,32 +778,33 @@ KEY_VALUES menuKeyGetValue(void)
 }
 
 //Get the top left point of the corresponding icon position)
-GUI_POINT getIconStartPoint(int index){
-  GUI_POINT p = {curRect[index].x0,curRect[index].y0};
+GUI_POINT getIconStartPoint(int index)
+{
+  GUI_POINT p = {curRect[index].x0, curRect[index].y0};
   return p;
 }
 
 void loopBackEnd(void)
 {
-  getGcodeFromFile();                 //Get Gcode command from the file to be printed
+  getGcodeFromFile(); //Get Gcode command from the file to be printed
 
-  sendQueueCmd();                     //Parse and send Gcode commands in the queue
+  sendQueueCmd(); //Parse and send Gcode commands in the queue
 
-  parseACK();                         //Parse the received slave response information
+  parseACK(); //Parse the received slave response information
 
-  parseRcvGcode();                    //Parse the received Gcode from other UART, such as: ESP3D, etc...
+  parseRcvGcode(); //Parse the received Gcode from other UART, such as: ESP3D, etc...
 
-  loopCheckHeater();                  //Temperature monitor
+  loopCheckHeater(); //Temperature monitor
 
-  loopFan();                          //Fan speed monitor
+  loopFan(); //Fan speed monitor
 
-  loopSpeed();                        //Speed & flow monitor
+  loopSpeed(); //Speed & flow monitor
 
   #ifdef BUZZER_PIN
     loopBuzzer();
   #endif
 
-  if(infoMachineSettings.onboard_sd_support == ENABLED)
+  if (infoMachineSettings.onboard_sd_support == ENABLED)
   {
     loopCheckPrinting(); //Check if there is a SD or USB print running.
   }
@@ -757,11 +815,11 @@ void loopBackEnd(void)
 
   #if LCD_ENCODER_SUPPORT
     #if defined(ST7920_SPI) || defined(LCD2004_simulator)
-      if(infoMenu.menu[infoMenu.cur] != menuMarlinMode)
+      if (infoMenu.menu[infoMenu.cur] != menuMarlinMode)
     #endif
-      {
-        loopCheckEncoderSteps(); //check change in encoder steps
-      }
+    {
+      loopCheckEncoderSteps(); //check change in encoder steps
+    }
   #endif
 
   #if defined(ST7920_SPI) || defined(LCD2004_simulator)
@@ -776,29 +834,62 @@ void loopBackEnd(void)
     loopDimTimer();
   #endif
 
-  if(infoMachineSettings.caseLightsBrightness == ENABLED)
+  if (infoSettings.event_led_mode)
+  {
+    setEventLedModeColor();
+  }
+
+  if (infoSettings.preheatDoneSound)
+  {
+    volatile bool preheatNotification;
+    if (preheatNotification && heatGetTargetTemp(heatGetCurrentHotend()) == 0 && heatGetTargetTemp(BED))
+    {
+      //No target set. No notification needed
+      preheatNotification = false;
+    }
+    else if (preheatNotification &&
+            heatGetCurrentTemp(heatGetCurrentHotend()) >= heatGetTargetTemp(heatGetCurrentHotend()) &&
+            heatGetCurrentTemp(BED) >= heatGetTargetTemp(BED))
+    {
+      // Preheat finished. Sound the notification
+      BUZZER_PLAY(sound_preheatDone);
+      preheatNotification = false;
+    }
+    else if (infoMenu.menu[infoMenu.cur] == menuPreheat &&
+            (heatGetCurrentTemp(heatGetCurrentHotend()) < heatGetTargetTemp(heatGetCurrentHotend()) - 10 || 
+              heatGetCurrentTemp(BED) < heatGetTargetTemp(BED) - 10
+            ) && !preheatNotification)
+    {
+      //Set preheatnotification to true when the current temp is smalles then the target - 10C
+      // From now on it doesn't matter in which menu you are.
+      preheatNotification = true;
+    }
+  }
+
+  if (infoMachineSettings.caseLightsBrightness == ENABLED)
   {
     loopCaseLight();
   }
+
 } //loopBackEnd
 
 void loopFrontEnd(void)
 {
-  loopVolumeSource();                 //Check if volume source(SD/U disk) insert
+  loopVolumeSource(); //Check if volume source(SD/U disk) insert
 
   loopToast();
 
-  loopReminderClear();                //If there is a message in the status bar, timed clear
+  loopReminderClear(); //If there is a message in the status bar, timed clear
 
   loopVolumeReminderClear();
 
-  loopBusySignClear();                //Busy Indicator clear
+  loopBusySignClear(); //Busy Indicator clear
 
   loopTemperatureStatus();
 
-#ifdef FIL_RUNOUT_PIN
-  loopFrontEndFILRunoutDetect();
-#endif
+  #ifdef FIL_RUNOUT_PIN
+    loopFrontEndFILRunoutDetect();
+  #endif
 
   loopPopup();
 }
diff --git a/TFT/src/User/API/menu.h b/TFT/src/User/API/menu.h
index 5adfda71ff..3908b2f5ae 100644
--- a/TFT/src/User/API/menu.h
+++ b/TFT/src/User/API/menu.h
@@ -1,5 +1,4 @@
-#ifndef _MENU_H_
-#define _MENU_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -182,5 +181,3 @@ void loopProcess (void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/API/parseACK.c b/TFT/src/User/API/parseACK.c
index a6b9bf92cd..6eb57303e8 100644
--- a/TFT/src/User/API/parseACK.c
+++ b/TFT/src/User/API/parseACK.c
@@ -52,7 +52,7 @@ static char ack_seen(const char *str)
   {
     for(i=0; str[i]!=0 && dmaL2Cache[ack_index+i]!=0 && dmaL2Cache[ack_index+i]==str[i]; i++)
     {}
-    if(str[i]==0)
+    if (str[i]==0)
     {
       ack_index += i;
       return true;
@@ -66,10 +66,10 @@ static char ack_cmp(const char *str)
   u16 i;
   for(i=0; i<ACK_MAX_SIZE && str[i]!=0 && dmaL2Cache[i]!=0; i++)
   {
-    if(str[i] != dmaL2Cache[i])
+    if (str[i] != dmaL2Cache[i])
     return false;
   }
-  if(dmaL2Cache[i] != 0) return false;
+  if (dmaL2Cache[i] != 0) return false;
   return true;
 }
 
@@ -82,7 +82,7 @@ static float ack_value()
 static float ack_second_value()
 {
   char *secondValue = strchr(&dmaL2Cache[ack_index],'/');
-  if(secondValue != NULL)
+  if (secondValue != NULL)
   {
     return (strtod(secondValue+1, NULL));
   }
@@ -189,39 +189,39 @@ void hostActionCommands(void)
 {
   char *find = strchr(dmaL2Cache + ack_index, '\n');
   *find = '\0';
-  if(ack_seen("notification "))
+  if (ack_seen("notification "))
   {
     strcpy(hostAction.prompt_begin, dmaL2Cache + ack_index);
     statusScreen_setMsg((u8 *)echomagic, (u8 *)dmaL2Cache + ack_index);
   }
-  
-  if(ack_seen("prompt_begin "))
+
+  if (ack_seen("prompt_begin "))
   {
     hostAction.button = 0;
     hostAction.prompt_show = 1;
     strcpy(hostAction.prompt_begin, dmaL2Cache + ack_index);
-    if(ack_seen("Resuming SD"))
+    if (ack_seen("Resuming SD"))
     {
       hostAction.prompt_show = 0;
     }
-    else if(ack_seen("Resuming"))
+    else if (ack_seen("Resuming"))
     {
       infoPrinting.pause = false;
       hostAction.prompt_show = 0;
     }
-    else if(ack_seen("Reheating"))
+    else if (ack_seen("Reheating"))
     {
       hostAction.prompt_show = 0;
     }
-    else if(ack_seen("Nozzle Parked"))
+    else if (ack_seen("Nozzle Parked"))
     {
       infoPrinting.pause = true;
     }
   }
-  else if(ack_seen("prompt_button "))
+  else if (ack_seen("prompt_button "))
   {
     hostAction.button++;
-    if(hostAction.button == 1)
+    if (hostAction.button == 1)
     {
       strcpy(hostAction.prompt_button1, dmaL2Cache + ack_index);
     }
@@ -231,7 +231,7 @@ void hostActionCommands(void)
     }
   }
 
-  if(ack_seen("prompt_show") && hostAction.prompt_show)
+  if (ack_seen("prompt_show") && hostAction.prompt_show)
   {
     switch(hostAction.button)
     {
@@ -284,13 +284,13 @@ void parseACK(void)
       if (ack_seen(heaterID[CHAMBER])) infoSettings.chamber_en = ENABLED;
       uint8_t i;
       for (i = NOZZLE0; i < MAX_HOTEND_COUNT; i++) {
-        if(!ack_seen(heaterID[i])) break;
+        if (!ack_seen(heaterID[i])) break;
       }
       infoSettings.hotend_count = i ? i : 1;
       if (infoSettings.ext_count < infoSettings.hotend_count) infoSettings.ext_count = infoSettings.hotend_count;
       updateNextHeatCheckTime();
       infoHost.connected = true;
-      if(infoMachineSettings.isMarlinFirmware == -1) // if never connected to the printer since boot
+      if (infoMachineSettings.isMarlinFirmware == -1) // if never connected to the printer since boot
       {
         storeCmd("M503\n");  // Query detailed printer capabilities
         storeCmd("M92\n");   // Steps/mm of extruder is an important parameter for Smart filament runout
@@ -303,7 +303,7 @@ void parseACK(void)
 
     // Onboard sd Gcode command response
 
-    if(requestCommandInfo.inWaitResponse)
+    if (requestCommandInfo.inWaitResponse)
     {
       if (ack_seen(requestCommandInfo.startMagic))
       {
@@ -324,9 +324,9 @@ void parseACK(void)
         goto parse_end;
       }
     }
-    if(requestCommandInfo.inResponse)
+    if (requestCommandInfo.inResponse)
     {
-      if(strlen(requestCommandInfo.cmd_rev_buf)+strlen(dmaL2Cache) < CMD_MAX_REV)
+      if (strlen(requestCommandInfo.cmd_rev_buf)+strlen(dmaL2Cache) < CMD_MAX_REV)
       {
         strcat(requestCommandInfo.cmd_rev_buf, dmaL2Cache);
         if (ack_seen(requestCommandInfo.stopMagic))
@@ -346,30 +346,30 @@ void parseACK(void)
     }
     // Onboard sd Gcode command response end
 
-    if(ack_cmp("ok\n"))
+    if (ack_cmp("ok\n"))
     {
       infoHost.wait = false;
     }
     else
     {
-      if(ack_seen("ok"))
+      if (ack_seen("ok"))
       {
         infoHost.wait = false;
       }
       // parse temperature
-      if((ack_seen("@") && ack_seen("T:")) || ack_seen("T0:"))
+      if ((ack_seen("@") && ack_seen("T:")) || ack_seen("T0:"))
       {
         heatSetCurrentTemp(NOZZLE0, ack_value()+0.5f);
-        if(!heatGetSendWaiting(NOZZLE0)) {
+        if (!heatGetSendWaiting(NOZZLE0)) {
           heatSyncTargetTemp(NOZZLE0, ack_second_value()+0.5f);
         }
         for(uint8_t i = 0; i < MAX_HEATER_COUNT; i++)
         {
-          if(!heaterIsValid(i)) continue;
-          if(ack_seen(heaterID[i]))
+          if (!heaterIsValid(i)) continue;
+          if (ack_seen(heaterID[i]))
           {
             heatSetCurrentTemp(i, ack_value()+0.5f);
-            if(!heatGetSendWaiting(i)) {
+            if (!heatGetSendWaiting(i)) {
               heatSyncTargetTemp(i, ack_second_value()+0.5f);
             }
           }
@@ -377,7 +377,7 @@ void parseACK(void)
         avoid_terminal = !infoSettings.terminalACK;
         updateNextHeatCheckTime();
       }
-      else if((ack_seen("X:") && ack_index == 2) || ack_seen("C: X:")) // Smoothieware axis position starts with "C: X:"
+      else if ((ack_seen("X:") && ack_index == 2) || ack_seen("C: X:")) // Smoothieware axis position starts with "C: X:"
       {
         coordinateSetAxisActual(X_AXIS, ack_value());
         if (ack_seen("Y:"))
@@ -390,11 +390,11 @@ void parseACK(void)
         }
         coordinateQuerySetWait(false);
       }
-      else if(ack_seen("Count E:")) // Parse actual extruder position, response of "M114 E\n", required "M114_DETAIL" in Marlin
+      else if (ack_seen("Count E:")) // Parse actual extruder position, response of "M114 E\n", required "M114_DETAIL" in Marlin
       {
         coordinateSetAxisActualSteps(E_AXIS, ack_value());
       }
-      else if(infoMachineSettings.onboard_sd_support == ENABLED && ack_seen("File opened: "))
+      else if (infoMachineSettings.onboard_sd_support == ENABLED && ack_seen("File opened: "))
       {
         // File opened: 1A29A~1.GCO Size: 6974
         uint16_t start_index = ack_index;
@@ -412,13 +412,13 @@ void parseACK(void)
         infoPrinting.cur = 0;
         infoPrinting.size = ack_value();
       }
-      else if(infoMachineSettings.onboard_sd_support == ENABLED && infoFile.source == BOARD_SD && ack_seen("Not SD printing"))
+      else if (infoMachineSettings.onboard_sd_support == ENABLED && infoFile.source == BOARD_SD && ack_seen("Not SD printing"))
       {
         infoHost.printing = false;
         if (infoPrinting.printing)
           infoPrinting.pause = true;
       }
-      else if(infoMachineSettings.onboard_sd_support == ENABLED && infoFile.source == BOARD_SD && ack_seen("SD printing byte"))
+      else if (infoMachineSettings.onboard_sd_support == ENABLED && infoFile.source == BOARD_SD && ack_seen("SD printing byte"))
       {
         infoPrinting.pause = false;
         // Parsing printing data
@@ -426,92 +426,106 @@ void parseACK(void)
         infoPrinting.cur = ack_value();
   //      powerFailedCache(position);
       }
-      else if(infoMachineSettings.onboard_sd_support == ENABLED && infoFile.source == BOARD_SD && ack_seen("Done printing file"))
+      else if (infoMachineSettings.onboard_sd_support == ENABLED && infoFile.source == BOARD_SD && ack_seen("Done printing file"))
       {
         infoPrinting.printing = false;
         infoPrinting.cur = infoPrinting.size;
       }
 
     //parse and store stepper steps/mm values
-      else if(ack_seen("M92 X"))
+      else if (ack_seen("M92 X"))
       {
                           setParameter(P_STEPS_PER_MM, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_STEPS_PER_MM, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_STEPS_PER_MM, Z_STEPPER, ack_value());
-        if(ack_seen("E")) setParameter(P_STEPS_PER_MM, E_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_STEPS_PER_MM, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_STEPS_PER_MM, Z_STEPPER, ack_value());
+        if (ack_seen("E")) setParameter(P_STEPS_PER_MM, E_STEPPER, ack_value());
       }
-      else if(ack_seen("M92 T0 E")){
+      else if (ack_seen("M92 T0 E"))
+      {
         setParameter(P_STEPS_PER_MM, E_STEPPER, ack_value());
       }
-      else if(ack_seen("M92 T1 E")){
+      else if (ack_seen("M92 T1 E"))
+      {
         setParameter(P_STEPS_PER_MM, E2_STEPPER, ack_value());
         setDualStepperStatus(E_STEPPER, true);
       }
     //parse and store Max Feed Rate values
-      else if(ack_seen("M203 X")){
-                          setParameter(P_MAX_FEED_RATE, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_MAX_FEED_RATE, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_MAX_FEED_RATE, Z_STEPPER, ack_value());
-        if(ack_seen("E")) setParameter(P_MAX_FEED_RATE, E_STEPPER, ack_value());
+      else if(ack_seen("M203 X"))
+      {
+                           setParameter(P_MAX_FEED_RATE, X_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_MAX_FEED_RATE, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_MAX_FEED_RATE, Z_STEPPER, ack_value());
+        if (ack_seen("E")) setParameter(P_MAX_FEED_RATE, E_STEPPER, ack_value());
       }
-      else if(ack_seen("M203 T0 E")){
+      else if (ack_seen("M203 T0 E"))
+      {
         setParameter(P_MAX_FEED_RATE, E_STEPPER, ack_value());
       }
-      else if(ack_seen("M203 T1 E")){
+      else if (ack_seen("M203 T1 E"))
+      {
         setParameter(P_MAX_FEED_RATE, E2_STEPPER, ack_value());
         setDualStepperStatus(E_STEPPER, true);
       }
     //parse and store Max Acceleration values
-      else if(ack_seen("M201 X")){
+      else if (ack_seen("M201 X"))
+      {
                           setParameter(P_MAX_ACCELERATION, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_MAX_ACCELERATION, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_MAX_ACCELERATION, Z_STEPPER, ack_value());
-        if(ack_seen("E")) setParameter(P_MAX_ACCELERATION, E_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_MAX_ACCELERATION, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_MAX_ACCELERATION, Z_STEPPER, ack_value());
+        if (ack_seen("E")) setParameter(P_MAX_ACCELERATION, E_STEPPER, ack_value());
 
       }
-      else if(ack_seen("M201 T0 E")){
+      else if (ack_seen("M201 T0 E"))
+      {
         setParameter(P_MAX_ACCELERATION, E_STEPPER, ack_value());
       }
-      else if(ack_seen("M201 T1 E")){
+      else if (ack_seen("M201 T1 E"))
+      {
         setParameter(P_MAX_ACCELERATION, E2_STEPPER, ack_value());
         setDualStepperStatus(E_STEPPER, true);
       }
     //parse and store Acceleration values
-      else if(ack_seen("M204 P")){
+      else if (ack_seen("M204 P"))
+      {
                           setParameter(P_ACCELERATION, 0, ack_value());
-        if(ack_seen("R")) setParameter(P_ACCELERATION, 1, ack_value());
-        if(ack_seen("T")) setParameter(P_ACCELERATION, 2, ack_value());
+        if (ack_seen("R")) setParameter(P_ACCELERATION, 1, ack_value());
+        if (ack_seen("T")) setParameter(P_ACCELERATION, 2, ack_value());
       }
     //parse and store jerk values
-      else if(ack_seen("M205")){
-        if(ack_seen("X")) setParameter(P_JERK, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_JERK, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_JERK, Z_STEPPER, ack_value());
-        if(ack_seen("E")) setParameter(P_JERK, E_STEPPER, ack_value());
-        if(ack_seen("J")) setParameter(P_JUNCTION_DEVIATION, 0, ack_value());
+      else if (ack_seen("M205"))
+      {
+        if (ack_seen("X")) setParameter(P_JERK, X_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_JERK, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_JERK, Z_STEPPER, ack_value());
+        if (ack_seen("E")) setParameter(P_JERK, E_STEPPER, ack_value());
+        if (ack_seen("J")) setParameter(P_JUNCTION_DEVIATION, 0, ack_value());
       }
     //parse and store Home Offset values
-      else if(ack_seen("M206 X")){
+      else if (ack_seen("M206 X"))
+      {
                           setParameter(P_HOME_OFFSET, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_HOME_OFFSET, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_HOME_OFFSET, Z_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_HOME_OFFSET, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_HOME_OFFSET, Z_STEPPER, ack_value());
       }
     //parse and store FW retraction values
-      else if(ack_seen("M207 S")){
+      else if (ack_seen("M207 S"))
+      {
                           setParameter(P_FWRETRACT, 0, ack_value());
-        if(ack_seen("W")) setParameter(P_FWRETRACT, 1, ack_value());
-        if(ack_seen("F")) setParameter(P_FWRETRACT, 2, ack_value());
-        if(ack_seen("Z")) setParameter(P_FWRETRACT, 3, ack_value());
+        if (ack_seen("W")) setParameter(P_FWRETRACT, 1, ack_value());
+        if (ack_seen("F")) setParameter(P_FWRETRACT, 2, ack_value());
+        if (ack_seen("Z")) setParameter(P_FWRETRACT, 3, ack_value());
       }
     //parse and store FW recover values
-      else if(ack_seen("M208 S")){
+      else if (ack_seen("M208 S"))
+      {
                           setParameter(P_FWRECOVER, 0, ack_value());
-        if(ack_seen("W")) setParameter(P_FWRECOVER, 1, ack_value());
-        if(ack_seen("F")) setParameter(P_FWRECOVER, 2, ack_value());
-        if(ack_seen("R")) setParameter(P_FWRECOVER, 3, ack_value());
+        if (ack_seen("W")) setParameter(P_FWRECOVER, 1, ack_value());
+        if (ack_seen("F")) setParameter(P_FWRECOVER, 2, ack_value());
+        if (ack_seen("R")) setParameter(P_FWRECOVER, 3, ack_value());
       }
     //parse and store auto FW retract state (M209 - Set Auto Retract)
-      else if(ack_seen("M209 S")){
+      else if (ack_seen("M209 S"))
+      {
                           setParameter(P_AUTO_RETRACT, 0, ack_value());
       }
     //parse and store the software endstops state (M211)
@@ -528,62 +542,75 @@ void parseACK(void)
           addToast(DIALOG_TYPE_INFO, dmaL2Cache);
       }
     //parse and store Offset 2nd Nozzle
-      else if(ack_seen("M218 T1 X")){
+      else if (ack_seen("M218 T1 X"))
+      {
                           setParameter(P_OFFSET_TOOL, 0, ack_value());
-        if(ack_seen("Y")) setParameter(P_OFFSET_TOOL, 1, ack_value());
-        if(ack_seen("Z")) setParameter(P_OFFSET_TOOL, 2, ack_value());
+        if (ack_seen("Y")) setParameter(P_OFFSET_TOOL, 1, ack_value());
+        if (ack_seen("Z")) setParameter(P_OFFSET_TOOL, 2, ack_value());
       }
     //parse and store Probe Offset values
-      else if(ack_seen("M851 X")){
+      else if (ack_seen("M851 X"))
+      {
                           setParameter(P_PROBE_OFFSET, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_PROBE_OFFSET, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_PROBE_OFFSET, Z_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_PROBE_OFFSET, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_PROBE_OFFSET, Z_STEPPER, ack_value());
       }
     //parse and store linear advance values
-      else if(ack_seen("M900 K")){
+      else if (ack_seen("M900 K"))
+      {
                           setParameter(P_LIN_ADV, 0, ack_value());
       }
-      else if(ack_seen("M900 T0 K")){
+      else if (ack_seen("M900 T0 K"))
+      {
                           setParameter(P_LIN_ADV, 0, ack_value());
       }
-      else if(ack_seen("M900 T1 K")){
+      else if (ack_seen("M900 T1 K"))
+      {
                           setParameter(P_LIN_ADV, 1, ack_value());
       }
     //parse and store stepper driver current values
-      else if(ack_seen("M906 X")){
+      else if (ack_seen("M906 X"))
+      {
                           setParameter(P_CURRENT, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_CURRENT, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_CURRENT, Z_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_CURRENT, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_CURRENT, Z_STEPPER, ack_value());
       }
-      else if(ack_seen("M906 I1")){
-        if(ack_seen("X")) setDualStepperStatus(X_STEPPER, true);
-        if(ack_seen("Y")) setDualStepperStatus(Y_STEPPER, true);
-        if(ack_seen("Z")) setDualStepperStatus(Z_STEPPER, true);
+      else if (ack_seen("M906 I1"))
+      {
+        if (ack_seen("X")) setDualStepperStatus(X_STEPPER, true);
+        if (ack_seen("Y")) setDualStepperStatus(Y_STEPPER, true);
+        if (ack_seen("Z")) setDualStepperStatus(Z_STEPPER, true);
       }
-      else if(ack_seen("M906 T0 E")){
+      else if (ack_seen("M906 T0 E"))
+      {
         setParameter(P_CURRENT, E_STEPPER, ack_value());
       }
-      else if(ack_seen("M906 T1 E")){
+      else if (ack_seen("M906 T1 E"))
+      {
         setParameter(P_CURRENT, E2_STEPPER, ack_value());
         setDualStepperStatus(E_STEPPER, true);
       }
       //parse and store TMC Bump sensitivity values
-      else if(ack_seen("M914 X")){
+      else if (ack_seen("M914 X"))
+      {
                           setParameter(P_BUMPSENSITIVITY, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_BUMPSENSITIVITY, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_BUMPSENSITIVITY, Z_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_BUMPSENSITIVITY, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_BUMPSENSITIVITY, Z_STEPPER, ack_value());
       }
     // parse and store TMC Hybrid Threshold Speed
-      else if(ack_seen("M913 X")){
+      else if (ack_seen("M913 X"))
+      {
                           setParameter(P_HYBRID_THRESHOLD, X_STEPPER, ack_value());
-        if(ack_seen("Y")) setParameter(P_HYBRID_THRESHOLD, Y_STEPPER, ack_value());
-        if(ack_seen("Z")) setParameter(P_HYBRID_THRESHOLD, Z_STEPPER, ack_value());
-        if(ack_seen("E")) setParameter(P_HYBRID_THRESHOLD, E_STEPPER, ack_value());
+        if (ack_seen("Y")) setParameter(P_HYBRID_THRESHOLD, Y_STEPPER, ack_value());
+        if (ack_seen("Z")) setParameter(P_HYBRID_THRESHOLD, Z_STEPPER, ack_value());
+        if (ack_seen("E")) setParameter(P_HYBRID_THRESHOLD, E_STEPPER, ack_value());
       }
-      else if(ack_seen("M913 T0 E")){
+      else if (ack_seen("M913 T0 E"))
+      {
                           setParameter(P_HYBRID_THRESHOLD, E_STEPPER, ack_value());
       }
-      else if(ack_seen("M913 T1 E")){
+      else if (ack_seen("M913 T1 E"))
+      {
                           setParameter(P_HYBRID_THRESHOLD, E2_STEPPER, ack_value());
                           setDualStepperStatus(E_STEPPER, true);
       }
@@ -597,7 +624,7 @@ void parseACK(void)
         infoMachineSettings.leveling = BL_MBL;
     #endif
     // Parse ABL state
-      else if(ack_seen("echo:Bed Leveling"))
+      else if (ack_seen("echo:Bed Leveling"))
       {
         if (ack_seen("ON"))
           setParameter(P_ABL_STATE, 0, ENABLED);
@@ -605,12 +632,12 @@ void parseACK(void)
           setParameter(P_ABL_STATE, 0, DISABLED);
       }
     // Parse and store ABL on/off state & Z fade value on M503
-      else if(ack_seen("M420 S")) {
-        if(ack_seen("S")) setParameter(P_ABL_STATE, 0, ack_value());
-        if(ack_seen("Z")) setParameter(P_ABL_STATE, 1, ack_value());
+      else if (ack_seen("M420 S")) {
+        if (ack_seen("S")) setParameter(P_ABL_STATE, 0, ack_value());
+        if (ack_seen("Z")) setParameter(P_ABL_STATE, 1, ack_value());
       }
     // Parse M115 capability report
-      else if(ack_seen("FIRMWARE_NAME:"))
+      else if (ack_seen("FIRMWARE_NAME:"))
       {
         uint8_t *string = (uint8_t *)&dmaL2Cache[ack_index];
         uint16_t string_start = ack_index;
@@ -646,11 +673,11 @@ void parseACK(void)
           infoSetMachineType(string, string_end - string_start); // Set firmware name
         }
       }
-      else if(ack_seen("Cap:EEPROM:"))
+      else if (ack_seen("Cap:EEPROM:"))
       {
         infoMachineSettings.EEPROM = ack_value();
       }
-      else if(ack_seen("Cap:AUTOREPORT_TEMP:"))
+      else if (ack_seen("Cap:AUTOREPORT_TEMP:"))
       {
         infoMachineSettings.autoReportTemp = ack_value();
         if (infoMachineSettings.autoReportTemp)
@@ -658,98 +685,100 @@ void parseACK(void)
           storeCmd("M155 ");
         }
       }
-      else if(ack_seen("Cap:AUTOLEVEL:") && infoMachineSettings.leveling == BL_DISABLED)
+      else if (ack_seen("Cap:AUTOLEVEL:") && infoMachineSettings.leveling == BL_DISABLED)
       {
         infoMachineSettings.leveling = ack_value();
       }
-      else if(ack_seen("Cap:Z_PROBE:"))
+      else if (ack_seen("Cap:Z_PROBE:"))
       {
         infoMachineSettings.zProbe = ack_value();
       }
-      else if(ack_seen("Cap:LEVELING_DATA:"))
+      else if (ack_seen("Cap:LEVELING_DATA:"))
       {
         infoMachineSettings.levelingData = ack_value();
       }
-      else if(ack_seen("Cap:SOFTWARE_POWER:"))
+      else if (ack_seen("Cap:SOFTWARE_POWER:"))
       {
         infoMachineSettings.softwarePower = ack_value();
       }
-      else if(ack_seen("Cap:TOGGLE_LIGHTS:"))
+      else if (ack_seen("Cap:TOGGLE_LIGHTS:"))
       {
         infoMachineSettings.toggleLights = ack_value();
       }
-      else if(ack_seen("Cap:CASE_LIGHT_BRIGHTNESS:"))
+      else if (ack_seen("Cap:CASE_LIGHT_BRIGHTNESS:"))
       {
         infoMachineSettings.caseLightsBrightness = ack_value();
       }
-      else if(ack_seen("Cap:EMERGENCY_PARSER:"))
+      else if (ack_seen("Cap:EMERGENCY_PARSER:"))
       {
         infoMachineSettings.emergencyParser = ack_value();
       }
-      else if(ack_seen("Cap:PROMPT_SUPPORT:"))
+      else if (ack_seen("Cap:PROMPT_SUPPORT:"))
       {
         infoMachineSettings.promptSupport = ack_value();
       }
-      else if(ack_seen("Cap:SDCARD:") && infoSettings.onboardSD == AUTO)
+      else if (ack_seen("Cap:SDCARD:") && infoSettings.onboardSD == AUTO)
       {
         infoMachineSettings.onboard_sd_support = ack_value();
       }
-      else if(ack_seen("Cap:AUTOREPORT_SD_STATUS:"))
+      else if (ack_seen("Cap:AUTOREPORT_SD_STATUS:"))
       {
         infoMachineSettings.autoReportSDStatus = ack_value();
       }
-      else if(ack_seen("Cap:LONG_FILENAME:") && infoSettings.longFileName == AUTO)
+      else if (ack_seen("Cap:LONG_FILENAME:") && infoSettings.longFileName == AUTO)
       {
         infoMachineSettings.long_filename_support = ack_value();
       }
-      else if(ack_seen("Cap:BABYSTEPPING:"))
+      else if (ack_seen("Cap:BABYSTEPPING:"))
       {
         infoMachineSettings.babyStepping = ack_value();
       }
-      else if(ack_seen("Cap:CHAMBER_TEMPERATURE:"))
+      else if (ack_seen("Cap:CHAMBER_TEMPERATURE:"))
       {
         infoSettings.chamber_en = ack_value();
         setupMachine();
       }
-      else if(ack_seen("work:"))
+      else if (ack_seen("work:"))
       {
-        if(ack_seen("min:")){
-          if(ack_seen("X:")) infoSettings.machine_size_min[X_AXIS] = ack_value();
-          if(ack_seen("Y:")) infoSettings.machine_size_min[Y_AXIS] = ack_value();
-          if(ack_seen("Z:")) infoSettings.machine_size_min[Z_AXIS] = ack_value();
+        if (ack_seen("min:"))
+        {
+          if (ack_seen("X:")) infoSettings.machine_size_min[X_AXIS] = ack_value();
+          if (ack_seen("Y:")) infoSettings.machine_size_min[Y_AXIS] = ack_value();
+          if (ack_seen("Z:")) infoSettings.machine_size_min[Z_AXIS] = ack_value();
         }
-        if(ack_seen("max:")){
-          if(ack_seen("X:")) infoSettings.machine_size_min[X_AXIS] = ack_value();
-          if(ack_seen("Y:")) infoSettings.machine_size_min[Y_AXIS] = ack_value();
-          if(ack_seen("Z:")) infoSettings.machine_size_min[Z_AXIS] = ack_value();
+        if (ack_seen("max:"))
+        {
+          if (ack_seen("X:")) infoSettings.machine_size_min[X_AXIS] = ack_value();
+          if (ack_seen("Y:")) infoSettings.machine_size_min[Y_AXIS] = ack_value();
+          if (ack_seen("Z:")) infoSettings.machine_size_min[Z_AXIS] = ack_value();
         }
       }
     //parse Repeatability Test
-      else if(ack_seen("Mean:"))
+      else if (ack_seen("Mean:"))
       {
         popupReminder(DIALOG_TYPE_INFO, (u8* )"Repeatability Test", (u8 *)dmaL2Cache + ack_index-5);
       }
-      else if(ack_seen("Probe Offset"))
+      else if (ack_seen("Probe Offset"))
       {
-        if(ack_seen("Z:") || (ack_seen("Z")))
+        if (ack_seen("Z:") || (ack_seen("Z")))
         {
           setParameter(P_PROBE_OFFSET,Z_STEPPER, ack_value());
         }
       }
     // parse and store feed rate percentage
-      else if(ack_seen("FR:"))
+      else if (ack_seen("FR:"))
       {
         speedSetRcvPercent(0,ack_value());
         speedQuerySetWait(false);
       }
     // parse and store flow rate percentage
-      else if(ack_seen("Flow: "))
+      else if (ack_seen("Flow: "))
       {
         speedSetRcvPercent(1,ack_value());
         speedQuerySetWait(false);
       }
     // parse fan speed
-      else if(ack_seen("M106 P"))
+      else if (ack_seen("M106 P"))
       {
         u8 i = ack_value();
         if (ack_seen("S")) {
@@ -757,7 +786,7 @@ void parseACK(void)
         }
       }
     // parse controller fan
-      else if(ack_seen("M710"))
+      else if (ack_seen("M710"))
       {
         u8 i = 0;
         if (ack_seen("S")) {
@@ -771,40 +800,40 @@ void parseACK(void)
           fanSpeedQuerySetWait(false);
         }
       }
-      else if(ack_seen("Case light: OFF"))
+      else if (ack_seen("Case light: OFF"))
       {
         caseLightSetState(false);
         caseLightQuerySetWait(false);
       }
-      else if(ack_seen("Case light: "))
+      else if (ack_seen("Case light: "))
       {
         caseLightSetState(true);
         caseLightSetBrightness(ack_value());
         caseLightQuerySetWait(false);
       }
     // Parse pause message
-      else if(!infoMachineSettings.promptSupport && ack_seen("paused for user"))
+      else if (!infoMachineSettings.promptSupport && ack_seen("paused for user"))
       {
         setDialogText((u8*)"Printer is Paused",(u8*)"Paused for user\ncontinue?", LABEL_CONFIRM, LABEL_BACKGROUND);
         showDialog(DIALOG_TYPE_QUESTION, breakAndContinue, NULL,NULL);
       }
     // Parse ABL Complete message
-      else if(ack_seen("ABL Complete"))
+      else if (ack_seen("ABL Complete"))
       {
         ablUpdateStatus(true);
       }
     // Parse BBL Complete message
-      else if(ack_seen("BBL Complete"))
+      else if (ack_seen("BBL Complete"))
       {
         ablUpdateStatus(true);
       }
     // Parse UBL Complete message
-      else if(ack_seen("UBL Complete"))
+      else if (ack_seen("UBL Complete"))
       {
         ablUpdateStatus(true);
       }
     // Parse MBL Complete message
-      else if(ack_seen("Mesh probing done"))
+      else if (ack_seen("Mesh probing done"))
       {
         mblUpdateStatus(true);
       }
@@ -823,27 +852,27 @@ void parseACK(void)
         meshUpdateData(dmaL2Cache);                        // continue data updating
       }
     // Parse PID Autotune finished message
-      else if(ack_seen("PID Autotune finished"))
+      else if (ack_seen("PID Autotune finished"))
       {
         pidUpdateStatus(true);
       }
     // Parse PID Autotune failed message
-      else if(ack_seen("PID Autotune failed"))
+      else if (ack_seen("PID Autotune failed"))
       {
         pidUpdateStatus(false);
       }
     // Parse "HOST_ACTION_COMMANDS"
-      else if(ack_seen("//action:"))
+      else if (ack_seen("//action:"))
       {
         hostActionCommands();
       }
     //Parse error messages & Echo messages
-      else if(ack_seen(errormagic))
+      else if (ack_seen(errormagic))
       {
         ackPopupInfo(errormagic);
       }
     // if no known echo was found and processed, then popup the echo message
-      else if(ack_seen(echomagic))
+      else if (ack_seen(echomagic))
       {
         if (!processKnownEcho())
         {
@@ -853,7 +882,7 @@ void parseACK(void)
     }
 
   parse_end:
-    if(ack_cur_src != SERIAL_PORT)
+    if (ack_cur_src != SERIAL_PORT)
     {
       Serial_Puts(ack_cur_src, dmaL2Cache);
     }
@@ -883,7 +912,7 @@ void parseRcvGcode(void)
     uint8_t i = 0;
     for(i = 0; i < _UART_CNT; i++)
     {
-      if(i != SERIAL_PORT && infoHost.rx_ok[i] == true)
+      if (i != SERIAL_PORT && infoHost.rx_ok[i] == true)
       {
         infoHost.rx_ok[i] = false;
         while(dmaL1NotEmpty(i))
diff --git a/TFT/src/User/API/parseACK.h b/TFT/src/User/API/parseACK.h
index bad38ab1a7..23f6621e91 100644
--- a/TFT/src/User/API/parseACK.h
+++ b/TFT/src/User/API/parseACK.h
@@ -1,5 +1,4 @@
-#ifndef _PARSEACK_H_
-#define _PARSEACK_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -55,6 +54,3 @@ void setIgnoreEcho(ECHO_ID msgId, bool state);
 #ifdef __cplusplus
 }
 #endif
-
-
-#endif
diff --git a/TFT/src/User/API/printf/printf.h b/TFT/src/User/API/printf/printf.h
index 1d7413fefc..31a39bc997 100644
--- a/TFT/src/User/API/printf/printf.h
+++ b/TFT/src/User/API/printf/printf.h
@@ -28,9 +28,7 @@
 //        These routines are thread safe and reentrant.
 //
 ///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _PRINTF_H_
-#define _PRINTF_H_
+#pragma once
 
 #include <stdarg.h>
 #include <stddef.h>
@@ -137,6 +135,3 @@ int fctprintf(void (*out)(char character, void* arg), void* arg, const char* for
 #ifdef __cplusplus
 }
 #endif
-
-
-#endif  // _PRINTF_H_
diff --git a/TFT/src/User/Configuration.h b/TFT/src/User/Configuration.h
index e56b8e38b0..aa840148bb 100644
--- a/TFT/src/User/Configuration.h
+++ b/TFT/src/User/Configuration.h
@@ -1,5 +1,5 @@
-#ifndef _CONFIGURATION_H_
-#define _CONFIGURATION_H_
+#pragma once
+
 #define CONFIG_VERSION 20200810
 //===========================================================================
 //============================= General Settings ============================
@@ -523,4 +523,3 @@
 // Cancel G-code - run this G-code after canceling print
 #define PRINT_CANCEL_GCODE "G28 XY R10\n" // Home XY and raise Z 10mm
 
-#endif
diff --git a/TFT/src/User/Fatfs/diskio.c b/TFT/src/User/Fatfs/diskio.c
index 29e09c317e..3b7244c3aa 100644
--- a/TFT/src/User/Fatfs/diskio.c
+++ b/TFT/src/User/Fatfs/diskio.c
@@ -101,7 +101,7 @@ DRESULT disk_read (
     return RES_OK;
 
 	case DEV_USB :
-    if(USBH_UDISK_Read(buff, sector, count) == 0)
+    if (USBH_UDISK_Read(buff, sector, count) == 0)
       return RES_OK;
     else
       return RES_ERROR;
@@ -138,7 +138,7 @@ DRESULT disk_write (
     return RES_OK;
 
 	case DEV_USB :
-		if(USBH_UDISK_Write((u8*)buff, sector, count) == 0)
+		if (USBH_UDISK_Write((u8*)buff, sector, count) == 0)
       return RES_OK;
     else
       return RES_ERROR;
diff --git a/TFT/src/User/Fatfs/diskio.h b/TFT/src/User/Fatfs/diskio.h
index 8717ce47c7..7e9bdc3431 100644
--- a/TFT/src/User/Fatfs/diskio.h
+++ b/TFT/src/User/Fatfs/diskio.h
@@ -1,9 +1,8 @@
 /*-----------------------------------------------------------------------/
 /  Low level disk interface modlue include file   (C)ChaN, 2019          /
 /-----------------------------------------------------------------------*/
+#pragma once
 
-#ifndef _DISKIO_DEFINED
-#define _DISKIO_DEFINED
 
 #ifdef __cplusplus
 extern "C" {
@@ -79,5 +78,3 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Fatfs/ff.h b/TFT/src/User/Fatfs/ff.h
index 5225041641..e08cfb9544 100644
--- a/TFT/src/User/Fatfs/ff.h
+++ b/TFT/src/User/Fatfs/ff.h
@@ -17,7 +17,7 @@
 / by use of this software.
 /
 /----------------------------------------------------------------------------*/
-
+#pragma once
 
 #ifndef FF_DEFINED
 #define FF_DEFINED	86606	/* Revision ID */
diff --git a/TFT/src/User/Fatfs/ffconf.h b/TFT/src/User/Fatfs/ffconf.h
index 4b9694d714..7c5612e1bd 100644
--- a/TFT/src/User/Fatfs/ffconf.h
+++ b/TFT/src/User/Fatfs/ffconf.h
@@ -1,3 +1,5 @@
+#pragma once
+
 /*---------------------------------------------------------------------------/
 /  FatFs Functional Configurations
 /---------------------------------------------------------------------------*/
diff --git a/TFT/src/User/Fatfs/myfatfs.c b/TFT/src/User/Fatfs/myfatfs.c
index fd85197e1b..917887ca8e 100644
--- a/TFT/src/User/Fatfs/myfatfs.c
+++ b/TFT/src/User/Fatfs/myfatfs.c
@@ -114,13 +114,13 @@ bool Get_NewestGcode(const TCHAR* path)
   len=strlen(path);
   while (f_readdir(&dirs, &finfo) == FR_OK)
   {
-    if(finfo.fname[0]==0)                           break;
-    if((finfo.fattrib&AM_HID) != 0)                 continue;
+    if (finfo.fname[0]==0)                           break;
+    if ((finfo.fattrib&AM_HID) != 0)                 continue;
 
-    if((finfo.fattrib&AM_DIR) == AM_DIR)
+    if ((finfo.fattrib&AM_DIR) == AM_DIR)
     {
       char  *nextdirpath = malloc(len+strlen(finfo.fname)+2);
-      if(nextdirpath==NULL)                         break;
+      if (nextdirpath==NULL)                         break;
 
       strcpy(nextdirpath, path);
       strcat(nextdirpath,"/");
@@ -132,13 +132,13 @@ bool Get_NewestGcode(const TCHAR* path)
     }
     else
     {
-      if(strstr(finfo.fname,".gcode")==NULL)        continue;
-      if(((finfo.fdate <<16)|finfo.ftime) < date)   continue;
+      if (strstr(finfo.fname,".gcode")==NULL)        continue;
+      if (((finfo.fdate <<16)|finfo.ftime) < date)   continue;
 
       date=(finfo.fdate <<16)|finfo.ftime;
       resetInfoFile();
 
-      if(len+strlen(finfo.fname)+2>MAX_PATH_LEN)    break;
+      if (len+strlen(finfo.fname)+2>MAX_PATH_LEN)    break;
 
       strcpy(infoFile.title,path);
       strcat(infoFile.title,"/");
diff --git a/TFT/src/User/Fatfs/myfatfs.h b/TFT/src/User/Fatfs/myfatfs.h
index 5764e8b6df..c6f5b6bdf1 100644
--- a/TFT/src/User/Fatfs/myfatfs.h
+++ b/TFT/src/User/Fatfs/myfatfs.h
@@ -1,5 +1,4 @@
-#ifndef _MYFATFS_H_
-#define _MYFATFS_H_
+#pragma once
 
 #include "stdbool.h"
 bool mountSDCard(void);
@@ -9,5 +8,3 @@ bool scanPrintFilesFatFs(void);
 bool f_remove_full_dir(const char* path);
 bool f_dir_exists(const char* path);
 bool f_file_exists(const char* path);
-
-#endif
diff --git a/TFT/src/User/Hal/CircularQueue.h b/TFT/src/User/Hal/CircularQueue.h
index f3fd476ad0..b5194ae354 100644
--- a/TFT/src/User/Hal/CircularQueue.h
+++ b/TFT/src/User/Hal/CircularQueue.h
@@ -1,5 +1,4 @@
-#ifndef _CIRCULAR_QUEUE_H_
-#define _CIRCULAR_QUEUE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,5 +19,3 @@ typedef struct
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Hal/HD44780.h b/TFT/src/User/Hal/HD44780.h
index ed72e905de..1ba8c07d29 100644
--- a/TFT/src/User/Hal/HD44780.h
+++ b/TFT/src/User/Hal/HD44780.h
@@ -1,5 +1,4 @@
-#ifndef _HD44780_H
-#define _HD44780_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -16,5 +15,3 @@ bool HD44780_getData(uint8_t *data);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Hal/LCD_Init.c b/TFT/src/User/Hal/LCD_Init.c
index 9e585a3686..ce5485b5b7 100644
--- a/TFT/src/User/Hal/LCD_Init.c
+++ b/TFT/src/User/Hal/LCD_Init.c
@@ -12,6 +12,7 @@ void LCD_LED_On()
     GPIO_SetLevel(LCD_LED_PIN, 1);
   #endif
 }
+
 void LCD_LED_Off()
 {
   #ifdef LCD_LED_PWM_CHANNEL
@@ -64,7 +65,9 @@ const uint32_t LCD_DIM_IDLE_TIME[ITEM_SECONDS_NUM] = {
 void loopDimTimer(void)
 {
   if (infoSettings.lcd_idle_timer == LCD_DIM_OFF)
+  {
     return;
+  }
 
   if (isPress()
     #if LCD_ENCODER_SUPPORT
@@ -77,7 +80,7 @@ void loopDimTimer(void)
       lcd_dim.dimmed = false;
       Set_LCD_Brightness(LCD_BRIGHTNESS[infoSettings.lcd_brightness]);
       #ifdef LED_COLOR_PIN
-        if(infoSettings.knob_led_idle)
+        if (infoSettings.knob_led_idle)
         {
           WS2812_Send_DAT(led_color[infoSettings.knob_led_color]);
         }
@@ -88,14 +91,16 @@ void loopDimTimer(void)
   else
   {
     if (OS_GetTimeMs() - lcd_dim.idle_ms < (LCD_DIM_IDLE_TIME[infoSettings.lcd_idle_timer] * 1000))
+    {
       return;
+    }
 
     if (!lcd_dim.dimmed)
     {
       lcd_dim.dimmed = true;
       Set_LCD_Brightness(LCD_BRIGHTNESS[infoSettings.lcd_idle_brightness]);
       #ifdef LED_COLOR_PIN
-        if(infoSettings.knob_led_idle)
+        if (infoSettings.knob_led_idle)
         {
           WS2812_Send_DAT(led_color[LED_OFF]);
         }
@@ -113,6 +118,12 @@ void _wakeLCD(void)
     {
       lcd_dim.dimmed = false;
       Set_LCD_Brightness(LCD_BRIGHTNESS[infoSettings.lcd_brightness]);
+      #ifdef LED_COLOR_PIN
+        if (infoSettings.knob_led_idle)
+        {
+          WS2812_Send_DAT(led_color[infoSettings.knob_led_color]);
+        }
+      #endif
     }
     //Set a new idle_ms time
     lcd_dim.idle_ms = OS_GetTimeMs();
diff --git a/TFT/src/User/Hal/LCD_Init.h b/TFT/src/User/Hal/LCD_Init.h
index c0e29d2cd2..bb16e115ea 100644
--- a/TFT/src/User/Hal/LCD_Init.h
+++ b/TFT/src/User/Hal/LCD_Init.h
@@ -1,5 +1,4 @@
-#ifndef _LCD_INIT_H_
-#define _LCD_INIT_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,5 +72,3 @@ void LCD_Init(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Hal/STM32Fxx_Pins.h b/TFT/src/User/Hal/STM32Fxx_Pins.h
index 363c5dddfd..787e9fdef3 100644
--- a/TFT/src/User/Hal/STM32Fxx_Pins.h
+++ b/TFT/src/User/Hal/STM32Fxx_Pins.h
@@ -1,5 +1,4 @@
-#ifndef _STM32FXX_PINS_
-#define _STM32FXX_PINS_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -211,5 +210,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_bot.c b/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_bot.c
index 7630551bd1..6984b6bc9a 100644
--- a/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_bot.c
+++ b/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_bot.c
@@ -125,7 +125,7 @@ USBH_BOTXfer_TypeDef USBH_MSC_BOTXferParam;
 */
 void USBH_MSC_Init(USB_OTG_CORE_HANDLE *pdev )
 {
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     USBH_MSC_CBWData.field.CBWSignature = USBH_MSC_BOT_CBW_SIGNATURE;
     USBH_MSC_CBWData.field.CBWTag = USBH_MSC_BOT_CBW_TAG;
@@ -155,7 +155,7 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
 
   URB_STATE URB_Status = URB_IDLE;
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
 
     switch (USBH_MSC_BOTXferParam.BOTState)
@@ -175,7 +175,7 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
     case USBH_MSC_SENT_CBW:
       URB_Status = HCD_GetURB_State(pdev , MSC_Machine.hc_num_out);
 
-      if(URB_Status == URB_DONE)
+      if (URB_Status == URB_DONE)
       {
         BOTStallErrorCount = 0;
         USBH_MSC_BOTXferParam.BOTStateBkp = USBH_MSC_SENT_CBW;
@@ -208,16 +208,16 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
         }
 
       }
-      else if(URB_Status == URB_NOTREADY)
+      else if (URB_Status == URB_NOTREADY)
       {
         USBH_MSC_BOTXferParam.BOTState  = USBH_MSC_BOTXferParam.BOTStateBkp;
       }
-      else if(URB_Status == URB_STALL)
+      else if (URB_Status == URB_STALL)
       {
         error_direction = USBH_MSC_DIR_OUT;
         USBH_MSC_BOTXferParam.BOTState  = USBH_MSC_BOT_ERROR_OUT;
       }
-      else if(URB_Status == URB_ERROR)
+      else if (URB_Status == URB_ERROR)
       {
         xfer_error_count++;
 
@@ -239,12 +239,12 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
 
       URB_Status =   HCD_GetURB_State(pdev , MSC_Machine.hc_num_in);
       /* BOT DATA IN stage */
-      if((URB_Status == URB_DONE) ||(USBH_MSC_BOTXferParam.BOTStateBkp != USBH_MSC_BOT_DATAIN_STATE))
+      if ((URB_Status == URB_DONE) ||(USBH_MSC_BOTXferParam.BOTStateBkp != USBH_MSC_BOT_DATAIN_STATE))
       {
         BOTStallErrorCount = 0;
         USBH_MSC_BOTXferParam.BOTStateBkp = USBH_MSC_BOT_DATAIN_STATE;
 
-        if(remainingDataLength > MSC_Machine.MSBulkInEpSize)
+        if (remainingDataLength > MSC_Machine.MSBulkInEpSize)
         {
           USBH_BulkReceiveData (pdev,
 	                        datapointer,
@@ -269,7 +269,7 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
           remainingDataLength = 0; /* Reset this value and keep in same state */
         }
       }
-      else if(URB_Status == URB_STALL)
+      else if (URB_Status == URB_STALL)
       {
         /* This is Data Stage STALL Condition */
 
@@ -290,7 +290,7 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
 
       }
 
-      else if(URB_Status == URB_ERROR)
+      else if (URB_Status == URB_ERROR)
       {
         xfer_error_count++;
 
@@ -310,11 +310,11 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
     case USBH_MSC_BOT_DATAOUT_STATE:
       /* BOT DATA OUT stage */
       URB_Status = HCD_GetURB_State(pdev , MSC_Machine.hc_num_out);
-      if(URB_Status == URB_DONE)
+      if (URB_Status == URB_DONE)
       {
         BOTStallErrorCount = 0;
         USBH_MSC_BOTXferParam.BOTStateBkp = USBH_MSC_BOT_DATAOUT_STATE;
-        if(remainingDataLength > MSC_Machine.MSBulkOutEpSize)
+        if (remainingDataLength > MSC_Machine.MSBulkOutEpSize)
         {
           USBH_BulkSendData (pdev,
                              datapointer,
@@ -342,9 +342,9 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
         }
       }
 
-      else if(URB_Status == URB_NOTREADY)
+      else if (URB_Status == URB_NOTREADY)
       {
-        if(datapointer != datapointer_prev)
+        if (datapointer != datapointer_prev)
         {
           USBH_BulkSendData (pdev,
                              (datapointer - MSC_Machine.MSBulkOutEpSize),
@@ -360,7 +360,7 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
         }
       }
 
-      else if(URB_Status == URB_STALL)
+      else if (URB_Status == URB_STALL)
       {
         error_direction = USBH_MSC_DIR_OUT;
         USBH_MSC_BOTXferParam.BOTState  = USBH_MSC_BOT_ERROR_OUT;
@@ -381,7 +381,7 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
         USBH_MSC_BOTXferParam.BOTStateBkp = USBH_MSC_RECEIVE_CSW_STATE;
 
       }
-      else if(URB_Status == URB_ERROR)
+      else if (URB_Status == URB_ERROR)
       {
         xfer_error_count++;
 
@@ -426,7 +426,7 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
     case USBH_MSC_DECODE_CSW:
       URB_Status = HCD_GetURB_State(pdev , MSC_Machine.hc_num_in);
       /* Decode CSW */
-      if(URB_Status == URB_DONE)
+      if (URB_Status == URB_DONE)
       {
         BOTStallErrorCount = 0;
         USBH_MSC_BOTXferParam.BOTStateBkp = USBH_MSC_RECEIVE_CSW_STATE;
@@ -435,13 +435,13 @@ void USBH_MSC_HandleBOTXfer (USB_OTG_CORE_HANDLE *pdev ,USBH_HOST *phost)
 
         USBH_MSC_BOTXferParam.BOTXferStatus = USBH_MSC_DecodeCSW(pdev , phost);
       }
-      else if(URB_Status == URB_STALL)
+      else if (URB_Status == URB_STALL)
       {
         error_direction = USBH_MSC_DIR_IN;
         USBH_MSC_BOTXferParam.BOTState  = USBH_MSC_BOT_ERROR_IN;
       }
 
-      else if(URB_Status == URB_ERROR)
+      else if (URB_Status == URB_ERROR)
       {
         xfer_error_count++;
 
@@ -566,12 +566,12 @@ uint8_t USBH_MSC_DecodeCSW(USB_OTG_CORE_HANDLE *pdev , USBH_HOST *phost)
   uint32_t dataXferCount = 0;
   status = USBH_MSC_FAIL;
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     /*Checking if the transfer length is different than 13*/
     dataXferCount = HCD_GetXferCnt(pdev, MSC_Machine.hc_num_in);
 
-    if(dataXferCount != USBH_MSC_CSW_LENGTH)
+    if (dataXferCount != USBH_MSC_CSW_LENGTH)
     {
       /*(4) Hi > Dn (Host expects to receive data from the device,
       Device intends to transfer no data)
@@ -589,15 +589,15 @@ uint8_t USBH_MSC_DecodeCSW(USB_OTG_CORE_HANDLE *pdev , USBH_HOST *phost)
     { /* CSW length is Correct */
 
       /* Check validity of the CSW Signature and CSWStatus */
-      if(USBH_MSC_CSWData.field.CSWSignature == USBH_MSC_BOT_CSW_SIGNATURE)
+      if (USBH_MSC_CSWData.field.CSWSignature == USBH_MSC_BOT_CSW_SIGNATURE)
       {/* Check Condition 1. dCSWSignature is equal to 53425355h */
 
-        if(USBH_MSC_CSWData.field.CSWTag == USBH_MSC_CBWData.field.CBWTag)
+        if (USBH_MSC_CSWData.field.CSWTag == USBH_MSC_CBWData.field.CBWTag)
         {
           /* Check Condition 3. dCSWTag matches the dCBWTag from the
           corresponding CBW */
 
-          if(USBH_MSC_CSWData.field.CSWStatus == USBH_MSC_OK)
+          if (USBH_MSC_CSWData.field.CSWStatus == USBH_MSC_OK)
           {
             /* Refer to USB Mass-Storage Class : BOT (www.usb.org)
 
@@ -621,12 +621,12 @@ uint8_t USBH_MSC_DecodeCSW(USB_OTG_CORE_HANDLE *pdev , USBH_HOST *phost)
 
             status = USBH_MSC_OK;
           }
-          else if(USBH_MSC_CSWData.field.CSWStatus == USBH_MSC_FAIL)
+          else if (USBH_MSC_CSWData.field.CSWStatus == USBH_MSC_FAIL)
           {
             status = USBH_MSC_FAIL;
           }
 
-          else if(USBH_MSC_CSWData.field.CSWStatus == USBH_MSC_PHASE_ERROR)
+          else if (USBH_MSC_CSWData.field.CSWStatus == USBH_MSC_PHASE_ERROR)
           {
             /* Refer to USB Mass-Storage Class : BOT (www.usb.org)
             Section 6.7
diff --git a/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_core.c b/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_core.c
index edeebd6059..c44e8b47c4 100644
--- a/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_core.c
+++ b/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_core.c
@@ -167,10 +167,10 @@ static USBH_Status USBH_MSC_InterfaceInit ( USB_OTG_CORE_HANDLE *pdev,
 {
   USBH_HOST *pphost = phost;
 
-  if((pphost->device_prop.Itf_Desc[0].bInterfaceClass == MSC_CLASS) && \
+  if ((pphost->device_prop.Itf_Desc[0].bInterfaceClass == MSC_CLASS) && \
      (pphost->device_prop.Itf_Desc[0].bInterfaceProtocol == MSC_PROTOCOL))
   {
-    if(pphost->device_prop.Ep_Desc[0][0].bEndpointAddress & 0x80)
+    if (pphost->device_prop.Ep_Desc[0][0].bEndpointAddress & 0x80)
     {
       MSC_Machine.MSBulkInEp = (pphost->device_prop.Ep_Desc[0][0].bEndpointAddress);
       MSC_Machine.MSBulkInEpSize  = pphost->device_prop.Ep_Desc[0][0].wMaxPacketSize;
@@ -181,7 +181,7 @@ static USBH_Status USBH_MSC_InterfaceInit ( USB_OTG_CORE_HANDLE *pdev,
       MSC_Machine.MSBulkOutEpSize  = pphost->device_prop.Ep_Desc[0] [0].wMaxPacketSize;
     }
 
-    if(pphost->device_prop.Ep_Desc[0][1].bEndpointAddress & 0x80)
+    if (pphost->device_prop.Ep_Desc[0][1].bEndpointAddress & 0x80)
     {
       MSC_Machine.MSBulkInEp = (pphost->device_prop.Ep_Desc[0][1].bEndpointAddress);
       MSC_Machine.MSBulkInEpSize  = pphost->device_prop.Ep_Desc[0][1].wMaxPacketSize;
@@ -330,7 +330,7 @@ static USBH_Status USBH_MSC_Handle(USB_OTG_CORE_HANDLE *pdev ,
 
   static uint8_t maxLunExceed = FALSE;
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     switch(USBH_MSC_BOTXferParam.MSCState)
     {
@@ -344,12 +344,12 @@ static USBH_Status USBH_MSC_Handle(USB_OTG_CORE_HANDLE *pdev ,
       /* Issue GetMaxLUN request */
       status = USBH_MSC_GETMaxLUN(pdev, phost);
 
-      if(status == USBH_OK )
+      if (status == USBH_OK )
       {
         MSC_Machine.maxLun = *(MSC_Machine.buff) ;
 
         /* If device has more that one logical unit then it is not supported */
-        if((MSC_Machine.maxLun > 0) && (maxLunExceed == FALSE))
+        if ((MSC_Machine.maxLun > 0) && (maxLunExceed == FALSE))
         {
           maxLunExceed = TRUE;
           pphost->usr_cb->DeviceNotSupported();
@@ -360,7 +360,7 @@ static USBH_Status USBH_MSC_Handle(USB_OTG_CORE_HANDLE *pdev ,
         USBH_MSC_BOTXferParam.MSCState = USBH_MSC_TEST_UNIT_READY;
       }
 
-      if(status == USBH_NOT_SUPPORTED )
+      if (status == USBH_NOT_SUPPORTED )
       {
                /* If the Command has failed, then we need to move to Next State, after
         STALL condition is cleared by Control-Transfer */
@@ -376,7 +376,7 @@ static USBH_Status USBH_MSC_Handle(USB_OTG_CORE_HANDLE *pdev ,
                                phost,
                                0x00,
                                pphost->Control.hc_num_out);
-      if(status == USBH_OK )
+      if (status == USBH_OK )
       {
         /* If GetMaxLun Request not support, assume Single LUN configuration */
         MSC_Machine.maxLun = 0;
@@ -389,7 +389,7 @@ static USBH_Status USBH_MSC_Handle(USB_OTG_CORE_HANDLE *pdev ,
          /* Issue SCSI command TestUnitReady */
          mscStatus = USBH_MSC_TestUnitReady(pdev);
 
-         if(mscStatus == USBH_MSC_OK )
+         if (mscStatus == USBH_MSC_OK )
          {
            USBH_MSC_BOTXferParam.MSCState = USBH_MSC_READ_CAPACITY10;
 MSCErrorCount = 0;
@@ -404,7 +404,7 @@ MSCErrorCount = 0;
     case USBH_MSC_READ_CAPACITY10:
       /* Issue READ_CAPACITY10 SCSI command */
       mscStatus = USBH_MSC_ReadCapacity10(pdev);
-      if(mscStatus == USBH_MSC_OK )
+      if (mscStatus == USBH_MSC_OK )
       {
         USBH_MSC_BOTXferParam.MSCState = USBH_MSC_MODE_SENSE6;
         MSCErrorCount = 0;
@@ -419,7 +419,7 @@ MSCErrorCount = 0;
     case USBH_MSC_MODE_SENSE6:
       /* Issue ModeSense6 SCSI command for detecting if device is write-protected */
       mscStatus = USBH_MSC_ModeSense6(pdev);
-      if(mscStatus == USBH_MSC_OK )
+      if (mscStatus == USBH_MSC_OK )
       {
         USBH_MSC_BOTXferParam.MSCState = USBH_MSC_DEFAULT_APPLI_STATE;
         MSCErrorCount = 0;
@@ -439,7 +439,7 @@ MSCErrorCount = 0;
     case USBH_MSC_DEFAULT_APPLI_STATE:
       /* Process Application callback for MSC */
       appliStatus = pphost->usr_cb->UserApplication();
-      if(appliStatus == 0)
+      if (appliStatus == 0)
       {
         USBH_MSC_BOTXferParam.MSCState = USBH_MSC_DEFAULT_APPLI_STATE;
       }
@@ -459,7 +459,7 @@ MSCErrorCount = 0;
     case USBH_MSC_REQUEST_SENSE:
       /* Issue RequestSense SCSI command for retrieving error code */
       mscStatus = USBH_MSC_RequestSense(pdev);
-      if(mscStatus == USBH_MSC_OK )
+      if (mscStatus == USBH_MSC_OK )
       {
         USBH_MSC_BOTXferParam.MSCState = USBH_MSC_BOTXferParam.MSCStateBkp;
         status = USBH_OK;
@@ -510,10 +510,10 @@ static USBH_Status USBH_MSC_GETMaxLUN(USB_OTG_CORE_HANDLE *pdev , USBH_HOST *pho
 
 void USBH_MSC_ErrorHandle(uint8_t status)
 {
-    if(status == USBH_MSC_FAIL)
+    if (status == USBH_MSC_FAIL)
     {
       MSCErrorCount++;
-      if(MSCErrorCount < USBH_MSC_ERROR_RETRY_LIMIT)
+      if (MSCErrorCount < USBH_MSC_ERROR_RETRY_LIMIT)
       { /* Try MSC level error recovery, Issue the request Sense to get
         Drive error reason  */
         USBH_MSC_BOTXferParam.MSCState = USBH_MSC_REQUEST_SENSE;
@@ -525,12 +525,12 @@ void USBH_MSC_ErrorHandle(uint8_t status)
         USBH_MSC_BOTXferParam.MSCState = USBH_MSC_UNRECOVERED_STATE;
       }
     }
-    else if(status == USBH_MSC_PHASE_ERROR)
+    else if (status == USBH_MSC_PHASE_ERROR)
     {
       /* Phase error, Go to Unrecovered state */
       USBH_MSC_BOTXferParam.MSCState = USBH_MSC_UNRECOVERED_STATE;
     }
-    else if(status == USBH_MSC_BUSY)
+    else if (status == USBH_MSC_BUSY)
     {
       /*No change in state*/
     }
diff --git a/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_scsi.c b/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_scsi.c
index 4a4eebc084..409de92295 100644
--- a/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_scsi.c
+++ b/TFT/src/User/Hal/STM32_USB_HOST_Library/Class/MSC/src/usbh_msc_scsi.c
@@ -128,7 +128,7 @@ uint8_t USBH_MSC_TestUnitReady (USB_OTG_CORE_HANDLE *pdev)
   uint8_t index;
   USBH_MSC_Status_TypeDef status = USBH_MSC_BUSY;
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     switch(USBH_MSC_BOTXferParam.CmdStateMachine)
     {
@@ -158,7 +158,7 @@ uint8_t USBH_MSC_TestUnitReady (USB_OTG_CORE_HANDLE *pdev)
       break;
 
     case CMD_WAIT_STATUS:
-      if(USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
+      if (USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
       {
         /* Commands successfully sent and Response Received  */
         USBH_MSC_BOTXferParam.CmdStateMachine = CMD_SEND_STATE;
@@ -200,7 +200,7 @@ uint8_t USBH_MSC_ReadCapacity10(USB_OTG_CORE_HANDLE *pdev)
   uint8_t index;
   USBH_MSC_Status_TypeDef status = USBH_MSC_BUSY;
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     switch(USBH_MSC_BOTXferParam.CmdStateMachine)
     {
@@ -231,7 +231,7 @@ uint8_t USBH_MSC_ReadCapacity10(USB_OTG_CORE_HANDLE *pdev)
       break;
 
     case CMD_WAIT_STATUS:
-      if(USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
+      if (USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
       {
         /*assign the capacity*/
         (((uint8_t*)&USBH_MSC_Param.MSCapacity )[3]) = USBH_DataInBuffer[0];
@@ -286,7 +286,7 @@ uint8_t USBH_MSC_ModeSense6(USB_OTG_CORE_HANDLE *pdev)
   uint8_t index;
   USBH_MSC_Status_TypeDef status = USBH_MSC_BUSY;
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     switch(USBH_MSC_BOTXferParam.CmdStateMachine)
     {
@@ -322,7 +322,7 @@ uint8_t USBH_MSC_ModeSense6(USB_OTG_CORE_HANDLE *pdev)
       break;
 
     case CMD_WAIT_STATUS:
-      if(USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
+      if (USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
       {
         /* Assign the Write Protect status */
         /* If WriteProtect = 0, Writing is allowed
@@ -380,7 +380,7 @@ uint8_t USBH_MSC_RequestSense(USB_OTG_CORE_HANDLE *pdev)
   uint8_t index;
 
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     switch(USBH_MSC_BOTXferParam.CmdStateMachine)
     {
@@ -418,7 +418,7 @@ uint8_t USBH_MSC_RequestSense(USB_OTG_CORE_HANDLE *pdev)
 
     case CMD_WAIT_STATUS:
 
-      if(USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
+      if (USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
       {
         /* Get Sense data*/
         (((uint8_t*)&USBH_MSC_Param.MSSenseKey )[3]) = USBH_DataInBuffer[0];
@@ -477,7 +477,7 @@ uint8_t USBH_MSC_Write10(USB_OTG_CORE_HANDLE *pdev,
   USBH_MSC_Status_TypeDef status = USBH_MSC_BUSY;
   uint16_t nbOfPages;
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     switch(USBH_MSC_BOTXferParam.CmdStateMachine)
     {
@@ -520,7 +520,7 @@ uint8_t USBH_MSC_Write10(USB_OTG_CORE_HANDLE *pdev,
       break;
 
     case CMD_WAIT_STATUS:
-      if(USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
+      if (USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK)
       {
         /* Commands successfully sent and Response Received  */
         USBH_MSC_BOTXferParam.CmdStateMachine = CMD_SEND_STATE;
@@ -566,7 +566,7 @@ uint8_t USBH_MSC_Read10(USB_OTG_CORE_HANDLE *pdev,
   uint16_t nbOfPages;
   status = USBH_MSC_BUSY;
 
-  if(HCD_IsDeviceConnected(pdev))
+  if (HCD_IsDeviceConnected(pdev))
   {
     switch(USBH_MSC_BOTXferParam.CmdStateMachine)
     {
@@ -613,7 +613,7 @@ uint8_t USBH_MSC_Read10(USB_OTG_CORE_HANDLE *pdev,
 
     case CMD_WAIT_STATUS:
 
-      if((USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK) && \
+      if ((USBH_MSC_BOTXferParam.BOTXferStatus == USBH_MSC_OK) && \
         (HCD_IsDeviceConnected(pdev)))
       {
         /* Commands successfully sent and Response Received  */
diff --git a/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_core.c b/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_core.c
index c7c4e12d54..cbb2608d07 100644
--- a/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_core.c
+++ b/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_core.c
@@ -258,7 +258,7 @@ void USBH_Process(USB_OTG_CORE_HANDLE *pdev , USBH_HOST *phost)
   /* check for Host port events */
   if (((HCD_IsDeviceConnected(pdev) == 0)|| (HCD_IsPortEnabled(pdev) == 0))&& (phost->gState != HOST_IDLE))
   {
-    if(phost->gState != HOST_DEV_DISCONNECTED)
+    if (phost->gState != HOST_DEV_DISCONNECTED)
     {
       phost->gState = HOST_DEV_DISCONNECTED;
     }
@@ -347,7 +347,7 @@ void USBH_Process(USB_OTG_CORE_HANDLE *pdev , USBH_HOST *phost)
     /*The function should return user response true to move to class state */
     if ( phost->usr_cb->UserInput() == USBH_USR_RESP_OK)
     {
-      if((phost->class_cb->Init(pdev, phost))\
+      if ((phost->class_cb->Init(pdev, phost))\
         == USBH_OK)
       {
         phost->gState  = HOST_CLASS_REQUEST;
@@ -359,7 +359,7 @@ void USBH_Process(USB_OTG_CORE_HANDLE *pdev , USBH_HOST *phost)
     /* process class standard control requests state machine */
     status = phost->class_cb->Requests(pdev, phost);
 
-     if(status == USBH_OK)
+     if (status == USBH_OK)
      {
        phost->gState  = HOST_CLASS;
      }
@@ -455,7 +455,7 @@ void USBH_ErrorHandle(USBH_HOST *phost, USBH_Status errType)
     phost->gState = HOST_ERROR_STATE;
   }
   /* USB host restart requested from application layer */
-  else if(errType == USBH_APPLY_DEINIT)
+  else if (errType == USBH_APPLY_DEINIT)
   {
     phost->gState = HOST_ERROR_STATE;
     /* user callback for initialization */
@@ -689,7 +689,7 @@ USBH_Status USBH_HandleControl (USB_OTG_CORE_HANDLE *pdev, USBH_HOST *phost)
 
     URB_Status = HCD_GetURB_State(pdev , phost->Control.hc_num_out);
     /* case SETUP packet sent successfully */
-    if(URB_Status == URB_DONE)
+    if (URB_Status == URB_DONE)
     {
       direction = (phost->Control.setup.b.bmRequestType & USB_REQ_DIR_MASK);
 
@@ -728,7 +728,7 @@ USBH_Status USBH_HandleControl (USB_OTG_CORE_HANDLE *pdev, USBH_HOST *phost)
       /* Set the delay timer to enable timeout for data stage completion */
       phost->Control.timer = HCD_GetCurrentFrame(pdev);
     }
-    else if(URB_Status == URB_ERROR)
+    else if (URB_Status == URB_ERROR)
     {
       phost->Control.state = CTRL_ERROR;
       phost->Control.status = CTRL_XACTERR;
@@ -840,12 +840,12 @@ USBH_Status USBH_HandleControl (USB_OTG_CORE_HANDLE *pdev, USBH_HOST *phost)
       phost->Control.state = CTRL_ERROR;
     }
 
-    else if((HCD_GetCurrentFrame(pdev)\
+    else if ((HCD_GetCurrentFrame(pdev)\
       - phost->Control.timer) > timeout)
     {
       phost->Control.state = CTRL_ERROR;
     }
-     else if(URB_Status == URB_STALL)
+     else if (URB_Status == URB_STALL)
     {
       /* Control transfers completed, Exit the State Machine */
       phost->gState =   phost->gStateBkp;
diff --git a/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_hcs.c b/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_hcs.c
index 1e348d3a9d..d6166021ff 100644
--- a/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_hcs.c
+++ b/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_hcs.c
@@ -110,7 +110,7 @@ uint8_t USBH_Open_Channel  (USB_OTG_CORE_HANDLE *pdev,
   pdev->host.hc[hc_num].speed = speed;
   pdev->host.hc[hc_num].toggle_in = 0;
   pdev->host.hc[hc_num].toggle_out = 0;
-  if(speed == HPRT0_PRTSPD_HIGH_SPEED)
+  if (speed == HPRT0_PRTSPD_HIGH_SPEED)
   {
     pdev->host.hc[hc_num].do_ping = 1;
   }
@@ -140,17 +140,17 @@ uint8_t USBH_Modify_Channel (USB_OTG_CORE_HANDLE *pdev,
                             uint16_t mps)
 {
 
-  if(dev_address != 0)
+  if (dev_address != 0)
   {
     pdev->host.hc[hc_num].dev_addr = dev_address;
   }
 
-  if((pdev->host.hc[hc_num].max_packet != mps) && (mps != 0))
+  if ((pdev->host.hc[hc_num].max_packet != mps) && (mps != 0))
   {
     pdev->host.hc[hc_num].max_packet = mps;
   }
 
-  if((pdev->host.hc[hc_num].speed != speed ) && (speed != 0 ))
+  if ((pdev->host.hc[hc_num].speed != speed ) && (speed != 0 ))
   {
     pdev->host.hc[hc_num].speed = speed;
   }
@@ -187,7 +187,7 @@ uint8_t USBH_Alloc_Channel  (USB_OTG_CORE_HANDLE *pdev, uint8_t ep_addr)
   */
 uint8_t USBH_Free_Channel  (USB_OTG_CORE_HANDLE *pdev, uint8_t idx)
 {
-   if(idx < HC_MAX)
+   if (idx < HC_MAX)
    {
 	 pdev->host.channel[idx] &= HC_USED_MASK;
    }
diff --git a/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_ioreq.c b/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_ioreq.c
index 25a77a6496..e66baa3d76 100644
--- a/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_ioreq.c
+++ b/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_ioreq.c
@@ -1,467 +1,468 @@
-/**
-  ******************************************************************************
-  * @file    usbh_ioreq.c
-  * @author  MCD Application Team
-  * @version V2.2.1
-  * @date    17-March-2018
-  * @brief   This file handles the issuing of the USB transactions
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                      <http://www.st.com/SLA0044>
-  *
-  ******************************************************************************
-  */
-/* Includes ------------------------------------------------------------------*/
-
-#include "usbh_ioreq.h"
-
-#ifdef U_DISK_SUPPORT
-/** @addtogroup USBH_LIB
-  * @{
-  */
-
-/** @addtogroup USBH_LIB_CORE
-* @{
-*/
-
-/** @defgroup USBH_IOREQ
-  * @brief This file handles the standard protocol processing (USB v2.0)
-  * @{
-  */
-
-
-/** @defgroup USBH_IOREQ_Private_Defines
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBH_IOREQ_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBH_IOREQ_Private_Macros
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBH_IOREQ_Private_Variables
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBH_IOREQ_Private_FunctionPrototypes
-  * @{
-  */
-static USBH_Status USBH_SubmitSetupRequest(USBH_HOST *phost,
-                                           uint8_t* buff,
-                                           uint16_t length);
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBH_IOREQ_Private_Functions
-  * @{
-  */
-
-
-/**
-  * @brief  USBH_CtlReq
-  *         USBH_CtlReq sends a control request and provide the status after
-  *            completion of the request
-  * @param  pdev: Selected device
-  * @param  req: Setup Request Structure
-  * @param  buff: data buffer address to store the response
-  * @param  length: length of the response
-  * @retval Status
-  */
-USBH_Status USBH_CtlReq     (USB_OTG_CORE_HANDLE *pdev,
-                             USBH_HOST           *phost,
-                             uint8_t             *buff,
-                             uint16_t            length)
-{
-  USBH_Status status;
-  status = USBH_BUSY;
-
-  switch (phost->RequestState)
-  {
-  case CMD_SEND:
-    /* Start a SETUP transfer */
-    USBH_SubmitSetupRequest(phost, buff, length);
-    phost->RequestState = CMD_WAIT;
-    status = USBH_BUSY;
-    break;
-
-  case CMD_WAIT:
-     if (phost->Control.state == CTRL_COMPLETE )
-    {
-      /* Commands successfully sent and Response Received  */
-      phost->RequestState = CMD_SEND;
-      phost->Control.state =CTRL_IDLE;
-      status = USBH_OK;
-    }
-    else if  (phost->Control.state == CTRL_ERROR)
-    {
-      /* Failure Mode */
-      phost->RequestState = CMD_SEND;
-      status = USBH_FAIL;
-    }
-     else if  (phost->Control.state == CTRL_STALLED )
-    {
-      /* Commands successfully sent and Response Received  */
-      phost->RequestState = CMD_SEND;
-      status = USBH_NOT_SUPPORTED;
-    }
-    break;
-
-  default:
-    break;
-  }
-  return status;
-}
-
-/**
-  * @brief  USBH_CtlSendSetup
-  *         Sends the Setup Packet to the Device
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer from which the Data will be send to Device
-  * @param  hc_num: Host channel Number
-  * @retval Status
-  */
-USBH_Status USBH_CtlSendSetup ( USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t *buff,
-                                uint8_t hc_num){
-  pdev->host.hc[hc_num].ep_is_in = 0;
-  pdev->host.hc[hc_num].data_pid = HC_PID_SETUP;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = USBH_SETUP_PKT_SIZE;
-
-  return (USBH_Status)HCD_SubmitRequest (pdev , hc_num);
-}
-
-
-/**
-  * @brief  USBH_CtlSendData
-  *         Sends a data Packet to the Device
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer from which the Data will be sent to Device
-  * @param  length: Length of the data to be sent
-  * @param  hc_num: Host channel Number
-  * @retval Status
-  */
-USBH_Status USBH_CtlSendData ( USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t *buff,
-                                uint16_t length,
-                                uint8_t hc_num)
-{
-  pdev->host.hc[hc_num].ep_is_in = 0;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = length;
-
-  if ( length == 0 )
-  { /* For Status OUT stage, Length==0, Status Out PID = 1 */
-    pdev->host.hc[hc_num].toggle_out = 1;
-  }
-
- /* Set the Data Toggle bit as per the Flag */
-  if ( pdev->host.hc[hc_num].toggle_out == 0)
-  { /* Put the PID 0 */
-      pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
-  }
- else
- { /* Put the PID 1 */
-      pdev->host.hc[hc_num].data_pid = HC_PID_DATA1 ;
- }
-
-  HCD_SubmitRequest (pdev , hc_num);
-
-  return USBH_OK;
-}
-
-
-/**
-  * @brief  USBH_CtlReceiveData
-  *         Receives the Device Response to the Setup Packet
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer in which the response needs to be copied
-  * @param  length: Length of the data to be received
-  * @param  hc_num: Host channel Number
-  * @retval Status.
-  */
-USBH_Status USBH_CtlReceiveData(USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t* buff,
-                                uint16_t length,
-                                uint8_t hc_num)
-{
-
-  pdev->host.hc[hc_num].ep_is_in = 1;
-  pdev->host.hc[hc_num].data_pid = HC_PID_DATA1;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = length;
-
-  HCD_SubmitRequest (pdev , hc_num);
-
-  return USBH_OK;
-
-}
-
-
-/**
-  * @brief  USBH_BulkSendData
-  *         Sends the Bulk Packet to the device
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer from which the Data will be sent to Device
-  * @param  length: Length of the data to be sent
-  * @param  hc_num: Host channel Number
-  * @retval Status
-  */
-USBH_Status USBH_BulkSendData ( USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t *buff,
-                                uint16_t length,
-                                uint8_t hc_num)
-{
-  pdev->host.hc[hc_num].ep_is_in = 0;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = length;
-
- /* Set the Data Toggle bit as per the Flag */
-  if ( pdev->host.hc[hc_num].toggle_out == 0)
-  { /* Put the PID 0 */
-      pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
-  }
- else
- { /* Put the PID 1 */
-      pdev->host.hc[hc_num].data_pid = HC_PID_DATA1 ;
- }
-
-  HCD_SubmitRequest (pdev , hc_num);
-  return USBH_OK;
-}
-
-
-/**
-  * @brief  USBH_BulkReceiveData
-  *         Receives IN bulk packet from device
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer in which the received data packet to be copied
-  * @param  length: Length of the data to be received
-  * @param  hc_num: Host channel Number
-  * @retval Status.
-  */
-USBH_Status USBH_BulkReceiveData( USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t *buff,
-                                uint16_t length,
-                                uint8_t hc_num)
-{
-  pdev->host.hc[hc_num].ep_is_in = 1;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = length;
-
-
-  if( pdev->host.hc[hc_num].toggle_in == 0)
-  {
-    pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
-  }
-  else
-  {
-    pdev->host.hc[hc_num].data_pid = HC_PID_DATA1;
-  }
-
-  HCD_SubmitRequest (pdev , hc_num);
-  return USBH_OK;
-}
-
-
-/**
-  * @brief  USBH_InterruptReceiveData
-  *         Receives the Device Response to the Interrupt IN token
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer in which the response needs to be copied
-  * @param  length: Length of the data to be received
-  * @param  hc_num: Host channel Number
-  * @retval Status.
-  */
-USBH_Status USBH_InterruptReceiveData( USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t *buff,
-                                uint8_t length,
-                                uint8_t hc_num)
-{
-
-  pdev->host.hc[hc_num].ep_is_in = 1;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = length;
-
-
-
-  if(pdev->host.hc[hc_num].toggle_in == 0)
-  {
-    pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
-  }
-  else
-  {
-    pdev->host.hc[hc_num].data_pid = HC_PID_DATA1;
-  }
-
-  /* toggle DATA PID */
-  pdev->host.hc[hc_num].toggle_in ^= 1;
-
-  HCD_SubmitRequest (pdev , hc_num);
-
-  return USBH_OK;
-}
-
-/**
-  * @brief  USBH_InterruptSendData
-  *         Sends the data on Interrupt OUT Endpoint
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer from where the data needs to be copied
-  * @param  length: Length of the data to be sent
-  * @param  hc_num: Host channel Number
-  * @retval Status.
-  */
-USBH_Status USBH_InterruptSendData( USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t *buff,
-                                uint8_t length,
-                                uint8_t hc_num)
-{
-
-  pdev->host.hc[hc_num].ep_is_in = 0;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = length;
-
-  if(pdev->host.hc[hc_num].toggle_in == 0)
-  {
-    pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
-  }
-  else
-  {
-    pdev->host.hc[hc_num].data_pid = HC_PID_DATA1;
-  }
-
-  pdev->host.hc[hc_num].toggle_in ^= 1;
-
-  HCD_SubmitRequest (pdev , hc_num);
-
-  return USBH_OK;
-}
-
-
-/**
-  * @brief  USBH_SubmitSetupRequest
-  *         Start a setup transfer by changing the state-machine and
-  *         initializing  the required variables needed for the Control Transfer
-  * @param  pdev: Selected device
-  * @param  setup: Setup Request Structure
-  * @param  buff: Buffer used for setup request
-  * @param  length: Length of the data
-  * @retval Status.
-*/
-static USBH_Status USBH_SubmitSetupRequest(USBH_HOST *phost,
-                                           uint8_t* buff,
-                                           uint16_t length)
-{
-
-  /* Save Global State */
-  phost->gStateBkp =   phost->gState;
-
-  /* Prepare the Transactions */
-  phost->gState = HOST_CTRL_XFER;
-  phost->Control.buff = buff;
-  phost->Control.length = length;
-  phost->Control.state = CTRL_SETUP;
-
-  return USBH_OK;
-}
-
-
-/**
-  * @brief  USBH_IsocReceiveData
-  *         Receives the Device Response to the Isochronous IN token
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer in which the response needs to be copied
-  * @param  length: Length of the data to be received
-  * @param  hc_num: Host channel Number
-  * @retval Status.
-  */
-USBH_Status USBH_IsocReceiveData( USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t *buff,
-                                uint32_t length,
-                                uint8_t hc_num)
-{
-
-  pdev->host.hc[hc_num].ep_is_in = 1;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = length;
-  pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
-
-
-  HCD_SubmitRequest (pdev , hc_num);
-
-  return USBH_OK;
-}
-
-/**
-  * @brief  USBH_IsocSendData
-  *         Sends the data on Isochronous OUT Endpoint
-  * @param  pdev: Selected device
-  * @param  buff: Buffer pointer from where the data needs to be copied
-  * @param  length: Length of the data to be sent
-  * @param  hc_num: Host channel Number
-  * @retval Status.
-  */
-USBH_Status USBH_IsocSendData( USB_OTG_CORE_HANDLE *pdev,
-                                uint8_t *buff,
-                                uint32_t length,
-                                uint8_t hc_num)
-{
-
-  pdev->host.hc[hc_num].ep_is_in = 0;
-  pdev->host.hc[hc_num].xfer_buff = buff;
-  pdev->host.hc[hc_num].xfer_len = length;
-  pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
-
-  HCD_SubmitRequest (pdev , hc_num);
-
-  return USBH_OK;
-}
-
-#endif
-/**
-* @}
-*/
-
-/**
-* @}
-*/
-
-/**
-* @}
-*/
-
-/**
-* @}
-*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+/**
+  ******************************************************************************
+  * @file    usbh_ioreq.c
+  * @author  MCD Application Team
+  * @version V2.2.1
+  * @date    17-March-2018
+  * @brief   This file handles the issuing of the USB transactions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                      <http://www.st.com/SLA0044>
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+
+#include "usbh_ioreq.h"
+
+#ifdef U_DISK_SUPPORT
+/** @addtogroup USBH_LIB
+  * @{
+  */
+
+/** @addtogroup USBH_LIB_CORE
+* @{
+*/
+
+/** @defgroup USBH_IOREQ
+  * @brief This file handles the standard protocol processing (USB v2.0)
+  * @{
+  */
+
+
+/** @defgroup USBH_IOREQ_Private_Defines
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBH_IOREQ_Private_TypesDefinitions
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+
+/** @defgroup USBH_IOREQ_Private_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBH_IOREQ_Private_Variables
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBH_IOREQ_Private_FunctionPrototypes
+  * @{
+  */
+static USBH_Status USBH_SubmitSetupRequest(USBH_HOST *phost,
+                                           uint8_t* buff,
+                                           uint16_t length);
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBH_IOREQ_Private_Functions
+  * @{
+  */
+
+
+/**
+  * @brief  USBH_CtlReq
+  *         USBH_CtlReq sends a control request and provide the status after
+  *            completion of the request
+  * @param  pdev: Selected device
+  * @param  req: Setup Request Structure
+  * @param  buff: data buffer address to store the response
+  * @param  length: length of the response
+  * @retval Status
+  */
+USBH_Status USBH_CtlReq     (USB_OTG_CORE_HANDLE *pdev,
+                             USBH_HOST           *phost,
+                             uint8_t             *buff,
+                             uint16_t            length)
+{
+  USBH_Status status;
+  status = USBH_BUSY;
+
+  switch (phost->RequestState)
+  {
+  case CMD_SEND:
+    /* Start a SETUP transfer */
+    USBH_SubmitSetupRequest(phost, buff, length);
+    phost->RequestState = CMD_WAIT;
+    status = USBH_BUSY;
+    break;
+
+  case CMD_WAIT:
+     if (phost->Control.state == CTRL_COMPLETE )
+    {
+      /* Commands successfully sent and Response Received  */
+      phost->RequestState = CMD_SEND;
+      phost->Control.state =CTRL_IDLE;
+      status = USBH_OK;
+    }
+    else if  (phost->Control.state == CTRL_ERROR)
+    {
+      /* Failure Mode */
+      phost->RequestState = CMD_SEND;
+      status = USBH_FAIL;
+    }
+     else if  (phost->Control.state == CTRL_STALLED )
+    {
+      /* Commands successfully sent and Response Received  */
+      phost->RequestState = CMD_SEND;
+      status = USBH_NOT_SUPPORTED;
+    }
+    break;
+
+  default:
+    break;
+  }
+  return status;
+}
+
+/**
+  * @brief  USBH_CtlSendSetup
+  *         Sends the Setup Packet to the Device
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer from which the Data will be send to Device
+  * @param  hc_num: Host channel Number
+  * @retval Status
+  */
+USBH_Status USBH_CtlSendSetup ( USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t *buff,
+                                uint8_t hc_num)
+{
+  pdev->host.hc[hc_num].ep_is_in = 0;
+  pdev->host.hc[hc_num].data_pid = HC_PID_SETUP;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = USBH_SETUP_PKT_SIZE;
+
+  return (USBH_Status)HCD_SubmitRequest (pdev , hc_num);
+}
+
+
+/**
+  * @brief  USBH_CtlSendData
+  *         Sends a data Packet to the Device
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer from which the Data will be sent to Device
+  * @param  length: Length of the data to be sent
+  * @param  hc_num: Host channel Number
+  * @retval Status
+  */
+USBH_Status USBH_CtlSendData ( USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t *buff,
+                                uint16_t length,
+                                uint8_t hc_num)
+{
+  pdev->host.hc[hc_num].ep_is_in = 0;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = length;
+
+  if ( length == 0 )
+  { /* For Status OUT stage, Length==0, Status Out PID = 1 */
+    pdev->host.hc[hc_num].toggle_out = 1;
+  }
+
+ /* Set the Data Toggle bit as per the Flag */
+  if ( pdev->host.hc[hc_num].toggle_out == 0)
+  { /* Put the PID 0 */
+      pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
+  }
+ else
+ { /* Put the PID 1 */
+      pdev->host.hc[hc_num].data_pid = HC_PID_DATA1 ;
+ }
+
+  HCD_SubmitRequest (pdev , hc_num);
+
+  return USBH_OK;
+}
+
+
+/**
+  * @brief  USBH_CtlReceiveData
+  *         Receives the Device Response to the Setup Packet
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer in which the response needs to be copied
+  * @param  length: Length of the data to be received
+  * @param  hc_num: Host channel Number
+  * @retval Status.
+  */
+USBH_Status USBH_CtlReceiveData(USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t* buff,
+                                uint16_t length,
+                                uint8_t hc_num)
+{
+
+  pdev->host.hc[hc_num].ep_is_in = 1;
+  pdev->host.hc[hc_num].data_pid = HC_PID_DATA1;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = length;
+
+  HCD_SubmitRequest (pdev , hc_num);
+
+  return USBH_OK;
+
+}
+
+
+/**
+  * @brief  USBH_BulkSendData
+  *         Sends the Bulk Packet to the device
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer from which the Data will be sent to Device
+  * @param  length: Length of the data to be sent
+  * @param  hc_num: Host channel Number
+  * @retval Status
+  */
+USBH_Status USBH_BulkSendData ( USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t *buff,
+                                uint16_t length,
+                                uint8_t hc_num)
+{
+  pdev->host.hc[hc_num].ep_is_in = 0;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = length;
+
+ /* Set the Data Toggle bit as per the Flag */
+  if ( pdev->host.hc[hc_num].toggle_out == 0)
+  { /* Put the PID 0 */
+      pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
+  }
+ else
+ { /* Put the PID 1 */
+      pdev->host.hc[hc_num].data_pid = HC_PID_DATA1 ;
+ }
+
+  HCD_SubmitRequest (pdev , hc_num);
+  return USBH_OK;
+}
+
+
+/**
+  * @brief  USBH_BulkReceiveData
+  *         Receives IN bulk packet from device
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer in which the received data packet to be copied
+  * @param  length: Length of the data to be received
+  * @param  hc_num: Host channel Number
+  * @retval Status.
+  */
+USBH_Status USBH_BulkReceiveData( USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t *buff,
+                                uint16_t length,
+                                uint8_t hc_num)
+{
+  pdev->host.hc[hc_num].ep_is_in = 1;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = length;
+
+
+  if ( pdev->host.hc[hc_num].toggle_in == 0)
+  {
+    pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
+  }
+  else
+  {
+    pdev->host.hc[hc_num].data_pid = HC_PID_DATA1;
+  }
+
+  HCD_SubmitRequest (pdev , hc_num);
+  return USBH_OK;
+}
+
+
+/**
+  * @brief  USBH_InterruptReceiveData
+  *         Receives the Device Response to the Interrupt IN token
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer in which the response needs to be copied
+  * @param  length: Length of the data to be received
+  * @param  hc_num: Host channel Number
+  * @retval Status.
+  */
+USBH_Status USBH_InterruptReceiveData( USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t *buff,
+                                uint8_t length,
+                                uint8_t hc_num)
+{
+
+  pdev->host.hc[hc_num].ep_is_in = 1;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = length;
+
+
+
+  if (pdev->host.hc[hc_num].toggle_in == 0)
+  {
+    pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
+  }
+  else
+  {
+    pdev->host.hc[hc_num].data_pid = HC_PID_DATA1;
+  }
+
+  /* toggle DATA PID */
+  pdev->host.hc[hc_num].toggle_in ^= 1;
+
+  HCD_SubmitRequest (pdev , hc_num);
+
+  return USBH_OK;
+}
+
+/**
+  * @brief  USBH_InterruptSendData
+  *         Sends the data on Interrupt OUT Endpoint
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer from where the data needs to be copied
+  * @param  length: Length of the data to be sent
+  * @param  hc_num: Host channel Number
+  * @retval Status.
+  */
+USBH_Status USBH_InterruptSendData( USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t *buff,
+                                uint8_t length,
+                                uint8_t hc_num)
+{
+
+  pdev->host.hc[hc_num].ep_is_in = 0;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = length;
+
+  if (pdev->host.hc[hc_num].toggle_in == 0)
+  {
+    pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
+  }
+  else
+  {
+    pdev->host.hc[hc_num].data_pid = HC_PID_DATA1;
+  }
+
+  pdev->host.hc[hc_num].toggle_in ^= 1;
+
+  HCD_SubmitRequest (pdev , hc_num);
+
+  return USBH_OK;
+}
+
+
+/**
+  * @brief  USBH_SubmitSetupRequest
+  *         Start a setup transfer by changing the state-machine and
+  *         initializing  the required variables needed for the Control Transfer
+  * @param  pdev: Selected device
+  * @param  setup: Setup Request Structure
+  * @param  buff: Buffer used for setup request
+  * @param  length: Length of the data
+  * @retval Status.
+*/
+static USBH_Status USBH_SubmitSetupRequest(USBH_HOST *phost,
+                                           uint8_t* buff,
+                                           uint16_t length)
+{
+
+  /* Save Global State */
+  phost->gStateBkp =   phost->gState;
+
+  /* Prepare the Transactions */
+  phost->gState = HOST_CTRL_XFER;
+  phost->Control.buff = buff;
+  phost->Control.length = length;
+  phost->Control.state = CTRL_SETUP;
+
+  return USBH_OK;
+}
+
+
+/**
+  * @brief  USBH_IsocReceiveData
+  *         Receives the Device Response to the Isochronous IN token
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer in which the response needs to be copied
+  * @param  length: Length of the data to be received
+  * @param  hc_num: Host channel Number
+  * @retval Status.
+  */
+USBH_Status USBH_IsocReceiveData( USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t *buff,
+                                uint32_t length,
+                                uint8_t hc_num)
+{
+
+  pdev->host.hc[hc_num].ep_is_in = 1;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = length;
+  pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
+
+
+  HCD_SubmitRequest (pdev , hc_num);
+
+  return USBH_OK;
+}
+
+/**
+  * @brief  USBH_IsocSendData
+  *         Sends the data on Isochronous OUT Endpoint
+  * @param  pdev: Selected device
+  * @param  buff: Buffer pointer from where the data needs to be copied
+  * @param  length: Length of the data to be sent
+  * @param  hc_num: Host channel Number
+  * @retval Status.
+  */
+USBH_Status USBH_IsocSendData( USB_OTG_CORE_HANDLE *pdev,
+                                uint8_t *buff,
+                                uint32_t length,
+                                uint8_t hc_num)
+{
+
+  pdev->host.hc[hc_num].ep_is_in = 0;
+  pdev->host.hc[hc_num].xfer_buff = buff;
+  pdev->host.hc[hc_num].xfer_len = length;
+  pdev->host.hc[hc_num].data_pid = HC_PID_DATA0;
+
+  HCD_SubmitRequest (pdev , hc_num);
+
+  return USBH_OK;
+}
+
+#endif
+/**
+* @}
+*/
+
+/**
+* @}
+*/
+
+/**
+* @}
+*/
+
+/**
+* @}
+*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_stdreq.c b/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_stdreq.c
index 060a6d8902..8bdcd79093 100644
--- a/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_stdreq.c
+++ b/TFT/src/User/Hal/STM32_USB_HOST_Library/Core/src/usbh_stdreq.c
@@ -120,7 +120,7 @@ USBH_Status USBH_Get_DevDesc(USB_OTG_CORE_HANDLE *pdev,
 
   USBH_Status status;
 
-  if((status = USBH_GetDescriptor(pdev,
+  if ((status = USBH_GetDescriptor(pdev,
                                   phost,
                                   USB_REQ_RECIPIENT_DEVICE | USB_REQ_TYPE_STANDARD,
                                   USB_DESC_DEVICE,
@@ -153,7 +153,7 @@ USBH_Status USBH_Get_CfgDesc(USB_OTG_CORE_HANDLE *pdev,
   USBH_Status status, result;
   uint16_t index = 0;
 
-  if((status = USBH_GetDescriptor(pdev,
+  if ((status = USBH_GetDescriptor(pdev,
                                   phost,
                                   USB_REQ_RECIPIENT_DEVICE | USB_REQ_TYPE_STANDARD,
                                   USB_DESC_CONFIGURATION,
@@ -198,7 +198,7 @@ USBH_Status USBH_Get_StringDesc(USB_OTG_CORE_HANDLE *pdev,
 {
   USBH_Status status;
 
-  if((status = USBH_GetDescriptor(pdev,
+  if ((status = USBH_GetDescriptor(pdev,
                                   phost,
                                   USB_REQ_RECIPIENT_DEVICE | USB_REQ_TYPE_STANDARD,
                                   USB_DESC_STRING | string_index,
@@ -481,13 +481,13 @@ USBH_Status USBH_ParseCfgDesc (USBH_CfgDesc_TypeDef* cfg_desc,
         {
           if_ix             = *(((uint8_t *)pdesc ) + 2);
           pif               = &itf_desc[if_ix];
-          if((*((uint8_t *)pdesc + 3)) < 3)
+          if ((*((uint8_t *)pdesc + 3)) < 3)
           {
             USBH_ParseInterfaceDesc (&temp_pif, (uint8_t *)pdesc);
             ep_ix = 0;
 
             /* Parse Ep descriptors relative to the current interface */
-            if(temp_pif.bNumEndpoints <= USBH_MAX_NUM_ENDPOINTS)
+            if (temp_pif.bNumEndpoints <= USBH_MAX_NUM_ENDPOINTS)
             {
               while (ep_ix < temp_pif.bNumEndpoints)
               {
@@ -495,14 +495,14 @@ USBH_Status USBH_ParseCfgDesc (USBH_CfgDesc_TypeDef* cfg_desc,
                 if (pdesc->bDescriptorType   == USB_DESC_TYPE_ENDPOINT)
                 {
                   pep               = &ep_desc[if_ix][ep_ix];
-                  if(prev_itf != if_ix)
+                  if (prev_itf != if_ix)
                   {
                     prev_itf = if_ix;
                     USBH_ParseInterfaceDesc (pif, (uint8_t *)&temp_pif);
                   }
                   else
                   {
-                    if(prev_ep_size > LE16((uint8_t *)pdesc + 4))
+                    if (prev_ep_size > LE16((uint8_t *)pdesc + 4))
                     {
                       break;
                     }
diff --git a/TFT/src/User/Hal/STM32_USB_OTG_Driver/src/usb_core.c b/TFT/src/User/Hal/STM32_USB_OTG_Driver/src/usb_core.c
index 63ff1d1e17..14974b213f 100644
--- a/TFT/src/User/Hal/STM32_USB_OTG_Driver/src/usb_core.c
+++ b/TFT/src/User/Hal/STM32_USB_OTG_Driver/src/usb_core.c
@@ -369,7 +369,7 @@ USB_OTG_STS USB_OTG_CoreInit(USB_OTG_CORE_HANDLE *pdev)
     /* Reset after a PHY select  */
     USB_OTG_CoreReset(pdev);
 
-    if(pdev->cfg.dma_enable == 1)
+    if (pdev->cfg.dma_enable == 1)
     {
 
       ahbcfg.b.hburstlen = 5; /* 64 x 32-bits*/
@@ -404,7 +404,7 @@ USB_OTG_STS USB_OTG_CoreInit(USB_OTG_CORE_HANDLE *pdev)
 
 #if defined (STM32F446xx) || defined (STM32F469_479xx)
 #else
-    if(pdev->cfg.Sof_output)
+    if (pdev->cfg.Sof_output)
     {
       gccfg.b.sofouten = 1;
     }
@@ -414,7 +414,7 @@ USB_OTG_STS USB_OTG_CoreInit(USB_OTG_CORE_HANDLE *pdev)
     USB_OTG_BSP_mDelay(20);
   }
   /* case the HS core is working in FS mode */
-  if(pdev->cfg.dma_enable == 1)
+  if (pdev->cfg.dma_enable == 1)
   {
 
     ahbcfg.d32 = USB_OTG_READ_REG32(&pdev->regs.GREGS->GAHBCFG);
@@ -686,7 +686,7 @@ USB_OTG_STS USB_OTG_CoreInitHost(USB_OTG_CORE_HANDLE *pdev)
   /* Configure data FIFO sizes */
   /* Rx FIFO */
 #ifdef USB_OTG_FS_CORE
-  if(pdev->cfg.coreID == USB_OTG_FS_CORE_ID)
+  if (pdev->cfg.coreID == USB_OTG_FS_CORE_ID)
   {
     /* set Rx FIFO size */
     USB_OTG_WRITE_REG32(&pdev->regs.GREGS->GRXFSIZ, RX_FIFO_FS_SIZE);
@@ -1065,7 +1065,7 @@ USB_OTG_STS USB_OTG_HC_StartXfer(USB_OTG_CORE_HANDLE *pdev , uint8_t hc_num)
 
   if (pdev->cfg.dma_enable == 0) /* Slave mode */
   {
-    if((pdev->host.hc[hc_num].ep_is_in == 0) &&
+    if ((pdev->host.hc[hc_num].ep_is_in == 0) &&
        (pdev->host.hc[hc_num].xfer_len > 0))
     {
       switch(pdev->host.hc[hc_num].ep_type)
@@ -1078,7 +1078,7 @@ USB_OTG_STS USB_OTG_HC_StartXfer(USB_OTG_CORE_HANDLE *pdev , uint8_t hc_num)
         len_words = (pdev->host.hc[hc_num].xfer_len + 3) / 4;
 
         /* check if there is enough space in FIFO space */
-        if(len_words > hnptxsts.b.nptxfspcavail)
+        if (len_words > hnptxsts.b.nptxfspcavail)
         {
           /* need to process data in nptxfempty interrupt */
           intmsk.b.nptxfempty = 1;
@@ -1092,7 +1092,7 @@ USB_OTG_STS USB_OTG_HC_StartXfer(USB_OTG_CORE_HANDLE *pdev , uint8_t hc_num)
         hptxsts.d32 = USB_OTG_READ_REG32(&pdev->regs.HREGS->HPTXSTS);
         len_words = (pdev->host.hc[hc_num].xfer_len + 3) / 4;
         /* check if there is enough space in FIFO space */
-        if(len_words > hptxsts.b.ptxfspcavail) /* split the transfer */
+        if (len_words > hptxsts.b.ptxfspcavail) /* split the transfer */
         {
           /* need to process data in ptxfempty interrupt */
           intmsk.b.ptxfempty = 1;
@@ -1258,7 +1258,7 @@ USB_OTG_STS USB_OTG_CoreInitDev (USB_OTG_CORE_HANDLE *pdev)
   USB_OTG_WRITE_REG32( &pdev->regs.DREGS->DCFG, dcfg.d32 );
 
 #ifdef USB_OTG_FS_CORE
-  if(pdev->cfg.coreID == USB_OTG_FS_CORE_ID  )
+  if (pdev->cfg.coreID == USB_OTG_FS_CORE_ID  )
   {
 
     /* Set Full speed phy */
@@ -1292,12 +1292,12 @@ USB_OTG_STS USB_OTG_CoreInitDev (USB_OTG_CORE_HANDLE *pdev)
   }
 #endif
 #ifdef USB_OTG_HS_CORE
-  if(pdev->cfg.coreID == USB_OTG_HS_CORE_ID  )
+  if (pdev->cfg.coreID == USB_OTG_HS_CORE_ID  )
   {
 
     /* Set High speed phy */
 
-    if(pdev->cfg.phy_itface  == USB_OTG_ULPI_PHY)
+    if (pdev->cfg.phy_itface  == USB_OTG_ULPI_PHY)
     {
       USB_OTG_InitDevSpeed (pdev , USB_OTG_SPEED_PARAM_HIGH);
     }
@@ -1564,7 +1564,7 @@ USB_OTG_STS USB_OTG_EPActivate(USB_OTG_CORE_HANDLE *pdev , USB_OTG_EP *ep)
   }
   /* Enable the Interrupt for this EP */
 #ifdef USB_OTG_HS_DEDICATED_EP1_ENABLED
-  if((ep->num == 1)&&(pdev->cfg.coreID == USB_OTG_HS_CORE_ID))
+  if ((ep->num == 1)&&(pdev->cfg.coreID == USB_OTG_HS_CORE_ID))
   {
     USB_OTG_MODIFY_REG32(&pdev->regs.DREGS->DEACHMSK, 0, daintmsk.d32);
   }
@@ -2013,9 +2013,9 @@ void USB_OTG_ActiveRemoteWakeup(USB_OTG_CORE_HANDLE *pdev)
   if (pdev->dev.DevRemoteWakeup)
   {
     dsts.d32 = USB_OTG_READ_REG32(&pdev->regs.DREGS->DSTS);
-    if(dsts.b.suspsts == 1)
+    if (dsts.b.suspsts == 1)
     {
-      if(pdev->cfg.low_power)
+      if (pdev->cfg.low_power)
       {
         /* un-gate USB Core clock */
         power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
@@ -2041,7 +2041,7 @@ void USB_OTG_ActiveRemoteWakeup(USB_OTG_CORE_HANDLE *pdev)
 */
 void USB_OTG_UngateClock(USB_OTG_CORE_HANDLE *pdev)
 {
-  if(pdev->cfg.low_power)
+  if (pdev->cfg.low_power)
   {
 
     USB_OTG_DSTS_TypeDef     dsts;
@@ -2049,7 +2049,7 @@ void USB_OTG_UngateClock(USB_OTG_CORE_HANDLE *pdev)
 
     dsts.d32 = USB_OTG_READ_REG32(&pdev->regs.DREGS->DSTS);
 
-    if(dsts.b.suspsts == 1)
+    if (dsts.b.suspsts == 1)
     {
       /* un-gate USB Core clock */
       power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
diff --git a/TFT/src/User/Hal/STM32_USB_OTG_Driver/src/usb_hcd_int.c b/TFT/src/User/Hal/STM32_USB_OTG_Driver/src/usb_hcd_int.c
index 887ca35ae3..c41861dceb 100644
--- a/TFT/src/User/Hal/STM32_USB_OTG_Driver/src/usb_hcd_int.c
+++ b/TFT/src/User/Hal/STM32_USB_OTG_Driver/src/usb_hcd_int.c
@@ -406,7 +406,7 @@ static uint32_t USB_OTG_USBH_handle_port_ISR (USB_OTG_CORE_HANDLE *pdev)
           USB_OTG_WRITE_REG32(&pdev->regs.HREGS->HFIR, 6000 );
           if (hcfg.b.fslspclksel != HCFG_6_MHZ)
           {
-            if(pdev->cfg.phy_itface  == USB_OTG_EMBEDDED_PHY)
+            if (pdev->cfg.phy_itface  == USB_OTG_EMBEDDED_PHY)
             {
               USB_OTG_InitFSLSPClkSel(pdev , HCFG_6_MHZ);
             }
@@ -549,7 +549,7 @@ uint32_t USB_OTG_USBH_handle_hc_n_Out_ISR (USB_OTG_CORE_HANDLE *pdev , uint32_t
   {
     MASK_HOST_INT_CHH (num);
 
-    if(pdev->host.HC_Status[num] == HC_XFRC)
+    if (pdev->host.HC_Status[num] == HC_XFRC)
     {
       pdev->host.URB_State[num] = URB_DONE;
 
@@ -558,23 +558,23 @@ uint32_t USB_OTG_USBH_handle_hc_n_Out_ISR (USB_OTG_CORE_HANDLE *pdev , uint32_t
         pdev->host.hc[num].toggle_out ^= 1;
       }
     }
-    else if(pdev->host.HC_Status[num] == HC_NAK)
+    else if (pdev->host.HC_Status[num] == HC_NAK)
     {
       pdev->host.URB_State[num] = URB_NOTREADY;
     }
-    else if(pdev->host.HC_Status[num] == HC_NYET)
+    else if (pdev->host.HC_Status[num] == HC_NYET)
     {
-      if(pdev->host.hc[num].do_ping == 1)
+      if (pdev->host.hc[num].do_ping == 1)
       {
         USB_OTG_HC_DoPing(pdev, num);
       }
       pdev->host.URB_State[num] = URB_NOTREADY;
     }
-    else if(pdev->host.HC_Status[num] == HC_STALL)
+    else if (pdev->host.HC_Status[num] == HC_STALL)
     {
       pdev->host.URB_State[num] = URB_STALL;
     }
-    else if(pdev->host.HC_Status[num] == HC_XACTERR)
+    else if (pdev->host.HC_Status[num] == HC_XACTERR)
     {
       {
         pdev->host.URB_State[num] = URB_ERROR;
@@ -669,7 +669,7 @@ uint32_t USB_OTG_USBH_handle_hc_n_In_ISR (USB_OTG_CORE_HANDLE *pdev , uint32_t n
       pdev->host.hc[num].toggle_in ^= 1;
 
     }
-    else if(hcchar.b.eptype == EP_TYPE_INTR)
+    else if (hcchar.b.eptype == EP_TYPE_INTR)
     {
       hcchar.b.oddfrm  = 1;
       USB_OTG_WRITE_REG32(&pdev->regs.HC_REGS[num]->HCCHAR, hcchar.d32);
@@ -680,7 +680,7 @@ uint32_t USB_OTG_USBH_handle_hc_n_In_ISR (USB_OTG_CORE_HANDLE *pdev , uint32_t n
   {
     MASK_HOST_INT_CHH (num);
 
-    if(pdev->host.HC_Status[num] == HC_XFRC)
+    if (pdev->host.HC_Status[num] == HC_XFRC)
     {
       pdev->host.URB_State[num] = URB_DONE;
     }
@@ -690,14 +690,14 @@ uint32_t USB_OTG_USBH_handle_hc_n_In_ISR (USB_OTG_CORE_HANDLE *pdev , uint32_t n
       pdev->host.URB_State[num] = URB_STALL;
     }
 
-    else if((pdev->host.HC_Status[num] == HC_XACTERR) ||
+    else if ((pdev->host.HC_Status[num] == HC_XACTERR) ||
             (pdev->host.HC_Status[num] == HC_DATATGLERR))
     {
       pdev->host.ErrCnt[num] = 0;
       pdev->host.URB_State[num] = URB_ERROR;
 
     }
-    else if(hcchar.b.eptype == EP_TYPE_INTR)
+    else if (hcchar.b.eptype == EP_TYPE_INTR)
     {
       pdev->host.hc[num].toggle_in ^= 1;
     }
@@ -714,7 +714,7 @@ uint32_t USB_OTG_USBH_handle_hc_n_In_ISR (USB_OTG_CORE_HANDLE *pdev , uint32_t n
   }
   else if (hcint.b.nak)
   {
-    if(hcchar.b.eptype == EP_TYPE_INTR)
+    if (hcchar.b.eptype == EP_TYPE_INTR)
     {
       UNMASK_HOST_INT_CHH (num);
       if (pdev->cfg.dma_enable == 0)
@@ -785,7 +785,7 @@ static uint32_t USB_OTG_USBH_handle_rx_qlvl_ISR (USB_OTG_CORE_HANDLE *pdev)
       pdev->host.XferCnt[channelnum]  = count;
 
       hctsiz.d32 = USB_OTG_READ_REG32(&pdev->regs.HC_REGS[channelnum]->HCTSIZ);
-      if(hctsiz.b.pktcnt > 0)
+      if (hctsiz.b.pktcnt > 0)
       {
         /* re-activate the channel when more packets are expected */
         hcchar.b.chen = 1;
diff --git a/TFT/src/User/Hal/buzzer.c b/TFT/src/User/Hal/buzzer.c
index dd4d29b79f..d65f1a0b13 100644
--- a/TFT/src/User/Hal/buzzer.c
+++ b/TFT/src/User/Hal/buzzer.c
@@ -76,15 +76,13 @@ void Buzzer_play(SOUND sound)
   switch (sound)
   {
   case sound_ok:
-    if (infoSettings.alertSound != 1)
-      break;
+    if (infoSettings.alertSound != 1) break;
     Buzzer_TurnOn(3500, 50);
     Buzzer_TurnOn(0, 40);
     Buzzer_TurnOn(5500, 50);
     break;
   case sound_success:
-    if (infoSettings.alertSound != 1)
-      break;
+    if (infoSettings.alertSound != 1) break;
     Buzzer_TurnOn(3500, 50);
     Buzzer_TurnOn(0, 50);
     Buzzer_TurnOn(3500, 50);
@@ -92,15 +90,13 @@ void Buzzer_play(SOUND sound)
     Buzzer_TurnOn(3500, 50);
     break;
   case sound_cancel:
-    if (infoSettings.alertSound != 1)
-      break;
+    if (infoSettings.alertSound != 1) break;
     Buzzer_TurnOn(5500, 50);
     Buzzer_TurnOn(0, 20);
     Buzzer_TurnOn(3500, 40);
     break;
   case sound_notify:
-    if (infoSettings.alertSound != 1)
-      break;
+    if (infoSettings.alertSound != 1) break;
     Buzzer_TurnOn(3090, 50);
     Buzzer_TurnOn(0, 50);
     Buzzer_TurnOn(4190, 50);
@@ -113,19 +109,23 @@ void Buzzer_play(SOUND sound)
     Buzzer_TurnOn(2200, 200);
     break;
   case sound_deny:
-    if (infoSettings.alertSound != 1)
-      break;
+    if (infoSettings.alertSound != 1) break;
     Buzzer_TurnOn(500, 10);
   case sound_toast:
-    if (infoSettings.toastSound != 1)
-      break;
+    if (infoSettings.toastSound != 1) break;
     Buzzer_TurnOn(1500, 30);
     Buzzer_TurnOn(2000, 30);
     break;
+  case sound_preheatDone:
+    if (infoSettings.preheatDoneSound != 1) break;
+    Buzzer_TurnOn(2000,250);
+    Buzzer_TurnOn(0, 50);
+    Buzzer_TurnOn(1500, 100);
+    Buzzer_TurnOn(4000, 2500);
+    break;
   case sound_keypress:
   default:
-    if (infoSettings.touchSound != 1)
-      break;
+    if (infoSettings.touchSound != 1) break;
     Buzzer_TurnOn(BUZZER_FREQUENCY_HZ, BUZZER_FREQUENCY_DURATION_MS);
     break;
   }
@@ -151,7 +151,7 @@ void TIM3_IRQHandler(void) {
   if ((TIM3->SR & 0x01) != 0) {   // update interrupt flag
     TIM3->SR = (uint16_t)~(1<<0); // clear interrupt flag
     if (toggles != 0) {
-      if(toggles > 0) toggles--;
+      if (toggles > 0) toggles--;
        GPIO_ToggleLevel(BUZZER_PIN);
     } else {
       TIM3->CR1 &= ~(0x01); // stop timer
diff --git a/TFT/src/User/Hal/buzzer.h b/TFT/src/User/Hal/buzzer.h
index a5610df4de..3c9bd8829f 100644
--- a/TFT/src/User/Hal/buzzer.h
+++ b/TFT/src/User/Hal/buzzer.h
@@ -1,5 +1,4 @@
-#ifndef _BUZZER_H_
-#define _BUZZER_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,6 +25,7 @@ typedef enum
   sound_notify,
   sound_deny,
   sound_toast,
+  sound_preheatDone,
   sound_keypress,
 }SOUND;
 
@@ -45,5 +45,3 @@ void loopBuzzer(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Hal/sd.c b/TFT/src/User/Hal/sd.c
index cca42a0918..39fe99f12f 100644
--- a/TFT/src/User/Hal/sd.c
+++ b/TFT/src/User/Hal/sd.c
@@ -87,7 +87,7 @@ void SD_Cancel_CS(void)
 u8 SD_Select(void)
 {
   SD_SPI_CS_Set(0);
-  if(SD_Wait_Ready()==0)return 0;//Waiting for success
+  if (SD_Wait_Ready()==0) return 0;//Waiting for success
   SD_Cancel_CS();
   return 1;//Wait for failure
 }
@@ -102,7 +102,7 @@ u8 SD_Wait_Ready(void)
   u32 t=0;
   do
   {
-    if(SD_SPI_Read_Write_Byte(0XFF)==0XFF)return 0;//OK
+    if (SD_SPI_Read_Write_Byte(0XFF)==0XFF) return 0;//OK
     t++;
   }while(t<0XFFFFFF);//wait
   return 1;
@@ -135,7 +135,7 @@ u8 SD_Get_Ack(u8 Response)
 ****************************************************************************************/
 u8 SD_RecvData(u8*buf,u16 len)
 {
-  if(SD_Get_Ack(0xFE))return 1;//Wait for SD card to send back data start token 0xFE
+  if (SD_Get_Ack(0xFE)) return 1;//Wait for SD card to send back data start token 0xFE
   while(len--)//Start receiving data
   {
     *buf=SD_SPI_Read_Write_Byte(0xFF);
@@ -158,16 +158,16 @@ u8 SD_RecvData(u8*buf,u16 len)
 u8 SD_Send_Data(u8*buf,u8 cmd)
 {
   u16 t;
-  if(SD_Wait_Ready())  return 1;  //Waiting for preparation to fail
+  if (SD_Wait_Ready())  return 1;  //Waiting for preparation to fail
   SD_SPI_Read_Write_Byte(cmd);
-  if(cmd!=0XFD)//Not an end instruction
+  if (cmd!=0XFD)//Not an end instruction
   {
     for(t=0;t<512;t++)SD_SPI_Read_Write_Byte(buf[t]);
 
     SD_SPI_Read_Write_Byte(0xFF); //Ignore crc
     SD_SPI_Read_Write_Byte(0xFF);
     t = SD_SPI_Read_Write_Byte(0xFF); //Receive response
-    if((t&0x1F) != 0x05)return 2;   //Response error
+    if ((t&0x1F) != 0x05) return 2;   //Response error
   }
   return 0;//Write success
 }
@@ -186,7 +186,7 @@ u8 SD_SendCmd(u8 cmd, u32 arg, u8 crc)
   u8 r1;
   u8 Retry=0;
   SD_Cancel_CS();              //Cancel last selection
-  if(SD_Select())  return 0XFF;//Chip Select Failure
+  if (SD_Select())  return 0XFF;//Chip Select Failure
   //send
   SD_SPI_Read_Write_Byte(cmd | 0x40);//Write commands separately
   SD_SPI_Read_Write_Byte(arg >> 24);
@@ -194,7 +194,7 @@ u8 SD_SendCmd(u8 cmd, u32 arg, u8 crc)
   SD_SPI_Read_Write_Byte(arg >> 8);
   SD_SPI_Read_Write_Byte(arg);
   SD_SPI_Read_Write_Byte(crc);
-  if(cmd==CMD12)  SD_SPI_Read_Write_Byte(0xff);//Skip a stuff byte when stop reading
+  if (cmd==CMD12)  SD_SPI_Read_Write_Byte(0xff);//Skip a stuff byte when stop reading
   //Waiting for a response, or exiting after a timeout
   Retry=0X1F;
   do
@@ -217,12 +217,12 @@ u8 SD_GetCID(u8 *cid_data)
   u8 r1;
   //Send CMD10 command, read CID
   r1=SD_SendCmd(CMD10,0,0x01);
-  if(r1==0x00)
+  if (r1==0x00)
   {
     r1=SD_RecvData(cid_data,16);//Receive 16 bytes of data
   }
   SD_Cancel_CS();//Cancel film selection
-  if(r1)  return 1;
+  if (r1)  return 1;
   else    return 0;
 }
 
@@ -237,12 +237,12 @@ u8 SD_GetCSD(u8 *csd_data)
 {
   u8 r1;
   r1=SD_SendCmd(CMD9,0,0x01);    //Send CMD9 command, read CSD
-  if(r1==0)
+  if (r1==0)
   {
     r1=SD_RecvData(csd_data, 16);//Receive 16 bytes of data
   }
   SD_Cancel_CS();//Cancel film selection
-  if(r1)  return 1;
+  if (r1)  return 1;
   else    return 0;
 }
 
@@ -259,8 +259,8 @@ u32 SD_Get_Sector_Count(void)
   u32 Capacity;
   u8 n;
   u16 csize;
-  if(SD_GetCSD(csd) != 0) return 0;	//Get CSD information, if an error occurs during the period, return 0
-  if((csd[0]&0xC0) == 0x40)	        //V2.00 card, if it is SDHC card, calculate it as follows
+  if (SD_GetCSD(csd) != 0) return 0;	//Get CSD information, if an error occurs during the period, return 0
+  if ((csd[0]&0xC0) == 0x40)	        //V2.00 card, if it is SDHC card, calculate it as follows
   {
     csize = csd[9] + ((u16)csd[8] << 8) + 1;
     Capacity = (u32)csize << 10;//Get the number of sectors
@@ -296,12 +296,12 @@ u8 SD_Init(void)
     r1 = SD_SendCmd(CMD0,0,0x95);//Enter IDLE state
   }while((r1!=0X01) && retry--);
   SD_Type=0;   // No card by default
-  if(r1==0X01)
+  if (r1==0X01)
   {
-    if(SD_SendCmd(CMD8,0x1AA,0x87)==1)  //SD V2.0
+    if (SD_SendCmd(CMD8,0x1AA,0x87)==1)  //SD V2.0
     {
       for(i=0;i<4;i++)buf[i]=SD_SPI_Read_Write_Byte(0XFF);	//Get trailing return value of R7 resp
-      if(buf[2]==0X01&&buf[3]==0XAA)    //Does the card support 2.7 ~ 3.6V
+      if (buf[2]==0X01&&buf[3]==0XAA)    //Does the card support 2.7 ~ 3.6V
       {
         retry = 0XFFFE;
         do
@@ -309,10 +309,10 @@ u8 SD_Init(void)
           SD_SendCmd(CMD55,0,0X01);	    //Send CMD55
           r1 = SD_SendCmd(CMD41,0x40000000,0X01);//Send CMD41
         }while(r1 && retry--);
-        if(retry&&SD_SendCmd(CMD58,0,0X01) == 0)//Identification of SD2.0 card version started
+        if (retry&&SD_SendCmd(CMD58,0,0X01) == 0)//Identification of SD2.0 card version started
         {
           for(i=0;i<4;i++)buf[i]=SD_SPI_Read_Write_Byte(0XFF);//Get OCR value
-          if(buf[0]&0x40)SD_Type=SD_TYPE_V2HC;    //Check CCS
+          if (buf[0]&0x40)SD_Type=SD_TYPE_V2HC;    //Check CCS
           else SD_Type=SD_TYPE_V2;
         }
       }
@@ -321,7 +321,7 @@ u8 SD_Init(void)
     {
       SD_SendCmd(CMD55,0,0X01);		//Send CMD55
       r1 = SD_SendCmd(CMD41,0,0X01);	//Send CMD41
-      if(r1 <= 1)
+      if (r1 <= 1)
       {
         SD_Type = SD_TYPE_V1;
         retry = 0XFFFE;
@@ -340,14 +340,14 @@ u8 SD_Init(void)
           r1 = SD_SendCmd(CMD1,0,0X01);//Send CMD1
         }while(r1 && retry--);
       }
-      if(retry==0 || SD_SendCmd(CMD16,512,0X01)!=0)
+      if (retry==0 || SD_SendCmd(CMD16,512,0X01)!=0)
         SD_Type = SD_TYPE_ERR;//Wrong card
     }
   }
   SD_Cancel_CS();    //Cancel film selection
   SD_SetHighSpeed();
-  if(SD_Type) return 0;
-  else if(r1) return r1;
+  if (SD_Type) return 0;
+  else if (r1) return r1;
   return 0xaa;//��������
 }
 
@@ -362,11 +362,11 @@ u8 SD_Init(void)
 u8 SD_ReadDisk(u8*buf,u32 sector,u8 cnt) 	//Read SD card, fatfs / usb calls x
 {
   u8 r1;
-  if(SD_Type != SD_TYPE_V2HC) sector <<= 9;//Translate to byte address
-  if(cnt == 1)
+  if (SD_Type != SD_TYPE_V2HC) sector <<= 9;//Translate to byte address
+  if (cnt == 1)
   {
     r1 = SD_SendCmd(CMD17, sector, 0X01);//Read command
-    if(r1 == 0)												//Instruction sent successfully
+    if (r1 == 0)												//Instruction sent successfully
     {
       r1 = SD_RecvData(buf,512);			//Receive 512 bytes
     }
@@ -394,23 +394,23 @@ u8 SD_ReadDisk(u8*buf,u32 sector,u8 cnt) 	//Read SD card, fatfs / usb calls x
 u8 SD_WriteDisk(u8*buf,u32 sector,u8 cnt)	//Write SD card, fatfs / usb call
 {
   u8 r1;
-  if(SD_Type!=SD_TYPE_V2HC) sector *= 512;//Translate to byte address
-  if(cnt == 1)
+  if (SD_Type!=SD_TYPE_V2HC) sector *= 512;//Translate to byte address
+  if (cnt == 1)
   {
     r1 = SD_SendCmd(CMD24, sector, 0X01);//Read command
-    if(r1 == 0)//Instruction sent successfully
+    if (r1 == 0)//Instruction sent successfully
     {
       r1 = SD_Send_Data(buf, 0xFE);//Write 512 bytes
     }
   }else
   {
-    if(SD_Type != SD_TYPE_MMC)
+    if (SD_Type != SD_TYPE_MMC)
     {
       SD_SendCmd(CMD55, 0, 0X01);
       SD_SendCmd(CMD23, cnt, 0X01);//Send instruction
     }
     r1 = SD_SendCmd(CMD25, sector, 0X01);//Continuous read command
-    if(r1 == 0)
+    if (r1 == 0)
     {
       do
       {
diff --git a/TFT/src/User/Hal/sd.h b/TFT/src/User/Hal/sd.h
index fe4f62ab97..bfab898207 100644
--- a/TFT/src/User/Hal/sd.h
+++ b/TFT/src/User/Hal/sd.h
@@ -1,5 +1,4 @@
-#ifndef _SD_H_
-#define _SD_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,5 +63,3 @@ u8 SD_GetCSD(u8 *csd_data);                         //Read SD card CSD
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Hal/stm32f10x/GPIO_Init.c b/TFT/src/User/Hal/stm32f10x/GPIO_Init.c
index bead1bad52..3fc2f79e84 100644
--- a/TFT/src/User/Hal/stm32f10x/GPIO_Init.c
+++ b/TFT/src/User/Hal/stm32f10x/GPIO_Init.c
@@ -19,7 +19,7 @@ void GPIO_InitSet(uint16_t io, GPIO_MODE mode, uint8_t AF)
     GPIO_Port[port]->BSRR = 1 << pin;  //set high
   }
 
-  if(pin <= 7)
+  if (pin <= 7)
   {
     GPIO_Port[port]->CRL &= ~(0xF << 4*(pin & 0x7));  //clear control reg bits
     GPIO_Port[port]->CRL |= mode << 4*(pin & 0x7);  //clear control reg bits
diff --git a/TFT/src/User/Hal/stm32f10x/Serial.c b/TFT/src/User/Hal/stm32f10x/Serial.c
index f58606c894..2ff2c10844 100644
--- a/TFT/src/User/Hal/stm32f10x/Serial.c
+++ b/TFT/src/User/Hal/stm32f10x/Serial.c
@@ -92,14 +92,14 @@ void Serial_DeInit(void)
 
 void USART_IRQHandler(uint8_t port)
 {
-  if((Serial[port].uart->SR & (1<<4))!=0)
+  if ((Serial[port].uart->SR & (1<<4))!=0)
   {
     Serial[port].uart->SR;
     Serial[port].uart->DR;
 
     dmaL1Data[port].wIndex = DMA_TRANS_LEN - Serial[port].dma_chanel->CNDTR;
     uint16_t wIndex = (dmaL1Data[port].wIndex == 0) ? DMA_TRANS_LEN : dmaL1Data[port].wIndex;
-    if(dmaL1Data[port].cache[wIndex-1] == '\n')  // Receive completed
+    if (dmaL1Data[port].cache[wIndex-1] == '\n')  // Receive completed
     {
       infoHost.rx_ok[port] = true;
     }
diff --git a/TFT/src/User/Hal/stm32f10x/sdio_sdcard.c b/TFT/src/User/Hal/stm32f10x/sdio_sdcard.c
index 44b86f2e9f..e43b1bdbdf 100644
--- a/TFT/src/User/Hal/stm32f10x/sdio_sdcard.c
+++ b/TFT/src/User/Hal/stm32f10x/sdio_sdcard.c
@@ -88,13 +88,13 @@ SD_Error SD_Init(void)
 	SDIO->MASK=0x00000000;
  	MY_NVIC_Init(0,0,SDIO_IRQn,2);
   errorstatus=SD_PowerON();
-  if(errorstatus==SD_OK) errorstatus=SD_InitializeCards();
-  if(errorstatus==SD_OK) errorstatus=SD_GetCardInfo(&SDCardInfo);
-  if(errorstatus==SD_OK) errorstatus=SD_SelectDeselect((u32)(SDCardInfo.RCA<<16));
-  if(errorstatus==SD_OK) errorstatus=SD_EnableWideBusOperation(1);
-  if((errorstatus==SD_OK)||(SDIO_MULTIMEDIA_CARD==CardType))
+  if (errorstatus==SD_OK) errorstatus=SD_InitializeCards();
+  if (errorstatus==SD_OK) errorstatus=SD_GetCardInfo(&SDCardInfo);
+  if (errorstatus==SD_OK) errorstatus=SD_SelectDeselect((u32)(SDCardInfo.RCA<<16));
+  if (errorstatus==SD_OK) errorstatus=SD_EnableWideBusOperation(1);
+  if ((errorstatus==SD_OK)||(SDIO_MULTIMEDIA_CARD==CardType))
 	{
-		if(SDCardInfo.CardType==SDIO_STD_CAPACITY_SD_CARD_V1_1||SDCardInfo.CardType==SDIO_STD_CAPACITY_SD_CARD_V2_0)
+		if (SDCardInfo.CardType==SDIO_STD_CAPACITY_SD_CARD_V1_1||SDCardInfo.CardType==SDIO_STD_CAPACITY_SD_CARD_V2_0)
 		{
 			clkdiv=SDIO_TRANSFER_CLK_DIV+6;	//V1.1/V2.0 72/12=6Mhz
 		}else clkdiv=SDIO_TRANSFER_CLK_DIV;	//SDHC 72/6=12Mhz
@@ -164,39 +164,39 @@ SD_Error SD_PowerON(void)
   {
     SDIO_Send_Cmd(SD_CMD_GO_IDLE_STATE,0,0);
     errorstatus=CmdError();
-    if(errorstatus==SD_OK)break;
+    if (errorstatus==SD_OK)break;
   }
-  if(errorstatus)return errorstatus;
+  if (errorstatus) return errorstatus;
   SDIO_Send_Cmd(SDIO_SEND_IF_COND,1,SD_CHECK_PATTERN);
 
   errorstatus=CmdResp7Error();
- 	if(errorstatus==SD_OK)
+ 	if (errorstatus==SD_OK)
 	{
 		CardType=SDIO_STD_CAPACITY_SD_CARD_V2_0;
 		SDType=SD_HIGH_CAPACITY;
 	}
 	SDIO_Send_Cmd(SD_CMD_APP_CMD,1,0);
 	errorstatus=CmdResp1Error(SD_CMD_APP_CMD);
-	if(errorstatus==SD_OK)//SD2.0/SD 1.1
+	if (errorstatus==SD_OK)//SD2.0/SD 1.1
 	{
 		while((!validvoltage)&&(count<SD_MAX_VOLT_TRIAL))
 		{
 			SDIO_Send_Cmd(SD_CMD_APP_CMD,1,0);
 			errorstatus=CmdResp1Error(SD_CMD_APP_CMD);
- 			if(errorstatus!=SD_OK)return errorstatus;
+ 			if (errorstatus!=SD_OK) return errorstatus;
 			SDIO_Send_Cmd(SD_CMD_SD_APP_OP_COND,1,SD_VOLTAGE_WINDOW_SD|SDType);
 			errorstatus=CmdResp3Error();
- 			if(errorstatus!=SD_OK)return errorstatus;
+ 			if (errorstatus!=SD_OK) return errorstatus;
 			response=SDIO->RESP1;
 			validvoltage=(((response>>31)==1)?1:0);
 			count++;
 		}
-		if(count>=SD_MAX_VOLT_TRIAL)
+		if (count>=SD_MAX_VOLT_TRIAL)
 		{
 			errorstatus=SD_INVALID_VOLTRANGE;
 			return errorstatus;
 		}
-		if(response&=SD_HIGH_CAPACITY)
+		if (response&=SD_HIGH_CAPACITY)
 		{
 			CardType=SDIO_HIGH_CAPACITY_SD_CARD;
 		}
@@ -207,12 +207,12 @@ SD_Error SD_PowerON(void)
 		{
 			SDIO_Send_Cmd(SD_CMD_SEND_OP_COND,1,SD_VOLTAGE_WINDOW_MMC);//����CMD1,����Ӧ
 			errorstatus=CmdResp3Error(); 					//�ȴ�R3��Ӧ
- 			if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+ 			if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
 			response=SDIO->RESP1;;			   				//�õ���Ӧ
 			validvoltage=(((response>>31)==1)?1:0);
 			count++;
 		}
-		if(count>=SD_MAX_VOLT_TRIAL)
+		if (count>=SD_MAX_VOLT_TRIAL)
 		{
 			errorstatus=SD_INVALID_VOLTRANGE;
 			return errorstatus;
@@ -234,35 +234,35 @@ SD_Error SD_InitializeCards(void)
 {
  	SD_Error errorstatus=SD_OK;
 	u16 rca = 0x01;
- 	if((SDIO->POWER&0X03)==0)return SD_REQUEST_NOT_APPLICABLE;//����Դ״̬,ȷ��Ϊ�ϵ�״̬
- 	if(SDIO_SECURE_DIGITAL_IO_CARD!=CardType)			//��SECURE_DIGITAL_IO_CARD
+ 	if ((SDIO->POWER&0X03)==0) return SD_REQUEST_NOT_APPLICABLE;//����Դ״̬,ȷ��Ϊ�ϵ�״̬
+ 	if (SDIO_SECURE_DIGITAL_IO_CARD!=CardType)			//��SECURE_DIGITAL_IO_CARD
 	{
 		SDIO_Send_Cmd(SD_CMD_ALL_SEND_CID,3,0);			//����CMD2,ȡ��CID,����Ӧ
 		errorstatus=CmdResp2Error(); 					//�ȴ�R2��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
  		CID_Tab[0]=SDIO->RESP1;
 		CID_Tab[1]=SDIO->RESP2;
 		CID_Tab[2]=SDIO->RESP3;
 		CID_Tab[3]=SDIO->RESP4;
 	}
-	if((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_SECURE_DIGITAL_IO_COMBO_CARD==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))//�жϿ�����
+	if ((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_SECURE_DIGITAL_IO_COMBO_CARD==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))//�жϿ�����
 	{
 		SDIO_Send_Cmd(SD_CMD_SET_REL_ADDR,1,0);			//����CMD3,����Ӧ
 		errorstatus=CmdResp6Error(SD_CMD_SET_REL_ADDR,&rca);//�ȴ�R6��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
 	}
     if (SDIO_MULTIMEDIA_CARD==CardType)
     {
  		SDIO_Send_Cmd(SD_CMD_SET_REL_ADDR,1,(u32)(rca<<16));//����CMD3,����Ӧ
 		errorstatus=CmdResp2Error(); 					//�ȴ�R2��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
     }
 	if (SDIO_SECURE_DIGITAL_IO_CARD!=CardType)			//��SECURE_DIGITAL_IO_CARD
 	{
 		RCA = rca;
 		SDIO_Send_Cmd(SD_CMD_SEND_CSD,3,(u32)(rca<<16));//����CMD9+��RCA,ȡ��CSD,����Ӧ
 		errorstatus=CmdResp2Error(); 					//�ȴ�R2��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
   		CSD_Tab[0]=SDIO->RESP1;
 		CSD_Tab[1]=SDIO->RESP2;
 		CSD_Tab[2]=SDIO->RESP3;
@@ -300,7 +300,7 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo)
 	cardinfo->SD_csd.RdBlockMisalign=(tmp&0x20)>>5;	//������?
 	cardinfo->SD_csd.DSRImpl=(tmp&0x10)>>4;
 	cardinfo->SD_csd.Reserved2=0; 					//����
- 	if((CardType==SDIO_STD_CAPACITY_SD_CARD_V1_1)||(CardType==SDIO_STD_CAPACITY_SD_CARD_V2_0)||(SDIO_MULTIMEDIA_CARD==CardType))//��׼1.1/2.0��/MMC��
+ 	if ((CardType==SDIO_STD_CAPACITY_SD_CARD_V1_1)||(CardType==SDIO_STD_CAPACITY_SD_CARD_V2_0)||(SDIO_MULTIMEDIA_CARD==CardType))//��׼1.1/2.0��/MMC��
 	{
 		cardinfo->SD_csd.DeviceSize=(tmp&0x03)<<10;	//C_SIZE(12λ)
 	 	tmp=(u8)(CSD_Tab[1]&0x000000FF); 			//��7���ֽ�
@@ -319,7 +319,7 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo)
 		cardinfo->CardCapacity*=(1<<(cardinfo->SD_csd.DeviceSizeMul+2));
 		cardinfo->CardBlockSize=1<<(cardinfo->SD_csd.RdBlockLen);//����?
 		cardinfo->CardCapacity*=cardinfo->CardBlockSize;
-	}else if(CardType==SDIO_HIGH_CAPACITY_SD_CARD)	//��������
+	}else if (CardType==SDIO_HIGH_CAPACITY_SD_CARD)	//��������
 	{
  		tmp=(u8)(CSD_Tab[1]&0x000000FF); 		//��7���ֽ�
 		cardinfo->SD_csd.DeviceSize=(tmp&0x3F)<<16;//C_SIZE
@@ -398,14 +398,14 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo)
 SD_Error SD_EnableWideBusOperation(u32 wmode)
 {
   SD_Error errorstatus=SD_OK;
- 	if(SDIO_MULTIMEDIA_CARD==CardType)return SD_UNSUPPORTED_FEATURE;//MMC����֧��
- 	else if((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))
+ 	if (SDIO_MULTIMEDIA_CARD==CardType) return SD_UNSUPPORTED_FEATURE;//MMC����֧��
+ 	else if ((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))
 	{
-		if(wmode>=2)return SD_UNSUPPORTED_FEATURE;//��֧��8λģʽ
+		if (wmode>=2) return SD_UNSUPPORTED_FEATURE;//��֧��8λģʽ
  		else
 		{
 			errorstatus=SDEnWideBus(wmode);
- 			if(SD_OK==errorstatus)
+ 			if (SD_OK==errorstatus)
 			{
 				SDIO->CLKCR&=~(3<<11);		//����?ǰ��λ������
 				SDIO->CLKCR|=(u16)wmode<<11;//1λ/4λ���߿���
@@ -421,7 +421,7 @@ SD_Error SD_EnableWideBusOperation(u32 wmode)
 SD_Error SD_SetDeviceMode(u32 Mode)
 {
 	SD_Error errorstatus = SD_OK;
- 	if((Mode==SD_DMA_MODE)||(Mode==SD_POLLING_MODE))DeviceMode=Mode;
+ 	if ((Mode==SD_DMA_MODE)||(Mode==SD_POLLING_MODE))DeviceMode=Mode;
 	else errorstatus=SD_INVALID_PARAMETER;
 	return errorstatus;
 }
@@ -443,32 +443,32 @@ SD_Error SD_ReadBlock(u8 *buf,long long addr,u16 blksize)
 	u8 power;
   u32 count=0,*tempbuff=(u32*)buf;//ת��Ϊu32ָ��
 	u32 timeout=SDIO_DATATIMEOUT;
-  if(NULL==buf) return SD_INVALID_PARAMETER;
+  if (NULL==buf) return SD_INVALID_PARAMETER;
   SDIO->DCTRL=0x0;	//���ݿ��ƼĴ�������(��DMA)
-	if(CardType==SDIO_HIGH_CAPACITY_SD_CARD)//��������
+	if (CardType==SDIO_HIGH_CAPACITY_SD_CARD)//��������
 	{
 		blksize=512;
 		addr>>=9;
 	}
   	SDIO_Send_Data_Cfg(SD_DATATIMEOUT,0,0,0);	//���DPSM״̬������
-	if(SDIO->RESP1&SD_CARD_LOCKED)return SD_LOCK_UNLOCK_FAILED;//������
-	if((blksize>0)&&(blksize<=2048)&&((blksize&(blksize-1))==0))
+	if (SDIO->RESP1&SD_CARD_LOCKED) return SD_LOCK_UNLOCK_FAILED;//������
+	if ((blksize>0)&&(blksize<=2048)&&((blksize&(blksize-1))==0))
 	{
 		power=convert_from_bytes_to_power_of_two(blksize);
 		SDIO_Send_Cmd(SD_CMD_SET_BLOCKLEN,1,blksize);	//����CMD16+�������ݳ���Ϊblksize,����Ӧ
 		errorstatus=CmdResp1Error(SD_CMD_SET_BLOCKLEN);	//�ȴ�R1��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
 	}else return SD_INVALID_PARAMETER;
   	SDIO_Send_Data_Cfg(SD_DATATIMEOUT,blksize,power,1);	//blksize,����������
    	SDIO_Send_Cmd(SD_CMD_READ_SINGLE_BLOCK,1,addr);		//����CMD17+��addr��ַ����ȡ����,����Ӧ
 	errorstatus=CmdResp1Error(SD_CMD_READ_SINGLE_BLOCK);//�ȴ�R1��Ӧ
-	if(errorstatus!=SD_OK)return errorstatus;   		//��Ӧ����
- 	if(DeviceMode==SD_POLLING_MODE)						//��ѯģʽ,��ѯ����
+	if (errorstatus!=SD_OK) return errorstatus;   		//��Ӧ����
+ 	if (DeviceMode==SD_POLLING_MODE)						//��ѯģʽ,��ѯ����
 	{
  		INTX_DISABLE();//�ر����ж�(POLLINGģʽ,�Ͻ��жϴ��SDIO��д����!!!)
 		while(!(SDIO->STA&((1<<5)|(1<<1)|(1<<3)|(1<<10)|(1<<9))))//������/CRC/��ʱ/���?(��־)/��ʼλ����
 		{
-			if(SDIO->STA&(1<<15))						//����������,��ʾ���ٴ���8����
+			if (SDIO->STA&(1<<15))						//����������,��ʾ���ٴ���8����
 			{
 				for(count=0;count<8;count++)			//ѭ����ȡ����
 				{
@@ -478,23 +478,23 @@ SD_Error SD_ReadBlock(u8 *buf,long long addr,u16 blksize)
 				timeout=0X7FFFFF; 	//���������ʱ��?
 			}else 	//������ʱ
 			{
-				if(timeout==0)return SD_DATA_TIMEOUT;
+				if (timeout==0) return SD_DATA_TIMEOUT;
 				timeout--;
 			}
 		}
-		if(SDIO->STA&(1<<3))		//���ݳ�ʱ����
+		if (SDIO->STA&(1<<3))		//���ݳ�ʱ����
 		{
 	 		SDIO->ICR|=1<<3; 		//������־
 			return SD_DATA_TIMEOUT;
-	 	}else if(SDIO->STA&(1<<1))	//���ݿ�CRC����
+	 	}else if (SDIO->STA&(1<<1))	//���ݿ�CRC����
 		{
 	 		SDIO->ICR|=1<<1; 		//������־
 			return SD_DATA_CRC_FAIL;
-		}else if(SDIO->STA&(1<<5)) 	//����fifo�������?
+		}else if (SDIO->STA&(1<<5)) 	//����fifo�������?
 		{
 	 		SDIO->ICR|=1<<5; 		//������־
 			return SD_RX_OVERRUN;
-		}else if(SDIO->STA&(1<<9)) 	//������ʼλ����
+		}else if (SDIO->STA&(1<<9)) 	//������ʼλ����
 		{
 	 		SDIO->ICR|=1<<9; 		//������־
 			return SD_START_BIT_ERR;
@@ -506,7 +506,7 @@ SD_Error SD_ReadBlock(u8 *buf,long long addr,u16 blksize)
 		}
 		INTX_ENABLE();//�������ж�
 		SDIO->ICR=0X5FF;	 		//�������
-	}else if(DeviceMode==SD_DMA_MODE)
+	}else if (DeviceMode==SD_DMA_MODE)
 	{
   	    SD_DMA_Config((u32*)buf,blksize,0);
 		TransferError=SD_OK;
@@ -515,8 +515,8 @@ SD_Error SD_ReadBlock(u8 *buf,long long addr,u16 blksize)
 		SDIO->MASK|=(1<<1)|(1<<3)|(1<<8)|(1<<5)|(1<<9);	//������Ҫ���ж�
 	 	SDIO->DCTRL|=1<<3;		 	//SDIO DMAʹ��
  		while(((DMA2->ISR&0X2000)==RESET)&&(TransferEnd==0)&&(TransferError==SD_OK)&&timeout)timeout--;//�ȴ��������?
-		if(timeout==0)return SD_DATA_TIMEOUT;//��ʱ
-		if(TransferError!=SD_OK)errorstatus=TransferError;
+		if (timeout==0) return SD_DATA_TIMEOUT;//��ʱ
+		if (TransferError!=SD_OK)errorstatus=TransferError;
     }
  	return errorstatus;
 }
@@ -531,33 +531,33 @@ SD_Error SD_ReadMultiBlocks(u8 *buf,long long addr,u16 blksize,u32 nblks)
 	tempbuff=(u32*)buf;//ת��Ϊu32ָ��
 
   SDIO->DCTRL=0x0;		//���ݿ��ƼĴ�������(��DMA)
-	if(CardType==SDIO_HIGH_CAPACITY_SD_CARD)//��������
+	if (CardType==SDIO_HIGH_CAPACITY_SD_CARD)//��������
 	{
 		blksize=512;
 		addr>>=9;
 	}
   SDIO_Send_Data_Cfg(SD_DATATIMEOUT,0,0,0);	//���DPSM״̬������
-	if(SDIO->RESP1&SD_CARD_LOCKED)return SD_LOCK_UNLOCK_FAILED;//������
-	if((blksize>0)&&(blksize<=2048)&&((blksize&(blksize-1))==0))
+	if (SDIO->RESP1&SD_CARD_LOCKED) return SD_LOCK_UNLOCK_FAILED;//������
+	if ((blksize>0)&&(blksize<=2048)&&((blksize&(blksize-1))==0))
 	{
 		power=convert_from_bytes_to_power_of_two(blksize);
 		SDIO_Send_Cmd(SD_CMD_SET_BLOCKLEN,1,blksize);	//����CMD16+�������ݳ���Ϊblksize,����Ӧ
 		errorstatus=CmdResp1Error(SD_CMD_SET_BLOCKLEN);	//�ȴ�R1��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
 	}else return SD_INVALID_PARAMETER;
-	if(nblks>1)											//����
+	if (nblks>1)											//����
 	{
-    if(nblks*blksize>SD_MAX_DATA_LENGTH) return SD_INVALID_PARAMETER;//�ж��Ƿ񳬹������ճ���
+    if (nblks*blksize>SD_MAX_DATA_LENGTH) return SD_INVALID_PARAMETER;//�ж��Ƿ񳬹������ճ���
 		SDIO_Send_Data_Cfg(SD_DATATIMEOUT,nblks*blksize,power,1);//nblks*blksize,512����?,����������
     SDIO_Send_Cmd(SD_CMD_READ_MULT_BLOCK,1,addr);	//����CMD18+��addr��ַ����ȡ����,����Ӧ
 		errorstatus=CmdResp1Error(SD_CMD_READ_MULT_BLOCK);//�ȴ�R1��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
- 		if(DeviceMode==SD_POLLING_MODE)
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
+ 		if (DeviceMode==SD_POLLING_MODE)
 		{
 			INTX_DISABLE();//�ر����ж�(POLLINGģʽ,�Ͻ��жϴ��SDIO��д����!!!)
 			while(!(SDIO->STA&((1<<5)|(1<<1)|(1<<3)|(1<<8)|(1<<9))))//������/CRC/��ʱ/���?(��־)/��ʼλ����
 			{
-				if(SDIO->STA&(1<<15))						//����������,��ʾ���ٴ���8����
+				if (SDIO->STA&(1<<15))						//����������,��ʾ���ٴ���8����
 				{
 					for(count=0;count<8;count++)			//ѭ����ȡ����
 					{
@@ -567,23 +567,23 @@ SD_Error SD_ReadMultiBlocks(u8 *buf,long long addr,u16 blksize,u32 nblks)
 					timeout=0X7FFFFF; 	//���������ʱ��?
 				}else 	//������ʱ
 				{
-					if(timeout==0)return SD_DATA_TIMEOUT;
+					if (timeout==0) return SD_DATA_TIMEOUT;
 					timeout--;
 				}
 			}
-			if(SDIO->STA&(1<<3))		//���ݳ�ʱ����
+			if (SDIO->STA&(1<<3))		//���ݳ�ʱ����
 			{
 		 		SDIO->ICR|=1<<3; 		//������־
 				return SD_DATA_TIMEOUT;
-		 	}else if(SDIO->STA&(1<<1))	//���ݿ�CRC����
+		 	}else if (SDIO->STA&(1<<1))	//���ݿ�CRC����
 			{
 		 		SDIO->ICR|=1<<1; 		//������־
 				return SD_DATA_CRC_FAIL;
-			}else if(SDIO->STA&(1<<5)) 	//����fifo�������?
+			}else if (SDIO->STA&(1<<5)) 	//����fifo�������?
 			{
 		 		SDIO->ICR|=1<<5; 		//������־
 				return SD_RX_OVERRUN;
-			}else if(SDIO->STA&(1<<9)) 	//������ʼλ����
+			}else if (SDIO->STA&(1<<9)) 	//������ʼλ����
 			{
 		 		SDIO->ICR|=1<<9; 		//������־
 				return SD_START_BIT_ERR;
@@ -593,18 +593,18 @@ SD_Error SD_ReadMultiBlocks(u8 *buf,long long addr,u16 blksize,u32 nblks)
 				*tempbuff=SDIO->FIFO;	//ѭ����ȡ����
 				tempbuff++;
 			}
-	 		if(SDIO->STA&(1<<8))		//���ս���
+	 		if (SDIO->STA&(1<<8))		//���ս���
 			{
-				if((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))
+				if ((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))
 				{
 					SDIO_Send_Cmd(SD_CMD_STOP_TRANSMISSION,1,0);		//����CMD12+��������
 					errorstatus=CmdResp1Error(SD_CMD_STOP_TRANSMISSION);//�ȴ�R1��Ӧ
-					if(errorstatus!=SD_OK)return errorstatus;
+					if (errorstatus!=SD_OK) return errorstatus;
 				}
  			}
 			INTX_ENABLE();//�������ж�
 	 		SDIO->ICR=0X5FF;	 		//�������
- 		}else if(DeviceMode==SD_DMA_MODE)
+ 		}else if (DeviceMode==SD_DMA_MODE)
 		{
 	 	    SD_DMA_Config((u32*)buf,nblks*blksize,0);
 	   		TransferError=SD_OK;
@@ -613,9 +613,9 @@ SD_Error SD_ReadMultiBlocks(u8 *buf,long long addr,u16 blksize,u32 nblks)
 			SDIO->MASK|=(1<<1)|(1<<3)|(1<<8)|(1<<5)|(1<<9);	//������Ҫ���ж�
 		 	SDIO->DCTRL|=1<<3;		 						//SDIO DMAʹ��
 	 		while(((DMA2->ISR&0X2000)==RESET)&&timeout)timeout--;//�ȴ��������?
-			if(timeout==0)return SD_DATA_TIMEOUT;//��ʱ
+			if (timeout==0) return SD_DATA_TIMEOUT;//��ʱ
 			while((TransferEnd==0)&&(TransferError==SD_OK));
-			if(TransferError!=SD_OK)errorstatus=TransferError;
+			if (TransferError!=SD_OK)errorstatus=TransferError;
 		}
   	}
 	return errorstatus;
@@ -633,25 +633,25 @@ SD_Error SD_WriteBlock(u8 *buf,long long addr,  u16 blksize)
 	u32 cardstatus=0,count=0,restwords=0;
 	u32	tlen=blksize;						//�ܳ���(�ֽ�)
 	u32*tempbuff=(u32*)buf;
- 	if(buf==NULL)return SD_INVALID_PARAMETER;//��������
+ 	if (buf==NULL) return SD_INVALID_PARAMETER;//��������
   SDIO->DCTRL=0x0;							//���ݿ��ƼĴ�������(��DMA)
   SDIO_Send_Data_Cfg(SD_DATATIMEOUT,0,0,0);	//���DPSM״̬������
-	if(SDIO->RESP1&SD_CARD_LOCKED)return SD_LOCK_UNLOCK_FAILED;//������
- 	if(CardType==SDIO_HIGH_CAPACITY_SD_CARD)	//��������
+	if (SDIO->RESP1&SD_CARD_LOCKED) return SD_LOCK_UNLOCK_FAILED;//������
+ 	if (CardType==SDIO_HIGH_CAPACITY_SD_CARD)	//��������
 	{
 		blksize=512;
 		addr>>=9;
 	}
-	if((blksize>0)&&(blksize<=2048)&&((blksize&(blksize-1))==0))
+	if ((blksize>0)&&(blksize<=2048)&&((blksize&(blksize-1))==0))
 	{
 		power=convert_from_bytes_to_power_of_two(blksize);
 		SDIO_Send_Cmd(SD_CMD_SET_BLOCKLEN,1,blksize);	//����CMD16+�������ݳ���Ϊblksize,����Ӧ
 		errorstatus=CmdResp1Error(SD_CMD_SET_BLOCKLEN);	//�ȴ�R1��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
 	}else return SD_INVALID_PARAMETER;
   SDIO_Send_Cmd(SD_CMD_SEND_STATUS,1,(u32)RCA<<16);	//����CMD13,��ѯ����״̬,����Ӧ
 	errorstatus=CmdResp1Error(SD_CMD_SEND_STATUS);		//�ȴ�R1��Ӧ
-	if(errorstatus!=SD_OK)return errorstatus;
+	if (errorstatus!=SD_OK) return errorstatus;
 	cardstatus=SDIO->RESP1;
 	timeout=SD_DATATIMEOUT;
   while(((cardstatus&0x00000100)==0)&&(timeout>0)) 	//���READY_FOR_DATAλ�Ƿ���λ
@@ -659,13 +659,13 @@ SD_Error SD_WriteBlock(u8 *buf,long long addr,  u16 blksize)
 		timeout--;
     SDIO_Send_Cmd(SD_CMD_SEND_STATUS,1,(u32)RCA<<16);//����CMD13,��ѯ����״̬,����Ӧ
 		errorstatus=CmdResp1Error(SD_CMD_SEND_STATUS);	//�ȴ�R1��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;
+		if (errorstatus!=SD_OK) return errorstatus;
 		cardstatus=SDIO->RESP1;
 	}
-	if(timeout==0)return SD_ERROR;
+	if (timeout==0) return SD_ERROR;
   SDIO_Send_Cmd(SD_CMD_WRITE_SINGLE_BLOCK,1,addr);	//����CMD24,д����ָ��,����Ӧ
 	errorstatus=CmdResp1Error(SD_CMD_WRITE_SINGLE_BLOCK);//�ȴ�R1��Ӧ
-	if(errorstatus!=SD_OK)return errorstatus;
+	if (errorstatus!=SD_OK) return errorstatus;
 	StopCondition=0;									//����д,����Ҫ����ֹͣ����ָ��
  	SDIO_Send_Data_Cfg(SD_DATATIMEOUT,blksize,power,0);	//blksize, ����������
 	timeout=SDIO_DATATIMEOUT;
@@ -674,9 +674,9 @@ SD_Error SD_WriteBlock(u8 *buf,long long addr,  u16 blksize)
 		INTX_DISABLE();//�ر����ж�(POLLINGģʽ,�Ͻ��жϴ��SDIO��д����!!!)
 		while(!(SDIO->STA&((1<<10)|(1<<4)|(1<<1)|(1<<3)|(1<<9))))//���ݿ鷢�ͳɹ�/����/CRC/��ʱ/��ʼλ����
 		{
-			if(SDIO->STA&(1<<14))							//���������?,��ʾ���ٴ���8����
+			if (SDIO->STA&(1<<14))							//���������?,��ʾ���ٴ���8����
 			{
-				if((tlen-bytestransferred)<SD_HALFFIFOBYTES)//����32�ֽ���
+				if ((tlen-bytestransferred)<SD_HALFFIFOBYTES)//����32�ֽ���
 				{
 					restwords=((tlen-bytestransferred)%4==0)?((tlen-bytestransferred)/4):((tlen-bytestransferred)/4+1);
 
@@ -696,30 +696,30 @@ SD_Error SD_WriteBlock(u8 *buf,long long addr,  u16 blksize)
 				timeout=0X3FFFFFFF;	//д�������ʱ��?
 			}else
 			{
-				if(timeout==0)return SD_DATA_TIMEOUT;
+				if (timeout==0) return SD_DATA_TIMEOUT;
 				timeout--;
 			}
 		}
-		if(SDIO->STA&(1<<3))		//���ݳ�ʱ����
+		if (SDIO->STA&(1<<3))		//���ݳ�ʱ����
 		{
 	 		SDIO->ICR|=1<<3; 		//������־
 			return SD_DATA_TIMEOUT;
-	 	}else if(SDIO->STA&(1<<1))	//���ݿ�CRC����
+	 	}else if (SDIO->STA&(1<<1))	//���ݿ�CRC����
 		{
 	 		SDIO->ICR|=1<<1; 		//������־
 			return SD_DATA_CRC_FAIL;
-		}else if(SDIO->STA&(1<<4)) 	//����fifo�������?
+		}else if (SDIO->STA&(1<<4)) 	//����fifo�������?
 		{
 	 		SDIO->ICR|=1<<4; 		//������־
 			return SD_TX_UNDERRUN;
-		}else if(SDIO->STA&(1<<9)) 	//������ʼλ����
+		}else if (SDIO->STA&(1<<9)) 	//������ʼλ����
 		{
 	 		SDIO->ICR|=1<<9; 		//������־
 			return SD_START_BIT_ERR;
 		}
 		INTX_ENABLE();//�������ж�
 		SDIO->ICR=0X5FF;	 		//�������
-	}else if(DeviceMode==SD_DMA_MODE)
+	}else if (DeviceMode==SD_DMA_MODE)
 	{
 		SD_DMA_Config((u32*)buf,blksize,1);//SDIO DMA����
    		TransferError=SD_OK;
@@ -728,15 +728,15 @@ SD_Error SD_WriteBlock(u8 *buf,long long addr,  u16 blksize)
 		SDIO->MASK|=(1<<1)|(1<<3)|(1<<8)|(1<<4)|(1<<9);	//���ò������ݽ�������ж�?
  	 	SDIO->DCTRL|=1<<3;								//SDIO DMAʹ��.
  		while(((DMA2->ISR&0X2000)==RESET)&&timeout)timeout--;//�ȴ��������?
-		if(timeout==0)
+		if (timeout==0)
 		{
   			SD_Init();	 					//���³�ʼ��SD��,���Խ��д������������?
 			return SD_DATA_TIMEOUT;			//��ʱ
  		}
 		timeout=SDIO_DATATIMEOUT;
 		while((TransferEnd==0)&&(TransferError==SD_OK)&&timeout)timeout--;
- 		if(timeout==0)return SD_DATA_TIMEOUT;			//��ʱ
-  		if(TransferError!=SD_OK)return TransferError;
+ 		if (timeout==0) return SD_DATA_TIMEOUT;			//��ʱ
+  		if (TransferError!=SD_OK) return TransferError;
  	}
  	SDIO->ICR=0X5FF;	 		//�������
  	errorstatus=IsCardProgramming(&cardstate);
@@ -760,48 +760,48 @@ SD_Error SD_WriteMultiBlocks(u8 *buf,long long addr,u16 blksize,u32 nblks)
 	u32 count = 0, restwords = 0;
 	u32 tlen=nblks*blksize;				//�ܳ���(�ֽ�)
 	u32 *tempbuff = (u32*)buf;
-  if(buf==NULL)return SD_INVALID_PARAMETER; //��������
+  if (buf==NULL) return SD_INVALID_PARAMETER; //��������
   SDIO->DCTRL=0x0;							//���ݿ��ƼĴ�������(��DMA)
   SDIO_Send_Data_Cfg(SD_DATATIMEOUT,0,0,0);	//���DPSM״̬������
-	if(SDIO->RESP1&SD_CARD_LOCKED)return SD_LOCK_UNLOCK_FAILED;//������
- 	if(CardType==SDIO_HIGH_CAPACITY_SD_CARD)//��������
+	if (SDIO->RESP1&SD_CARD_LOCKED) return SD_LOCK_UNLOCK_FAILED;//������
+ 	if (CardType==SDIO_HIGH_CAPACITY_SD_CARD)//��������
 	{
 		blksize=512;
 		addr>>=9;
 	}
-	if((blksize>0)&&(blksize<=2048)&&((blksize&(blksize-1))==0))
+	if ((blksize>0)&&(blksize<=2048)&&((blksize&(blksize-1))==0))
 	{
 		power=convert_from_bytes_to_power_of_two(blksize);
 		SDIO_Send_Cmd(SD_CMD_SET_BLOCKLEN,1,blksize);	//����CMD16+�������ݳ���Ϊblksize,����Ӧ
 		errorstatus=CmdResp1Error(SD_CMD_SET_BLOCKLEN);	//�ȴ�R1��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;   	//��Ӧ����
+		if (errorstatus!=SD_OK) return errorstatus;   	//��Ӧ����
 	}else return SD_INVALID_PARAMETER;
-	if(nblks>1)
+	if (nblks>1)
 	{
-		if(nblks*blksize>SD_MAX_DATA_LENGTH)return SD_INVALID_PARAMETER;
-     	if((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))
+		if (nblks*blksize>SD_MAX_DATA_LENGTH) return SD_INVALID_PARAMETER;
+     	if ((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))
     	{
 			//�������?
 	 	   	SDIO_Send_Cmd(SD_CMD_APP_CMD,1,(u32)RCA<<16);	//����ACMD55,����Ӧ
 			errorstatus=CmdResp1Error(SD_CMD_APP_CMD);		//�ȴ�R1��Ӧ
-			if(errorstatus!=SD_OK)return errorstatus;
+			if (errorstatus!=SD_OK) return errorstatus;
 	 	   	SDIO_Send_Cmd(SD_CMD_SET_BLOCK_COUNT,1,nblks);	//����CMD23,���ÿ�����,����Ӧ
 			errorstatus=CmdResp1Error(SD_CMD_SET_BLOCK_COUNT);//�ȴ�R1��Ӧ
-			if(errorstatus!=SD_OK)return errorstatus;
+			if (errorstatus!=SD_OK) return errorstatus;
 		}
 		SDIO_Send_Cmd(SD_CMD_WRITE_MULT_BLOCK,1,addr);		//����CMD25,���дָ��?,����Ӧ
 		errorstatus=CmdResp1Error(SD_CMD_WRITE_MULT_BLOCK);	//�ȴ�R1��Ӧ
-		if(errorstatus!=SD_OK)return errorstatus;
+		if (errorstatus!=SD_OK) return errorstatus;
  	 	SDIO_Send_Data_Cfg(SD_DATATIMEOUT,nblks*blksize,power,0);//blksize, ����������
-		if(DeviceMode==SD_POLLING_MODE)
+		if (DeviceMode==SD_POLLING_MODE)
 	    {
 			timeout=SDIO_DATATIMEOUT;
 			INTX_DISABLE();//�ر����ж�(POLLINGģʽ,�Ͻ��жϴ��SDIO��д����!!!)
 			while(!(SDIO->STA&((1<<4)|(1<<1)|(1<<8)|(1<<3)|(1<<9))))//����/CRC/���ݽ���/��ʱ/��ʼλ����
 			{
-				if(SDIO->STA&(1<<14))							//���������?,��ʾ���ٴ���8��(32�ֽ�)
+				if (SDIO->STA&(1<<14))							//���������?,��ʾ���ٴ���8��(32�ֽ�)
 				{
-					if((tlen-bytestransferred)<SD_HALFFIFOBYTES)//����32�ֽ���
+					if ((tlen-bytestransferred)<SD_HALFFIFOBYTES)//����32�ֽ���
 					{
 						restwords=((tlen-bytestransferred)%4==0)?((tlen-bytestransferred)/4):((tlen-bytestransferred)/4+1);
 						for(count=0;count<restwords;count++,tempbuff++,bytestransferred+=4)
@@ -820,39 +820,43 @@ SD_Error SD_WriteMultiBlocks(u8 *buf,long long addr,u16 blksize,u32 nblks)
 					timeout=0X3FFFFFFF;	//д�������ʱ��?
 				}else
 				{
-					if(timeout==0)return SD_DATA_TIMEOUT;
+					if (timeout==0) return SD_DATA_TIMEOUT;
 					timeout--;
 				}
 			}
-			if(SDIO->STA&(1<<3))		//���ݳ�ʱ����
+			if (SDIO->STA&(1<<3))		//���ݳ�ʱ����
 			{
 		 		SDIO->ICR|=1<<3; 		//������־
 				return SD_DATA_TIMEOUT;
-		 	}else if(SDIO->STA&(1<<1))	//���ݿ�CRC����
+		 	}
+			else if (SDIO->STA&(1<<1))	//���ݿ�CRC����
 			{
 		 		SDIO->ICR|=1<<1; 		//������־
 				return SD_DATA_CRC_FAIL;
-			}else if(SDIO->STA&(1<<4)) 	//����fifo�������?
+			}
+			else if (SDIO->STA&(1<<4)) 	//����fifo�������?
 			{
 		 		SDIO->ICR|=1<<4; 		//������־
 				return SD_TX_UNDERRUN;
-			}else if(SDIO->STA&(1<<9)) 	//������ʼλ����
+			}
+			else if (SDIO->STA&(1<<9)) 	//������ʼλ����
 			{
 		 		SDIO->ICR|=1<<9; 		//������־
 				return SD_START_BIT_ERR;
 			}
-			if(SDIO->STA&(1<<8))		//���ͽ���
+			if (SDIO->STA&(1<<8))		//���ͽ���
 			{
-				if((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))
+				if ((SDIO_STD_CAPACITY_SD_CARD_V1_1==CardType)||(SDIO_STD_CAPACITY_SD_CARD_V2_0==CardType)||(SDIO_HIGH_CAPACITY_SD_CARD==CardType))
 				{
 					SDIO_Send_Cmd(SD_CMD_STOP_TRANSMISSION,1,0);		//����CMD12+��������
 					errorstatus=CmdResp1Error(SD_CMD_STOP_TRANSMISSION);//�ȴ�R1��Ӧ
-					if(errorstatus!=SD_OK)return errorstatus;
+					if (errorstatus!=SD_OK) return errorstatus;
 				}
 			}
 			INTX_ENABLE();//�������ж�
 	 		SDIO->ICR=0X5FF;	 		//�������
-	    }else if(DeviceMode==SD_DMA_MODE)
+	    }
+		else if (DeviceMode==SD_DMA_MODE)
 		{
 			SD_DMA_Config((u32*)buf,nblks*blksize,1);//SDIO DMA����
       TransferError=SD_OK;
@@ -862,15 +866,15 @@ SD_Error SD_WriteMultiBlocks(u8 *buf,long long addr,u16 blksize,u32 nblks)
 	 	 	SDIO->DCTRL|=1<<3;								//SDIO DMAʹ��.
 			timeout=SDIO_DATATIMEOUT;
 	 		while(((DMA2->ISR&0X2000)==RESET)&&timeout)timeout--;//�ȴ��������?
-			if(timeout==0)	 								//��ʱ
+			if (timeout==0)	 								//��ʱ
 			{
   				SD_Init();	 					//���³�ʼ��SD��,���Խ��д������������?
 	 			return SD_DATA_TIMEOUT;			//��ʱ
 	 		}
 			timeout=SDIO_DATATIMEOUT;
 			while((TransferEnd==0)&&(TransferError==SD_OK)&&timeout)timeout--;
-	 		if(timeout==0)return SD_DATA_TIMEOUT;			//��ʱ
-	 		if(TransferError!=SD_OK)return TransferError;
+	 		if (timeout==0) return SD_DATA_TIMEOUT;			//��ʱ
+	 		if (TransferError!=SD_OK) return TransferError;
 		}
   	}
  	SDIO->ICR=0X5FF;	 		//�������
@@ -891,7 +895,7 @@ void SDIO_IRQHandler(void)
 //����ֵ:�������?
 SD_Error SD_ProcessIRQSrc(void)
 {
-	if(SDIO->STA&(1<<8))//���������
+	if (SDIO->STA&(1<<8))//���������
 	{
 		if (StopCondition==1)
 		{
@@ -903,35 +907,35 @@ SD_Error SD_ProcessIRQSrc(void)
  		TransferEnd = 1;
 		return(TransferError);
 	}
- 	if(SDIO->STA&(1<<1))//����CRC����
+ 	if (SDIO->STA&(1<<1))//����CRC����
 	{
 		SDIO->ICR|=1<<1;//����жϱ��
 		SDIO->MASK&=~((1<<1)|(1<<3)|(1<<8)|(1<<14)|(1<<15)|(1<<4)|(1<<5)|(1<<9));//�ر�����ж�?
 	    TransferError = SD_DATA_CRC_FAIL;
 	    return(SD_DATA_CRC_FAIL);
 	}
- 	if(SDIO->STA&(1<<3))//���ݳ�ʱ����
+ 	if (SDIO->STA&(1<<3))//���ݳ�ʱ����
 	{
 		SDIO->ICR|=1<<3;//����жϱ��
 		SDIO->MASK&=~((1<<1)|(1<<3)|(1<<8)|(1<<14)|(1<<15)|(1<<4)|(1<<5)|(1<<9));//�ر�����ж�?
 	    TransferError = SD_DATA_TIMEOUT;
 	    return(SD_DATA_TIMEOUT);
 	}
-  	if(SDIO->STA&(1<<5))//FIFO�������?
+  	if (SDIO->STA&(1<<5))//FIFO�������?
 	{
 		SDIO->ICR|=1<<5;//����жϱ��
 		SDIO->MASK&=~((1<<1)|(1<<3)|(1<<8)|(1<<14)|(1<<15)|(1<<4)|(1<<5)|(1<<9));//�ر�����ж�?
 	    TransferError = SD_RX_OVERRUN;
 	    return(SD_RX_OVERRUN);
 	}
-   	if(SDIO->STA&(1<<4))//FIFO�������?
+   	if (SDIO->STA&(1<<4))//FIFO�������?
 	{
 		SDIO->ICR|=1<<4;//����жϱ��
 		SDIO->MASK&=~((1<<1)|(1<<3)|(1<<8)|(1<<14)|(1<<15)|(1<<4)|(1<<5)|(1<<9));//�ر�����ж�?
 	    TransferError = SD_TX_UNDERRUN;
 	    return(SD_TX_UNDERRUN);
 	}
-	if(SDIO->STA&(1<<9))//��ʼλ����
+	if (SDIO->STA&(1<<9))//��ʼλ����
 	{
 		SDIO->ICR|=1<<9;//����жϱ��
 		SDIO->MASK&=~((1<<1)|(1<<3)|(1<<8)|(1<<14)|(1<<15)|(1<<4)|(1<<5)|(1<<9));//�ر�����ж�?
@@ -949,9 +953,9 @@ SD_Error CmdError(void)
 	u32 timeout=SDIO_CMD0TIMEOUT;
 	while(timeout--)
 	{
-		if(SDIO->STA&(1<<7))break;	//�����ѷ���(������Ӧ)
+		if (SDIO->STA&(1<<7))break;	//�����ѷ���(������Ӧ)
 	}
-	if(timeout==0)return SD_CMD_RSP_TIMEOUT;
+	if (timeout==0) return SD_CMD_RSP_TIMEOUT;
 	SDIO->ICR=0X5FF;				//������
 	return errorstatus;
 }
@@ -965,15 +969,15 @@ SD_Error CmdResp7Error(void)
  	while(timeout--)
 	{
 		status=SDIO->STA;
-		if(status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
+		if (status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
 	}
- 	if((timeout==0)||(status&(1<<2)))	//��Ӧ��ʱ
+ 	if ((timeout==0)||(status&(1<<2)))	//��Ӧ��ʱ
 	{
 		errorstatus=SD_CMD_RSP_TIMEOUT;	//��ǰ������2.0���ݿ�,���߲�֧���趨�ĵ�ѹ��Χ
 		SDIO->ICR|=1<<2;				//���������Ӧ��ʱ���?
 		return errorstatus;
 	}
-	if(status&1<<6)						//�ɹ����յ���Ӧ
+	if (status&1<<6)						//�ɹ����յ���Ӧ
 	{
 		errorstatus=SD_OK;
 		SDIO->ICR|=1<<6;				//�����Ӧ���?
@@ -989,19 +993,19 @@ SD_Error CmdResp1Error(u8 cmd)
 	while(1)
 	{
 		status=SDIO->STA;
-		if(status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
+		if (status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
 	}
-	if(status&(1<<2))					//��Ӧ��ʱ
+	if (status&(1<<2))					//��Ӧ��ʱ
 	{
  		SDIO->ICR=1<<2;					//���������Ӧ��ʱ���?
 		return SD_CMD_RSP_TIMEOUT;
 	}
- 	if(status&(1<<0))					//CRC����
+ 	if (status&(1<<0))					//CRC����
 	{
  		SDIO->ICR=1<<0;					//������?
 		return SD_CMD_CRC_FAIL;
 	}
-	if(SDIO->RESPCMD!=cmd)return SD_ILLEGAL_CMD;//���ƥ��
+	if (SDIO->RESPCMD!=cmd) return SD_ILLEGAL_CMD;//���ƥ��
   	SDIO->ICR=0X5FF;	 				//������
 	return (SD_Error)(SDIO->RESP1&SD_OCR_ERRORBITS);//���ؿ���Ӧ
 }
@@ -1013,9 +1017,9 @@ SD_Error CmdResp3Error(void)
  	while(1)
 	{
 		status=SDIO->STA;
-		if(status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
+		if (status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
 	}
- 	if(status&(1<<2))					//��Ӧ��ʱ
+ 	if (status&(1<<2))					//��Ӧ��ʱ
 	{
 		SDIO->ICR|=1<<2;				//���������Ӧ��ʱ���?
 		return SD_CMD_RSP_TIMEOUT;
@@ -1033,15 +1037,15 @@ SD_Error CmdResp2Error(void)
  	while(timeout--)
 	{
 		status=SDIO->STA;
-		if(status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
+		if (status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
 	}
-  	if((timeout==0)||(status&(1<<2)))	//��Ӧ��ʱ
+  	if ((timeout==0)||(status&(1<<2)))	//��Ӧ��ʱ
 	{
 		errorstatus=SD_CMD_RSP_TIMEOUT;
 		SDIO->ICR|=1<<2;				//���������Ӧ��ʱ���?
 		return errorstatus;
 	}
-	if(status&1<<0)						//CRC����
+	if (status&1<<0)						//CRC����
 	{
 		errorstatus=SD_CMD_CRC_FAIL;
 		SDIO->ICR|=1<<0;				//�����Ӧ���?
@@ -1061,32 +1065,32 @@ SD_Error CmdResp6Error(u8 cmd,u16*prca)
  	while(1)
 	{
 		status=SDIO->STA;
-		if(status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
+		if (status&((1<<0)|(1<<2)|(1<<6)))break;//CRC����/������Ӧ��ʱ/�Ѿ��յ���Ӧ(CRCУ��ɹ�?)
 	}
-	if(status&(1<<2))					//��Ӧ��ʱ
+	if (status&(1<<2))					//��Ӧ��ʱ
 	{
  		SDIO->ICR|=1<<2;				//���������Ӧ��ʱ���?
 		return SD_CMD_RSP_TIMEOUT;
 	}
-	if(status&1<<0)						//CRC����
+	if (status&1<<0)						//CRC����
 	{
 		SDIO->ICR|=1<<0;				//�����Ӧ���?
  		return SD_CMD_CRC_FAIL;
 	}
-	if(SDIO->RESPCMD!=cmd)				//�ж��Ƿ���Ӧcmd����
+	if (SDIO->RESPCMD!=cmd)				//�ж��Ƿ���Ӧcmd����
 	{
  		return SD_ILLEGAL_CMD;
 	}
 	SDIO->ICR=0X5FF;	 				//�������
 	rspr1=SDIO->RESP1;					//�õ���Ӧ
-	if(SD_ALLZERO==(rspr1&(SD_R6_GENERAL_UNKNOWN_ERROR|SD_R6_ILLEGAL_CMD|SD_R6_COM_CRC_FAILED)))
+	if (SD_ALLZERO==(rspr1&(SD_R6_GENERAL_UNKNOWN_ERROR|SD_R6_ILLEGAL_CMD|SD_R6_COM_CRC_FAILED)))
 	{
 		*prca=(u16)(rspr1>>16);			//����16λ�õ�,rca
 		return errorstatus;
 	}
-   	if(rspr1&SD_R6_GENERAL_UNKNOWN_ERROR)return SD_GENERAL_UNKNOWN_ERROR;
-   	if(rspr1&SD_R6_ILLEGAL_CMD)return SD_ILLEGAL_CMD;
-   	if(rspr1&SD_R6_COM_CRC_FAILED)return SD_COM_CRC_FAILED;
+   	if (rspr1&SD_R6_GENERAL_UNKNOWN_ERROR) return SD_GENERAL_UNKNOWN_ERROR;
+   	if (rspr1&SD_R6_ILLEGAL_CMD) return SD_ILLEGAL_CMD;
+   	if (rspr1&SD_R6_COM_CRC_FAILED) return SD_COM_CRC_FAILED;
 	return errorstatus;
 }
 
@@ -1098,16 +1102,16 @@ SD_Error SDEnWideBus(u8 enx)
 	SD_Error errorstatus = SD_OK;
  	u32 scr[2]={0,0};
 	u8 arg=0X00;
-	if(enx)arg=0X02;
+	if (enx)arg=0X02;
 	else arg=0X00;
- 	if(SDIO->RESP1&SD_CARD_LOCKED)return SD_LOCK_UNLOCK_FAILED;//SD������LOCKED״̬
+ 	if (SDIO->RESP1&SD_CARD_LOCKED) return SD_LOCK_UNLOCK_FAILED;//SD������LOCKED״̬
  	errorstatus=FindSCR(RCA,scr);						//�õ�SCR�Ĵ�������
- 	if(errorstatus!=SD_OK)return errorstatus;
-	if((scr[1]&SD_WIDE_BUS_SUPPORT)!=SD_ALLZERO)		//֧�ֿ�����
+ 	if (errorstatus!=SD_OK) return errorstatus;
+	if ((scr[1]&SD_WIDE_BUS_SUPPORT)!=SD_ALLZERO)		//֧�ֿ�����
 	{
 	 	SDIO_Send_Cmd(SD_CMD_APP_CMD,1,(u32)RCA<<16);	//����CMD55+RCA,����Ӧ
 	 	errorstatus=CmdResp1Error(SD_CMD_APP_CMD);
-	 	if(errorstatus!=SD_OK)return errorstatus;
+	 	if (errorstatus!=SD_OK) return errorstatus;
 	 	SDIO_Send_Cmd(SD_CMD_APP_SD_SET_BUSWIDTH,1,arg);//����ACMD6,����Ӧ,����:10,4λ;00,1λ.
 		errorstatus=CmdResp1Error(SD_CMD_APP_SD_SET_BUSWIDTH);
 		return errorstatus;
@@ -1122,17 +1126,17 @@ SD_Error IsCardProgramming(u8 *pstatus)
   	SDIO_Send_Cmd(SD_CMD_SEND_STATUS,1,(u32)RCA<<16);		//����CMD13
   	status=SDIO->STA;
 	while(!(status&((1<<0)|(1<<6)|(1<<2))))status=SDIO->STA;//�ȴ��������?
-   	if(status&(1<<0))			//CRC���ʧ��?
+   	if (status&(1<<0))			//CRC���ʧ��?
 	{
 		SDIO->ICR|=1<<0;		//���������?
 		return SD_CMD_CRC_FAIL;
 	}
-   	if(status&(1<<2))			//���ʱ
+   	if (status&(1<<2))			//���ʱ
 	{
 		SDIO->ICR|=1<<2;		//���������?
 		return SD_CMD_RSP_TIMEOUT;
 	}
- 	if(SDIO->RESPCMD!=SD_CMD_SEND_STATUS)return SD_ILLEGAL_CMD;
+ 	if (SDIO->RESPCMD!=SD_CMD_SEND_STATUS) return SD_ILLEGAL_CMD;
 	SDIO->ICR=0X5FF;	 		//�������
 	respR1=SDIO->RESP1;
 	*pstatus=(u8)((respR1>>9)&0x0000000F);
@@ -1144,14 +1148,14 @@ SD_Error IsCardProgramming(u8 *pstatus)
 SD_Error SD_SendStatus(uint32_t *pcardstatus)
 {
 	SD_Error errorstatus = SD_OK;
-	if(pcardstatus==NULL)
+	if (pcardstatus==NULL)
 	{
 		errorstatus=SD_INVALID_PARAMETER;
 		return errorstatus;
 	}
  	SDIO_Send_Cmd(SD_CMD_SEND_STATUS,1,RCA<<16);	//����CMD13,����Ӧ
 	errorstatus=CmdResp1Error(SD_CMD_SEND_STATUS);	//��ѯ��Ӧ״̬
-	if(errorstatus!=SD_OK)return errorstatus;
+	if (errorstatus!=SD_OK) return errorstatus;
 	*pcardstatus=SDIO->RESP1;//��ȡ��Ӧֵ
 	return errorstatus;
 }
@@ -1160,7 +1164,7 @@ SD_Error SD_SendStatus(uint32_t *pcardstatus)
 SDCardState SD_GetState(void)
 {
 	u32 resp1=0;
-	if(SD_SendStatus(&resp1)!=SD_OK)return SD_CARD_ERROR;
+	if (SD_SendStatus(&resp1)!=SD_OK) return SD_CARD_ERROR;
 	else return (SDCardState)((resp1>>9) & 0x0F);
 }
 //����SD����SCR�Ĵ���ֵ
@@ -1174,39 +1178,39 @@ SD_Error FindSCR(u16 rca,u32 *pscr)
 	u32 tempscr[2]={0,0};
  	SDIO_Send_Cmd(SD_CMD_SET_BLOCKLEN,1,8);			//����CMD16,����Ӧ,����Block SizeΪ8�ֽ�
  	errorstatus=CmdResp1Error(SD_CMD_SET_BLOCKLEN);
- 	if(errorstatus!=SD_OK)return errorstatus;
+ 	if (errorstatus!=SD_OK) return errorstatus;
   	SDIO_Send_Cmd(SD_CMD_APP_CMD,1,(u32)rca<<16);	//����CMD55,����Ӧ
  	errorstatus=CmdResp1Error(SD_CMD_APP_CMD);
- 	if(errorstatus!=SD_OK)return errorstatus;
+ 	if (errorstatus!=SD_OK) return errorstatus;
 	SDIO_Send_Data_Cfg(SD_DATATIMEOUT,8,3,1);		//8���ֽڳ���,blockΪ8�ֽ�,SD����SDIO.
    	SDIO_Send_Cmd(SD_CMD_SD_APP_SEND_SCR,1,0);		//����ACMD51,����Ӧ,����Ϊ0
  	errorstatus=CmdResp1Error(SD_CMD_SD_APP_SEND_SCR);
- 	if(errorstatus!=SD_OK)return errorstatus;
+ 	if (errorstatus!=SD_OK) return errorstatus;
  	while(!(SDIO->STA&(SDIO_FLAG_RXOVERR|SDIO_FLAG_DCRCFAIL|SDIO_FLAG_DTIMEOUT|SDIO_FLAG_DBCKEND|SDIO_FLAG_STBITERR)))
 	{
-		if(SDIO->STA&(1<<21))//����FIFO���ݿ���
+		if (SDIO->STA&(1<<21))//����FIFO���ݿ���
 		{
 			*(tempscr+index)=SDIO->FIFO;	//��ȡFIFO����
 			index++;
-			if(index>=2)break;
+			if (index>=2)break;
 		}
 	}
- 	if(SDIO->STA&(1<<3))		//�������ݳ�ʱ
+ 	if (SDIO->STA&(1<<3))		//�������ݳ�ʱ
 	{
  		SDIO->ICR|=1<<3;		//������
 		return SD_DATA_TIMEOUT;
 	}
-	else if(SDIO->STA&(1<<1))	//�ѷ���/���յ����ݿ�CRCУ�����?
+	else if (SDIO->STA&(1<<1))	//�ѷ���/���յ����ݿ�CRCУ�����?
 	{
  		SDIO->ICR|=1<<1;		//������
 		return SD_DATA_CRC_FAIL;
 	}
-	else if(SDIO->STA&(1<<5))	//����FIFO���?
+	else if (SDIO->STA&(1<<5))	//����FIFO���?
 	{
  		SDIO->ICR|=1<<5;		//������
 		return SD_RX_OVERRUN;
 	}
-	else if(SDIO->STA&(1<<9))	//��ʼλ������
+	else if (SDIO->STA&(1<<9))	//��ʼλ������
 	{
  		SDIO->ICR|=1<<9;		//������
 		return SD_START_BIT_ERR;
@@ -1262,7 +1266,7 @@ u8 SD_ReadDisk(u8*buf,u32 sector,u8 cnt)
 	long long lsector=sector;
 	u8 n;
 	lsector<<=9;
-	if((u32)buf%4!=0)
+	if ((u32)buf%4!=0)
 	{
 	 	for(n=0;n<cnt;n++)
 		{
@@ -1272,7 +1276,7 @@ u8 SD_ReadDisk(u8*buf,u32 sector,u8 cnt)
 		}
 	}else
 	{
-		if(cnt==1)sta=SD_ReadBlock(buf,lsector,512);    	//����sector�Ķ�����
+		if (cnt==1)sta=SD_ReadBlock(buf,lsector,512);    	//����sector�Ķ�����
 		else sta=SD_ReadMultiBlocks(buf,lsector,512,cnt);//���sector
 	}
 	return sta;
@@ -1288,7 +1292,7 @@ u8 SD_WriteDisk(u8*buf,u32 sector,u8 cnt)
 	u8 n;
 	long long lsector=sector;
 	lsector<<=9;
-	if((u32)buf%4!=0)
+	if ((u32)buf%4!=0)
 	{
 	 	for(n=0;n<cnt;n++)
 		{
@@ -1298,7 +1302,7 @@ u8 SD_WriteDisk(u8*buf,u32 sector,u8 cnt)
 		}
 	}else
 	{
-		if(cnt==1)sta=SD_WriteBlock(buf,lsector,512);    	//����sector�����
+		if (cnt==1)sta=SD_WriteBlock(buf,lsector,512);    	//����sector�����
 		else sta=SD_WriteMultiBlocks(buf,lsector,512,cnt);	//���sector
 	}
 	return sta;
diff --git a/TFT/src/User/Hal/stm32f10x/spi_slave.c b/TFT/src/User/Hal/stm32f10x/spi_slave.c
index 50f0e5300c..bb42172042 100644
--- a/TFT/src/User/Hal/stm32f10x/spi_slave.c
+++ b/TFT/src/User/Hal/stm32f10x/spi_slave.c
@@ -151,7 +151,7 @@ void EXTI15_10_IRQHandler(void)
 
     #ifdef ST7920_SPI
     case LCD12864:
-      if((GPIOB->IDR & (1<<12)) != 0)
+      if ((GPIOB->IDR & (1<<12)) != 0)
       {
         SPI_ReEnable(!!(GPIOB->IDR & (1<<13)));                      // Adaptive spi mode0 / mode3
         ST7920_SPI_NUM->CR1 |= (1<<6);
diff --git a/TFT/src/User/Hal/stm32f2_f4xx/GPIO_Init.c b/TFT/src/User/Hal/stm32f2_f4xx/GPIO_Init.c
index 8fcef52ea7..bbac223503 100644
--- a/TFT/src/User/Hal/stm32f2_f4xx/GPIO_Init.c
+++ b/TFT/src/User/Hal/stm32f2_f4xx/GPIO_Init.c
@@ -28,7 +28,7 @@ void GPIO_InitSet(uint16_t io, GPIO_MODE mode, uint8_t AF)
     GPIO_Port[port]->OSPEEDR |= (GPIO_MODE_GET_OSPEED(mode)) << (pin*2);  //set speed bits
   }
 
-  if(GPIO_MODE_GET_MODE(mode) == GPIO_MODE_AF)
+  if (GPIO_MODE_GET_MODE(mode) == GPIO_MODE_AF)
   {
     GPIO_Port[port]->AFR[pin >> 0x03] &= ~(0xF << ((pin & 0x07) * 4));  //clear alternate function bits
     GPIO_Port[port]->AFR[pin >> 0x03] |= AF<< ((pin & 0x07) * 4);  //set alternate function bits
@@ -40,7 +40,7 @@ void GPIO_SetLevel(uint16_t io, uint8_t level)
   u16 port = GPIO_GET_PORT(io);
   u16 pin = GPIO_GET_PIN(io);
 
-  if(level)
+  if (level)
     GPIO_Port[port]->BSRRL = 1 << pin;
   else
     GPIO_Port[port]->BSRRH = 1 << pin;
diff --git a/TFT/src/User/Hal/stm32f2_f4xx/Serial.c b/TFT/src/User/Hal/stm32f2_f4xx/Serial.c
index 0a27228650..a4f5b2cfa5 100644
--- a/TFT/src/User/Hal/stm32f2_f4xx/Serial.c
+++ b/TFT/src/User/Hal/stm32f2_f4xx/Serial.c
@@ -124,14 +124,14 @@ void Serial_DMAClearFlag(uint8_t port)
 
 void USART_IRQHandler(uint8_t port)
 {
-  if((Serial[port].uart->SR & (1<<4))!=0)
+  if ((Serial[port].uart->SR & (1<<4))!=0)
   {
     Serial[port].uart->SR;
     Serial[port].uart->DR;
 
     dmaL1Data[port].wIndex = DMA_TRANS_LEN - Serial[port].dma_stream->NDTR;
     uint16_t wIndex = (dmaL1Data[port].wIndex == 0) ? DMA_TRANS_LEN : dmaL1Data[port].wIndex;
-    if(dmaL1Data[port].cache[wIndex-1] == '\n')  // Receive completed
+    if (dmaL1Data[port].cache[wIndex-1] == '\n')  // Receive completed
     {
       infoHost.rx_ok[port] = true;
     }
diff --git a/TFT/src/User/Hal/stm32f2_f4xx/spi_slave.c b/TFT/src/User/Hal/stm32f2_f4xx/spi_slave.c
index d064dd4950..b24c06aca9 100644
--- a/TFT/src/User/Hal/stm32f2_f4xx/spi_slave.c
+++ b/TFT/src/User/Hal/stm32f2_f4xx/spi_slave.c
@@ -148,7 +148,7 @@ void EXTI15_10_IRQHandler(void)
 
     #ifdef ST7920_SPI
     case LCD12864:
-      if((GPIOB->IDR & (1<<12)) != 0)
+      if ((GPIOB->IDR & (1<<12)) != 0)
       {
         SPI_ReEnable(!!(GPIOB->IDR & (1<<13)));                      // Adaptive spi mode0 / mode3
         ST7920_SPI_NUM->CR1 |= (1<<6);
diff --git a/TFT/src/User/Hal/sw_spi.h b/TFT/src/User/Hal/sw_spi.h
index 06c9c7857c..e17b83cfb6 100644
--- a/TFT/src/User/Hal/sw_spi.h
+++ b/TFT/src/User/Hal/sw_spi.h
@@ -1,5 +1,4 @@
-#ifndef _SW_SPI_H_
-#define _SW_SPI_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,5 +36,3 @@ void SW_SPI_CS_Set(_SW_SPI *sw_spi, uint8_t level);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Hal/w25qxx.h b/TFT/src/User/Hal/w25qxx.h
index 7f163b108b..fd90965a54 100644
--- a/TFT/src/User/Hal/w25qxx.h
+++ b/TFT/src/User/Hal/w25qxx.h
@@ -1,5 +1,4 @@
-#ifndef _W25QXX_H_
-#define _W25QXX_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,5 +43,3 @@ uint32_t W25Qxx_ReadCapacity(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Hal/xpt2046.c b/TFT/src/User/Hal/xpt2046.c
index 9fc0eb9699..dacc579571 100644
--- a/TFT/src/User/Hal/xpt2046.c
+++ b/TFT/src/User/Hal/xpt2046.c
@@ -68,7 +68,7 @@ u16 XPT2046_Average_AD(u8 CMD)
   {
     for(j=i+1; j<READ_TIMES; j++)
     {
-      if(buf[i] > buf[j]) //Ascending
+      if (buf[i] > buf[j]) //Ascending
       {
         temp = buf[i];
         buf[i] = buf[j];
@@ -90,7 +90,7 @@ u16 XPT2046_Repeated_Compare_AD(u8 CMD)
   ad1 = XPT2046_Average_AD(CMD);
   ad2 = XPT2046_Average_AD(CMD);
 
-  if((ad2 <= ad1 && ad1 < ad2 + ERR_RANGE)
+  if ((ad2 <= ad1 && ad1 < ad2 + ERR_RANGE)
   || (ad1 <= ad2 && ad2 < ad1 + ERR_RANGE)) //The error before and after is less than ERR_RANGE  //Two errors before and after ERR_RANGE
   {
     return (ad1+ad2)/2;
diff --git a/TFT/src/User/Hal/xpt2046.h b/TFT/src/User/Hal/xpt2046.h
index c657c8aecd..080f281c18 100644
--- a/TFT/src/User/Hal/xpt2046.h
+++ b/TFT/src/User/Hal/xpt2046.h
@@ -1,5 +1,4 @@
-#ifndef _XPT2046_H_
-#define _XPT2046_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,5 +14,3 @@ uint16_t XPT2046_Repeated_Compare_AD(u8 CMD);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Language Packs/language_am.ini b/TFT/src/User/Language Packs/language_am.ini
new file mode 100644
index 0000000000..a7d7a5d8c6
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_am.ini	
@@ -0,0 +1,281 @@
+#### Language Code:AM
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Հայերեն
+label_heat:Ջերմություն
+label_move:Շարժել
+label_home:Սկզբնական
+label_disable_steppers:Disarm All
+label_print:Տպել
+label_extrude:Հալել
+label_fan:Հովացնել
+label_settings:Կարգավորումներ
+label_screen_settings:Screen
+label_machine_settings:Machine
+label_feature_settings:Feature
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Shut Down
+label_rgb_settings:LED Color
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Custom
+label_leveling:Leveling
+label_point_1:Point 1
+label_point_2:Point 2
+label_point_3:Point 3
+label_point_4:Point 4
+label_point_5:Point 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Deploy
+label_bltouch_stow:Stow
+label_bltouch_repeat:Repeat
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Save
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Ավելացնել
+label_dec:Նվազեցնել
+label_nozzle:Գլխիկ
+label_bed:Տախտակ
+label_chamber:Chamber
+label_start:Start
+label_stop:Դադարեցնել
+label_back:Հետ
+label_page_up:Վերեւ
+label_page_down:Ներքեւ
+label_pause:Կանգնեցնել
+label_resume:Շարունակել
+label_load:Load
+label_unload:Unload
+label_slow_speed:Դանդաղ
+label_normal_speed:Նորմալ
+label_fast_speed:Արագ
+label_fan_full_speed:Ամբողջը
+label_fan_half_speed:Կիսատ
+label_rotate_ui:Rotate UI
+label_touchscreen_adjust:TSC Adjust
+label_more:More
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:White
+label_black:Black
+label_blue:Blue
+label_red:Red
+label_green:Green
+label_cyan:Cyan
+label_yellow:Yellow
+label_brown:Brown
+label_gray:Gray
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Անջատել
+label_baudrate:BaudRate
+label_percentage:Percentage
+label_babystep:Դանդաղ
+label_percentage_speed:Արագություն
+label_percentage_flow:Flow
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Պատրաստ
+label_busy:Ծանրաբեռնված է
+label_unconnected:Տպիչը կցված չէ
+label_disconnect_info:Now you can control the printer by your computer!
+label_loading:Բեռնում է...
+label_power_failed:Տպելը չի ավարտվել, շարունակե՞լ
+label_continue:Շարունակել
+label_cancel:Չեղարկել
+label_adjust_title:Էկրանի կարգավորում
+label_adjust_info:Please click on the red dot
+label_adjust_ok:Adjustment Success
+label_adjust_failed:Adjustment failed, Please Try Again
+label_warning:Warning
+label_stop_print:Stop printing?
+label_confirm:Confirm
+label_tftsd:TFT SD
+label_read_tftsd_error:TFTSD հիշողության սարքը չկա
+label_tftsd_inserted:Card inserted!
+label_tftsd_removed:Card removed!
+label_u_disk:U Disk
+label_read_u_disk_error:Read U Disk error!
+label_u_disk_inserted:U Disk inserted!
+label_u_disk_removed:U Disk removed!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:OnboardSD հիշողության սարքը չկա
+label_filament_sensor:Filament sensor
+label_filament_runout:Filament runout!
+label_preheat:Preheat
+label_preheat_both:Both
+label_is_pause:Unable to extrude when\nprinting.\nPause printing?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Movement
+label_unifiedheat:Heat&Fan
+label_cooldown:Cool Down
+label_emergencystop:EM. STOP
+label_touch_to_exit:Touch anywhere to exit
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wait for the temperature\nof hotend to be\nlower than %d℃
+label_force_shut_down:Force
+label_shutting_down:Shutting down...
+label_parameter_setting:Պարամետր
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:load settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_ca.ini b/TFT/src/User/Language Packs/language_ca.ini
new file mode 100644
index 0000000000..45aeafdaa7
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_ca.ini	
@@ -0,0 +1,281 @@
+#### Language Code:CA
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Català
+label_heat:Escalfar
+label_move:Moure
+label_home:Origen
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extruir
+label_fan:Ventilar
+label_settings:Configura
+label_screen_settings:Pantalla
+label_machine_settings:Màquina
+label_feature_settings:Afegits
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Apagar
+label_rgb_settings:Color LED
+label_rgb_off:Apagar LED
+label_terminal:Terminal
+label_custom:Personalitzar
+label_leveling:Anivellar
+label_point_1:Punt 1
+label_point_2:Punt 2
+label_point_3:Punt 3
+label_point_4:Punt 4
+label_point_5:Punt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Nivellat del llit completat
+label_bl_smart_fill:Falten punts de prova\ns'han omplert de forma intel·ligent.\n \nNota: recordeu guardar!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Nivellament del llit Bilinear
+label_abl_settings_ubl:Nivellament de llit unificat
+label_abl_settings_ubl_save:Desa a la ranura
+label_abl_settings_ubl_load:Carrega des de la ranura
+label_abl_slot0:Ranura 0
+label_abl_slot1:Ranura 1
+label_abl_slot2:Ranura 2
+label_abl_slot3:Ranura 3
+label_abl_slot_eeprom:Recordar la ranura per al proper\nreinici? (Guardar EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Provar
+label_bltouch_deploy:Desplegar
+label_bltouch_stow:Plegar
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Sonda Compensar
+label_confirmation:Estàs segur?
+label_down:Avall
+label_up:Amunt
+label_save:Gravar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Augmentar
+label_dec:Disminur
+label_nozzle:Nozzle
+label_bed:Llit
+label_chamber:Cambra
+label_start:Començar
+label_stop:Parar
+label_back:Tornar
+label_page_up:Retrocedir
+label_page_down:Avançar
+label_pause:Pausar
+label_resume:Continuar
+label_load:Carregar
+label_unload:Descarregar
+label_slow_speed:Lent
+label_normal_speed:Normal
+label_fast_speed:Ràpid
+label_fan_full_speed:Màxim
+label_fan_half_speed:Meitat
+label_rotate_ui:Rotar
+label_touchscreen_adjust:Calibrar
+label_more:Més
+label_screen_info:Informar
+label_status:Estat
+label_simulator_bg_color:Color de fons del simulador Marlin
+label_simulator_font_color:Color de lletra de simulador Marlin
+label_white:Blanc
+label_black:Negre
+label_blue:Blau
+label_red:Vermell
+label_green:Verd
+label_cyan:Cian
+label_yellow:groc
+label_brown:marró
+label_gray:Gris
+label_orange:taronja
+label_indigo:Índigo
+label_violet:violeta
+label_magenta:Magenta
+label_purple:Porpra
+label_lime:Llima
+label_darkblue:Blau fosc
+label_darkgreen:Verd fosc
+label_darkgray:Gris fosc
+label_disconnect:Desconnectar
+label_baudrate:Velocitat de transmissió
+label_percentage:Percentatge
+label_babystep:BabyStep
+label_percentage_speed:Velocitat
+label_percentage_flow:Flux
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:+X
+label_y_inc:+Y
+label_z_inc:+Z
+label_x_dec:-X
+label_y_dec:-Y
+label_z_dec:-Z
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:A punt!!
+label_busy:Processament ocupat, si us plau esperi ...
+label_unconnected:No hi ha comunicació amb impressora!
+label_disconnect_info:Ara pot controlar la impressora des del seu ordinador!
+label_loading:Carregant ...
+label_power_failed:¿Continuar imprimint?
+label_continue:Continuar
+label_cancel:Cancel · lar
+label_adjust_title:¡Calibrar la pantalla tàctil
+label_adjust_info:Si us plau feu clic al punt vermell
+label_adjust_ok:Ajust correcte
+label_adjust_failed:Ajust fallit, si us plau intenteu de nou
+label_warning:Advertència
+label_stop_print:Voleu aturar la impressió?
+label_confirm:Confirmar
+label_tftsd:SD TFT
+label_read_tftsd_error:Error a la targeta SD TFT!
+label_tftsd_inserted:¡Targeta inserida!
+label_tftsd_removed:¡Targeta extreta!
+label_u_disk:Pendrive
+label_read_u_disk_error:¡Error al Pendrive!
+label_u_disk_inserted:¡Pendrive inserit!
+label_u_disk_removed:¡Pendrive extret!
+label_onboardsd:SD Placa
+label_read_onboardsd_error:Error a la targeta SD de la placa!
+label_filament_sensor:Sensor de filament
+label_filament_runout:¡Filament esgotat!
+label_preheat:Preescalfar
+label_preheat_both:Tots dos
+label_is_pause:No es pot extruir\nal imprimir,¿\nPausar la impressió?
+label_auto_shut_down:Apag. aut.
+label_unifiedmove:Moviment
+label_unifiedheat:Calor/Ventilador
+label_cooldown:Refredar
+label_emergencystop:PARADA EMERGENCIA
+label_touch_to_exit:Toca qualsevol lloc per sortir
+label_mainmenu:Menú
+label_wait_temp_shut_down:Espereu que la\ntemperatura del hotend\nsigui inferior a %d℃
+label_force_shut_down:Forçar Apagat
+label_shutting_down:Apagant...
+label_parameter_setting:Paràmetre
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Mostra ACK a la terminal
+label_invert_xaxis:Invertir eix X
+label_invert_yaxis:Invertir eix Y
+label_invert_zaxis:Invertir eix Z
+label_move_speed:Velocitat de moviment(X Y Z)
+label_knob_led:Perilla rotativa LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:En pausa per l'ordre M0
+label_send_start_gcode:Enviar Gcode inicial
+label_send_end_gcode:Enviar Gcode final
+label_send_cancel_gcode:Cancel · lar Gcode
+label_persistent_status_info:Informació d'estat persistent
+label_file_listmode:Mode de visualització de fitxers
+label_current_setting:Corrent del Driver (mA)
+label_steps_setting:Passos per MM
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleració
+label_acceleration:Acceleració
+label_print_acceleration:Acceleració Impressió
+label_retract_acceleration:Acceleració Retracció
+label_travel_acceleration:Acceleració Viatge
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:Sensibilitat al topall TMC
+label_fwretract:Retracció de FW
+label_fwrecover:Recuperació de Retracció de FW
+label_lin_advance:Avanç Lineal
+label_reset_settings_info:Restableix tota la configuració a\nvalors predeterminats?
+label_reset_settings_done:Restableix tota la configuració\naconseguit.\nreinicieu el dispositiu.
+label_info:Informació
+label_lcd_brightness:Lluminositat LCD
+label_lcd_brightness_dim:Dim Lluminositat LCD
+label_lcd_dim_idle_timer:Temporitzador inactiu LCD
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Personalitzat
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Mode Marlin a pantalla completa
+label_plr_en:Recuperació de pèrdua d’energia
+label_setting_save:Save settings
+label_setting_reset:Restableix la configuració
+label_setting_restore:Restaura la configuració
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Desa la configuració de la impressora\na la EEPROM?
+label_eeprom_restore_info:Carregar la configuració de\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Velocitat Retracció
+label_retract_length:Longitud Retracció
+label_retract_swap_length:Distància retracció intercanvi
+label_retract_z_lift:Z aixecament a la retracció
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Velocitat recuperació
+label_swap_recover_feedrate:Velocitat recuperació intercanvi
+label_recover_length:Distancia recuperació extra
+label_swap_recover_length:Distancia recuperació intercanvi extra
+label_start_print:Comenceu a imprimir:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_cn.ini b/TFT/src/User/Language Packs/language_cn.ini
new file mode 100644
index 0000000000..e41b6bea18
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_cn.ini	
@@ -0,0 +1,281 @@
+#### Language Code:CN
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:简体中文
+label_heat:加热
+label_move:移动
+label_home:回原点
+label_disable_steppers:解锁电机
+label_print:打印
+label_extrude:挤出
+label_fan:风扇
+label_settings:设置
+label_screen_settings:屏幕设置
+label_machine_settings:机器设置
+label_feature_settings:功能设置
+label_sound:声音
+label_touch_sound:按钮声音
+label_toast_sound:Toast 提示声音
+label_alert_sound:弹窗和提示声音
+label_shut_down:关闭电源
+label_rgb_settings:灯光颜色
+label_rgb_off:熄灭灯光
+label_terminal:Terminal
+label_custom:自定义
+label_leveling:调平
+label_point_1:第一点
+label_point_2:第二点
+label_point_3:第三点
+label_point_4:第四点
+label_point_5:第五点
+label_bed_leveling:Bed Level
+label_bl_complete:平台调平完成!
+label_bl_smart_fill:部分点未探测,已被自动填充, 需要手动保存!
+label_bl_enable:BL:已开启
+label_bl_disable:BL:已关闭
+label_abl:自动调平
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:BL自检
+label_bltouch_deploy:探针弹出
+label_bltouch_stow:探针收回
+label_bltouch_repeat:精度测试
+label_z_offset:Z-偏移量
+label_probe_offset:探针偏移量
+label_confirmation:Are you sure?
+label_down:降低
+label_up:抬升
+label_save:保存参数
+label_restore:恢复
+label_reset:重置
+label_default:默认
+label_clear:Clear
+label_next:下一个
+label_distance:距离
+label_invalid_value:没有有效的条件!
+label_timeout_reached:已超时!
+label_process_running:正在运行,请稍后
+label_process_completed:处理已完成!
+label_process_aborted:处理已被中断!
+label_inc:增加
+label_dec:减少
+label_nozzle:喷头
+label_bed:热床
+label_chamber:机箱
+label_start:开始
+label_stop:停止
+label_back:返回
+label_page_up:上一页
+label_page_down:下一页
+label_pause:暂停
+label_resume:继续
+label_load:进料
+label_unload:退料
+label_slow_speed:慢速
+label_normal_speed:常速
+label_fast_speed:快速
+label_fan_full_speed:全速
+label_fan_half_speed:半速
+label_rotate_ui:旋转界面
+label_touchscreen_adjust:触屏校准
+label_more:更多
+label_screen_info:关于
+label_status:状态
+label_simulator_bg_color:Marlin模式背景颜色
+label_simulator_font_color:Marlin模式字体颜色
+label_white:白色
+label_black:黑色
+label_blue:蓝色
+label_red:红色
+label_green:绿色
+label_cyan:青色
+label_yellow:黄色
+label_brown:棕色
+label_gray:灰色
+label_orange:橙色
+label_indigo:靛
+label_violet:紫罗兰色
+label_magenta:桃红色
+label_purple:紫色
+label_lime:青柠色
+label_darkblue:暗蓝色
+label_darkgreen:暗绿色
+label_darkgray:暗灰色
+label_disconnect:断开连接
+label_baudrate:波特率
+label_percentage:百分比
+label_babystep:Z-微调
+label_percentage_speed:速度百分比
+label_percentage_flow:流量百分比
+label_value_zero:清零
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:准备打印
+label_busy:系统繁忙,请稍候...
+label_unconnected:未连接到打印机!
+label_disconnect_info:现在可以用电脑控制打印机
+label_loading:加载中...
+label_power_failed:是否继续打印?
+label_continue:继续
+label_cancel:取消
+label_adjust_title:触屏校准
+label_adjust_info:请点击红点中心位置
+label_adjust_ok:校准成功
+label_adjust_failed:校准失败,请重试
+label_warning:警告
+label_stop_print:是否停止打印?
+label_confirm:确定
+label_tftsd:TFT SD
+label_read_tftsd_error:读TFT SD卡出错!
+label_tftsd_inserted:SD卡已插入!
+label_tftsd_removed:SD卡已拔出!
+label_u_disk:U盘
+label_read_u_disk_error:读U盘出错!
+label_u_disk_inserted:U盘已插入!
+label_u_disk_removed:U盘已拔出!
+label_onboardsd:板载SD
+label_read_onboardsd_error:读板载SD卡出错!
+label_filament_sensor:耗材检测传感器
+label_filament_runout:耗材已用尽,请更换耗材!
+label_preheat:一键预热
+label_preheat_both:全部
+label_is_pause:打印中无法挤出耗材, 是否暂停打印?
+label_auto_shut_down:自动关机
+label_unifiedmove:运动
+label_unifiedheat:温度
+label_cooldown:冷却
+label_emergencystop:紧急停止
+label_touch_to_exit:触摸任意点退出当前界面
+label_mainmenu:菜单
+label_wait_temp_shut_down:喷头温度正在降温，等待低于%d℃后自动关机
+label_force_shut_down:强制关机
+label_shutting_down:正在关机...
+label_parameter_setting:参数设置
+label_on:开启
+label_off:关闭
+label_smart:智能
+label_terminal_ack:在G-code终端中显示温度信息
+label_invert_xaxis:翻转X轴
+label_invert_yaxis:翻转Y轴
+label_invert_zaxis:翻转Z轴
+label_move_speed:移动速度(X Y Z)
+label_knob_led:旋钮LED颜色
+label_knob_led_idle:旋钮LED自动睡眠
+label_m0_pause:M0暂停
+label_send_start_gcode:执行打印前起始Gcode
+label_send_end_gcode:执行打印后结束Gcode
+label_send_cancel_gcode:中断打印Gcode
+label_persistent_status_info:顶部温度信息
+label_file_listmode:文件浏览列表模式
+label_current_setting:TMC驱动电流设置
+label_steps_setting:电机每毫米脉冲数(Steps/mm)
+label_maxfeedrate:最大移动速度
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:打印加速度
+label_retract_acceleration:回抽加速度
+label_travel_acceleration:空载加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC堵转检测灵敏度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:所有的设置会被重置为默认值, 是否继续?
+label_reset_settings_done:重置所有参数成功! 重启设备后生效.
+label_info:提示
+label_lcd_brightness:LCD背光亮度
+label_lcd_brightness_dim:LCD睡眠背光亮度
+label_lcd_dim_idle_timer:LCD自动睡眠时间
+label_5_seconds:5秒
+label_10_seconds:10秒
+label_30_seconds:30秒
+label_60_seconds:1分钟
+label_120_seconds:2分钟
+label_300_seconds:5分钟
+label_custom_seconds:自定义
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:全屏显示Marlin模式
+label_plr_en:断电续打
+label_setting_save:保存设置
+label_setting_reset:重置设置
+label_setting_restore:保存设置
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:是否保存打印机设置到EEPROM?
+label_eeprom_restore_info:是否从EEPROM加载设置?
+label_eeprom_reset_info:重置EEPROM到出厂设置?
+label_retract_feedrate:FW回抽速度
+label_retract_length:FW回抽长度
+label_retract_swap_length:换料时回抽的长度
+label_retract_z_lift:回抽时Z轴抬升的高度
+label_retract_auto:FW自动回抽
+label_recover_feedrate:FW挤出速度
+label_swap_recover_feedrate:换料时挤出的速度
+label_recover_length:额外挤出的长度
+label_swap_recover_length:换料时额外挤出的长度
+label_start_print:是否开始打印:\n %s?
+label_ack_notification:ACK 弹窗类型
+label_leveling_edge_distance:手动调平边沿距离
+label_xy_unlock:解锁XY
+label_tuning:调整
+label_pid:PID
+label_pid_title:PID自动整定
+label_pid_start_info:开始PID自动整定,需要几分钟来完成,是否继续?
+label_pid_start_info_2:PID 正在自动整定中!
+label_pid_start_info_3:不要操作触控屏直到整定完成!
+label_tune_extruder:微调E-Steps
+label_tune_ext_extrude_100:挤出100mm
+label_tune_ext_temp:挤出机微调 | 加热
+label_tune_ext_templow:目标温度太低,最低温度为: %d℃
+label_tune_ext_desiredval:实际温度还没达到设定值
+label_tune_ext_mark120mm:在耗材上标记120mm\n标记完成后点击 '%s'\n挤出完成后测量剩余长度
+label_tune_ext_heatoff:关闭加热?
+label_tune_ext_adj_esteps:调整E-Steps
+label_tune_ext_esteps_saved:新的E-Steps已生效,需要手动保存到EEPROM\n新E-Steps: %0.2f
+label_tune_ext_measured:剩余的长度:
+label_tune_ext_old_estep:旧的E-Steps: %0.2f
+label_tune_ext_new_estep:新的E-Steps: %0.2f
+label_connection_settings:连接
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_cz.ini b/TFT/src/User/Language Packs/language_cz.ini
new file mode 100644
index 0000000000..c21a562a01
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_cz.ini	
@@ -0,0 +1,281 @@
+#### Language Code:CZ
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Čeština
+label_heat:Teplota
+label_move:Posunout
+label_home:Domů
+label_disable_steppers:Motory
+label_print:Tisknout
+label_extrude:Filament
+label_fan:Ofuk
+label_settings:Nastavení
+label_screen_settings:Displej
+label_machine_settings:Tiskárna
+label_feature_settings:Vlastnosti
+label_sound:Zvuk
+label_touch_sound:Zvuk při dotyku
+label_toast_sound:Zvuk vytápění
+label_alert_sound:Upozornění, popup okno
+label_shut_down:Vypnout
+label_rgb_settings:Barva LED
+label_rgb_off:LED vyp.
+label_terminal:Terminál
+label_custom:Vlastní
+label_leveling:Srovnat
+label_point_1:Bod 1
+label_point_2:Bod 2
+label_point_3:Bod 3
+label_point_4:Bod 4
+label_point_5:Bod 5
+label_bed_leveling:Bed Level
+label_bl_complete:Vyrovnání kompletní
+label_bl_smart_fill:Chybějící body sondy\nbyly vyplněny inteligentně.\n \nPozn: Nezapomeň uložit!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:Vyrovnat
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Ruční vyrovnání
+label_abl_settings:Auto vyrovnání
+label_abl_settings_bbl:Bilineární vyrovnání
+label_abl_settings_ubl:UBL vyrovnání
+label_abl_settings_ubl_save:Uložit do slotu
+label_abl_settings_ubl_load:Nahrát ze slotu
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Zapamatuj si slot\nrestart? (Uložit EEPROM)
+label_abl_z:Z-Slábnutí
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Vysunout
+label_bltouch_stow:Zasunout
+label_bltouch_repeat:Přesnost
+label_z_offset:Z Offset
+label_probe_offset:Offset sondy
+label_confirmation:Jste si jistý?
+label_down:Dolů
+label_up:Nahoru
+label_save:Uložit
+label_restore:Obnovit
+label_reset:Reset
+label_default:Výchozí
+label_clear:Vymaž
+label_next:Další
+label_distance:Vzdálenost
+label_invalid_value:Neplatná hodnota/y!
+label_timeout_reached:Časový limit vypršel!
+label_process_running:Probíhá proces!
+label_process_completed:Proces dokončen!
+label_process_aborted:Proces přerušen!
+label_inc:Přidat
+label_dec:Ubrat
+label_nozzle:Tryska
+label_bed:Stolek
+label_chamber:Komora
+label_start:Start
+label_stop:Stop
+label_back:Zpět
+label_page_up:Další
+label_page_down:Předchozí
+label_pause:Pauza
+label_resume:Obnovit
+label_load:Zavést
+label_unload:Vysunout
+label_slow_speed:Pomalu
+label_normal_speed:Normál
+label_fast_speed:Rychle
+label_fan_full_speed:Plný
+label_fan_half_speed:Poloviční
+label_rotate_ui:Otočit UI
+label_touchscreen_adjust:Kalibrovat
+label_more:Více
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin - Barva pozadí
+label_simulator_font_color:Marlin - Barva písma
+label_white:Bílá
+label_black:Černá
+label_blue:Modrá
+label_red:Červená
+label_green:Zelená
+label_cyan:Tyrkys
+label_yellow:Žlutá
+label_brown:Hnědá
+label_gray:Šedá
+label_orange:Oranžová
+label_indigo:Indigo
+label_violet:Fialová
+label_magenta:Purpurová
+label_purple:Nachová
+label_lime:Limetková
+label_darkblue:Tmavá Modrá
+label_darkgreen:Tmavá Červená
+label_darkgray:Tmavá Šedá
+label_disconnect:Odpojit
+label_baudrate:Serial Port
+label_percentage:Procenta
+label_babystep:BabyStep
+label_percentage_speed:Rychlost
+label_percentage_flow:Průtok
+label_value_zero:Vynulovat
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0,01mm
+label_01_mm:0,1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Připraven
+label_busy:Zpracovávám, čekejte prosím...
+label_unconnected:Tiskárna není připojena!
+label_disconnect_info:Nyní můžete tiskárnu ovládat z počítače!
+label_loading:Nahrávám...
+label_power_failed:Obnovit tisk?
+label_continue:Pokračovat
+label_cancel:Zrušit
+label_adjust_title:Kalibrace dotykové obrazovky
+label_adjust_info:Dotkněte se postupně všech bodů
+label_adjust_ok:Kalibrace úspěšná
+label_adjust_failed:Kalibrace selhala, zopakujte znovu
+label_warning:Varování
+label_stop_print:Zastavit tisk?
+label_confirm:Potvrdit
+label_tftsd:TFT SD
+label_read_tftsd_error:Chyba při čtení SD karty!
+label_tftsd_inserted:SD karta vložena!
+label_tftsd_removed:SD karta vyjmuta!
+label_u_disk:USB Disk
+label_read_u_disk_error:Chyba při čtení USB disku!
+label_u_disk_inserted:USB disk  vložen!
+label_u_disk_removed:USB disk vyjmut!
+label_onboardsd:Onboard SD
+label_read_onboardsd_error:Chyba při čtení Onboard SD!
+label_filament_sensor:Senzor filamentu
+label_filament_runout:Došel filament!
+label_preheat:Zahřát
+label_preheat_both:Vše
+label_is_pause:Během tisku nelze\nextrudovat,\nmám pozastavit tisk?
+label_auto_shut_down:Auto.vypnutí
+label_unifiedmove:Pohyb
+label_unifiedheat:Teplota
+label_cooldown:Zchladit
+label_emergencystop:!!STOP!!
+label_touch_to_exit:Pro návrat se dotkněte obrazovky...
+label_mainmenu:Menu
+label_wait_temp_shut_down:Čekám na zchladnutí\nextruderu pod %d℃
+label_force_shut_down:Vynutit
+label_shutting_down:Vypínám se...
+label_parameter_setting:Parametry
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:zobrazit ACK Terminálu
+label_invert_xaxis:Otočit osu X
+label_invert_yaxis:Otočit osu Y
+label_invert_zaxis:Otočit osu Z
+label_move_speed:Rychlost pohybu X Y Z
+label_knob_led:Rotační knob LED
+label_knob_led_idle:Rotační knob LED idle
+label_m0_pause:Pauza po příkazu M0
+label_send_start_gcode:Spustit Gcode před tiskem
+label_send_end_gcode:Spustit Gcode po tisku
+label_send_cancel_gcode:Přerušení tisku
+label_persistent_status_info:Trvalé zobrazení stavu
+label_file_listmode:Zobrazit soub.jako seznam
+label_current_setting:Proud motorů (mA)
+label_steps_setting:Kroků/mm
+label_maxfeedrate:Max rychlost
+label_maxacceleration:Max zrychlení
+label_acceleration:Zrychlení
+label_print_acceleration:Zrychlení při tisku
+label_retract_acceleration:Zrychlení retrakcí
+label_travel_acceleration:Zrychlení při přesunu
+label_jerk:Jerk-trhnutí
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:Citlivost nárazu TMC
+label_fwretract:FW Zatažení
+label_fwrecover:FW Obnovení
+label_lin_advance:Linear Advance
+label_reset_settings_info:Všechna nastavení budou\nobnovena na výchozí\nhodnoty. Pokračovat?
+label_reset_settings_done:Resetování všech nastavení\nbylo úspěšně provedeno.\nRestartujte zařízení.
+label_info:Info
+label_lcd_brightness:LCD Jas
+label_lcd_brightness_dim:LCD snížení jasu
+label_lcd_dim_idle_timer:LCD snížení jasu po
+label_5_seconds:5 sec.
+label_10_seconds:10 sec.
+label_30_seconds:30 sec.
+label_60_seconds:1 min.
+label_120_seconds:2 min.
+label_300_seconds:5 min.
+label_custom_seconds:Vlastní
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Celoobrazovkový režim Marlin
+label_plr_en:Obnova po ztrátě napájení
+label_setting_save:Uložení nastavení
+label_setting_reset:Reset nastavení
+label_setting_restore:Obnovení nastavení
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Uložit nastavení tiskárny\ndo EEPROM?
+label_eeprom_restore_info:Obnovit nastavení \nz EEPROM?
+label_eeprom_reset_info:Reset EEPROM na výchozí hodnoty?
+label_retract_feedrate:Rychlost zatažení
+label_retract_length:Délka zatažení
+label_retract_swap_length:Délka zatažení Swap
+label_retract_z_lift:Z zvýšení při zatažení
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Rychlost obnovení
+label_swap_recover_feedrate:Rychlost obnovení Swap
+label_recover_length:Délka obnovení
+label_swap_recover_length:Délka obnovení Swap
+label_start_print:Spustit tisk:\n %s?
+label_ack_notification:Styl oznámení ACK
+label_leveling_edge_distance:Vzdálenost nivelačních bodů\n stolku od kraje
+label_xy_unlock:Uvolnit XY
+label_tuning:Kalibrace
+label_pid:PID
+label_pid_title:PID autokalibrace
+label_pid_start_info:PID autokalibrace bude spuštěna.\n Bude to cvíli trvat. Pokračovat?
+label_pid_start_info_2:PID autokalibrace probíhá!
+label_pid_start_info_3:NEDOTÝKEJ se displeje dokud není dokončeno\n (Zelená LED svítí)!
+label_tune_extruder:E-Krok
+label_tune_ext_extrude_100:100mm Vysunutí
+label_tune_ext_temp:Kalibrace extruderu, ohřev
+label_tune_ext_templow:Požadovaná teplota je příliš nízká!\nMinimální teplota: %d C
+label_tune_ext_desiredval:Teplota ještě není na požadované hodnotě
+label_tune_ext_mark120mm:Označ 120mm on fillamentu\nStlač '%s' pokud jsi připraven.\nZměř zbývající délku\npo vytlačení.
+label_tune_ext_heatoff:Vypnout topení?
+label_tune_ext_adj_esteps:Nastavení E-Kroků
+label_tune_ext_esteps_saved:Nové E-kroky uloženy!\nNezapmeň \nuložit do EEPROM.\nNová hodnota: %0.2f
+label_tune_ext_measured:Zbývající délka:
+label_tune_ext_old_estep:Původní E-kroky: %0.2f
+label_tune_ext_new_estep:Nový E-kroky: %0.2f
+label_connection_settings:Připojení
+label_offset_tool:Offset 2.trysky
+label_hybrid_threshold:TMC Hybridní práh
+label_notifications:Oznámení
+label_mesh_editor:Mesh síť
+label_mesh_tuner:Mesh nastavení
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_de.ini b/TFT/src/User/Language Packs/language_de.ini
new file mode 100644
index 0000000000..25d8b7ace9
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_de.ini	
@@ -0,0 +1,281 @@
+#### Language Code:DE
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Deutsch
+label_heat:Heizen
+label_move:Bewegen
+label_home:Home XYZ
+label_disable_steppers:Disarm All
+label_print:Drucken
+label_extrude:Extruder
+label_fan:Lüfter
+label_settings:Einstellung
+label_screen_settings:Bildschirm
+label_machine_settings:Drucker
+label_feature_settings:Feature
+label_sound:Sound
+label_touch_sound:Touch Töne
+label_toast_sound:Toast Benachrichtigung
+label_alert_sound:Popups und Alarme
+label_shut_down:Auschalten (PS_ON)
+label_rgb_settings:LED Farbe
+label_rgb_off:LED Aus
+label_terminal:Terminal
+label_custom:Extras
+label_leveling:Leveling
+label_point_1:Punkt 1
+label_point_2:Punkt 2
+label_point_3:Punkt 3
+label_point_4:Punkt 4
+label_point_5:Punkt 5
+label_bed_leveling:Bett Level
+label_bl_complete:Bett Leveling fertiggestellt
+label_bl_smart_fill:Fehlende Messpunkte\nwurden intelligent gefüllt.\n \nHinweis: Denken Sie daran, zu speichern!
+label_bl_enable:BL: An
+label_bl_disable:BL: Aus
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bett Leveling
+label_abl_settings:Auto Bett Leveling
+label_abl_settings_bbl:Bilinear Bett Leveling
+label_abl_settings_ubl:Unified Bett Leveling
+label_abl_settings_ubl_save:Speichern im Slot
+label_abl_settings_ubl_load:Lade vom Slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Slot für den nächsten\nRestart merken?(Im EEPROM speichern)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Testen
+label_bltouch_deploy:Ausfahren
+label_bltouch_stow:Einfahren
+label_bltouch_repeat:Widerholen
+label_z_offset:Z Offset
+label_probe_offset:Mess Offset
+label_confirmation:Sind Sie sicher?
+label_down:Ab
+label_up:Auf
+label_save:Speichern
+label_restore:Wiederherstellen
+label_reset:Resetten
+label_default:Standard
+label_clear:Löschen
+label_next:Nächste
+label_distance:Entfernung
+label_invalid_value:Ungültig(e) Wert(e)
+label_timeout_reached:Timeout erreicht!
+label_process_running:Prozess läuft bereits!
+label_process_completed:Prozess fertiggestellt!
+label_process_aborted:Prozess abgebrochen!
+label_inc:Erhöhen
+label_dec:Verringern
+label_nozzle:Düse
+label_bed:Heizbett
+label_chamber:Kammer
+label_start:Start
+label_stop:Stop
+label_back:Zurück
+label_page_up:Seite hoch
+label_page_down:Seite runter
+label_resume:Wiederaufnahme
+label_pause:Pause
+label_load:Laden
+label_unload:Entleeren
+label_slow_speed:Langsam
+label_normal_speed:Normal
+label_fast_speed:Schnell
+label_fan_full_speed:Voll
+label_fan_half_speed:Halb
+label_rotate_ui:Drehe UI
+label_touchscreen_adjust:TSC kalib.
+label_more:Mehr
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin Simulator Hintergrundfarbe
+label_simulator_font_color:Marlin Simulator Schriftfarbe
+label_white:Weiß
+label_black:Schwarz
+label_blue:Blau
+label_red:Rot
+label_green:Grün
+label_cyan:Cyan
+label_yellow:Gelb
+label_brown:Braun
+label_gray:Grau
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Trennen
+label_baudrate:BaudRate
+label_percentage:Prozent
+label_babystep:BabyStep
+label_percentage_speed:Geschwindigkeit
+label_percentage_flow:Flow
+label_value_zero:Null
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Bereit
+label_busy:Bitte warten...
+label_unconnected:Keine Verbindung zum Drucker!
+label_disconnect_info:Verbindung getrennt!
+label_loading:Laden...
+label_power_failed:Druck fortsetzen?
+label_continue:Fortsetzen
+label_cancel:\u088F Abbruch
+label_adjust_title:Touchscreen kalibrieren
+label_adjust_info:Auf den roten Punkt drücken
+label_adjust_ok:Anpassung erfolgreich
+label_adjust_failed:Anpassung fehlgeschlagen, erneut versuchen
+label_warning:Warnung
+label_stop_print:Druck abbrechen?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SD Lesefehler!
+label_tftsd_inserted:SD-Karte gesteckt!
+label_tftsd_removed:SD-Karte entnommen!
+label_u_disk:USB-Stick
+label_read_u_disk_error:USB-Stick Lesefehler!
+label_u_disk_inserted:USB-Stick eingesteckt!
+label_u_disk_removed:USB-Stick entfernt!
+label_onboardsd:Onboard SD
+label_read_onboardsd_error:Onboard SD Lesefehler!
+label_filament_sensor:Filament sensor
+label_filament_runout:Filament runout!
+label_preheat:Vorheizen
+label_preheat_both:Beide
+label_is_pause:Extrudierung während\nDruckvorgangs nicht\nmöglich,\nDruck Pausieren?
+label_auto_shut_down:Automatisch AUS (PS_ON)
+label_unifiedmove:Bewegung
+label_unifiedheat:Heiz.Lüft.
+label_cooldown:Abkühlen
+label_emergencystop:NOT STOP!
+label_touch_to_exit:Zum verlassen, Bildschirm berühren.
+label_mainmenu:Menü
+label_wait_temp_shut_down:Warte bis Hotend-\nTemperatur unter\n %d℃ fällt.
+label_force_shut_down:Erzwinge
+label_shutting_down:Fahre herunter...
+label_parameter_setting:Parameter
+label_on:AN
+label_off:AUS
+label_smart:SMART
+label_terminal_ack:Zeige ACK im Terminal
+label_invert_xaxis:Invertiere X-Achse
+label_invert_yaxis:Invertiere Y-Achse
+label_invert_zaxis:Invertiere Z-Achse
+label_move_speed:Geschwindigkeit (XYZ)
+label_knob_led:Drehknopf LED Farbe
+label_knob_led_idle:Drehknopf LED idle Farbe
+label_m0_pause:Pause durch M0 kommando
+label_send_start_gcode:Start-Gcode vor Druck
+label_send_end_gcode:End-Gcode nach Druck
+label_send_cancel_gcode:Gcode abbrechen
+label_persistent_status_info:Speicherungs-status Information
+label_file_listmode:Datei-Ansicht als Liste
+label_current_setting:Treiber Strom (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Maximale Vorschubgeschwindigkeit
+label_maxacceleration:Maximale Beschleunigung
+label_acceleration:Beschleunigung
+label_print_acceleration:Beschleunigung beim Druck
+label_retract_acceleration:Beschleunigung reduzieren
+label_travel_acceleration:Beschleunigung bei der Fahrt
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Hiermit werden alle\nEinstellungen auf Werkseinstellungen\nzurückgesetzt. Fortfahren?
+label_reset_settings_done:Einstellungen wurden\nerfolgreich zurückgesetzt.\nBitte starten Sie das Gerät neu.
+label_info:Info
+label_lcd_brightness:LCD Helligkeit
+label_lcd_brightness_dim:LCD Abdunkel Helligkeit
+label_lcd_dim_idle_timer:LCD Timer Abdunkeln
+label_5_seconds:5 Sek.
+label_10_seconds:10 Sek.
+label_30_seconds:30 Sek.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Benutz.
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin Mode im Vollbild
+label_plr_en:Wiederherstellung nach Stromausfall
+label_setting_save:Einstellungen speichern
+label_setting_reset:Einstellungen zurücksetzten
+label_setting_restore:Einstellungen wiederherstellen
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Einstellungen im\nEEPROM speichern?
+label_eeprom_restore_info:Einstellungen aus\nEEPROM laden?
+label_eeprom_reset_info:Standardeinstellungen des Druckers wiederherstellen?
+label_retract_feedrate:Rückzugsgeschwindigkeit
+label_retract_length:Rückzugslänge
+label_retract_swap_length:Rückzugs Swap Länge
+label_retract_z_lift:Z-Anhebung beim Rückzug
+label_retract_auto:Auto-Rückzug über Firmware
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Druck starten:\n %s?
+label_ack_notification:ACK Benachrichtigungs-Style
+label_leveling_edge_distance:Bettecken-Abstand
+label_xy_unlock:Schalte XY frei
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune benötigt\neinige Zeit.\nWeitermachen?
+label_pid_start_info_2:PID autotune in läuft!
+label_pid_start_info_3:Berühren Sie den Bildschirm erst bei Fertigstellung (Grüne LED AN)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder Tuning | heat
+label_tune_ext_templow:Eingestellte Temparatur zu niedrig!\nMinimum Temparatur: %d C
+label_tune_ext_desiredval:Temparatur hat noch nicht den gewünschten Wert erreicht
+label_tune_ext_mark120mm:Markiere 120 mm am Filament\nDrücke '%s' wenn sie bereit sind\nMessen sie die Länge erneut\nnach der Extrusion
+label_tune_ext_heatoff:Heizung abschalten?
+label_tune_ext_adj_esteps:E-Steps einstellen
+label_tune_ext_esteps_saved:Neue E-steps gespeichert!\nDenken Sie daran die Werte\nim EEPROM abzuspeichern\nNew value: %0.2f
+label_tune_ext_measured:Restliche Länge:
+label_tune_ext_old_estep:Alte e-steps: %0.2f
+label_tune_ext_new_estep:Neue e-steps: %0.2f
+label_connection_settings:Verbindung
+label_offset_tool:Offset 2te Spitze
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Benachrichtigungen
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_en.ini b/TFT/src/User/Language Packs/language_en.ini
new file mode 100644
index 0000000000..a4a43a3404
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_en.ini	
@@ -0,0 +1,281 @@
+#### Language Name:EN
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:English
+label_heat:Heat
+label_move:Move
+label_home:Home
+label_disable_steppers:Disarm All
+label_print:Print
+label_extrude:Extrude
+label_fan:Fan
+label_settings:Settings
+label_screen_settings:Screen
+label_machine_settings:Machine
+label_feature_settings:Feature
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Shut Down
+label_rgb_settings:LED Color
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Custom
+label_leveling:Leveling
+label_point_1:Point 1
+label_point_2:Point 2
+label_point_3:Point 3
+label_point_4:Point 4
+label_point_5:Point 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Deploy
+label_bltouch_stow:Stow
+label_bltouch_repeat:Repeat
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Save
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Increase
+label_dec:Decrease
+label_nozzle:Nozzle
+label_bed:Hotbed
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Back
+label_page_up:Page up
+label_page_down:Page down
+label_pause:Pause
+label_resume:Resume
+label_load:Load
+label_unload:Unload
+label_slow_speed:Slow
+label_normal_speed:Normal
+label_fast_speed:Fast
+label_fan_full_speed:Full
+label_fan_half_speed:Half
+label_rotate_ui:Rotate UI
+label_touchscreen_adjust:TSC Adjust
+label_more:More
+label_screen_info:Info
+label_status:Info
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:White
+label_black:Black
+label_blue:Blue
+label_red:Red
+label_green:Green
+label_cyan:Cyan
+label_yellow:Yellow
+label_brown:Brown
+label_gray:Gray
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Disconnect
+label_baudrate:BaudRate
+label_percentage:Percentage
+label_babystep:BabyStep
+label_percentage_speed:Speed
+label_percentage_flow:Flow
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:d%%
+label_ready:Ready
+label_busy:Busy processing, please wait...
+label_unconnected:No printer attached!
+label_disconnect_info:Now you can control the printer by your computer!
+label_loading:Loading...
+label_power_failed:Continue printing?
+label_continue:Continue
+label_cancel:Cancel
+label_adjust_title:Touch Screen Calibration
+label_adjust_info:Please click on the red dot
+label_adjust_ok:Adjustment Success
+label_adjust_failed:Adjustment failed, Please Try Again
+label_warning:Warning
+label_stop_print:Stop printing?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:Read TFT SD card error!
+label_tftsd_inserted:Card inserted!
+label_tftsd_removed:Card removed!
+label_u_disk:U Disk
+label_read_u_disk_error:Read U Disk error!
+label_u_disk_inserted:U Disk inserted!
+label_u_disk_removed:U Disk removed!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:Read Onboard SD card error!
+label_filament_sensor:Filament sensor
+label_filament_runout:filament runout!
+label_preheat:Preheat
+label_preheat_both:Both
+label_is_pause:Unable to extrude when\nprinting.\nPause printing?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Movement
+label_unifiedheat:Heat/Fan
+label_cooldown:Cool Down
+label_emergencystop:EM. STOP
+label_touch_to_exit:Touch anywhere to exit
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wait for the hotend\ntemperature to be\nlower than %d ℃
+label_force_shut_down:Force
+label_shutting_down:Shutting down...
+label_parameter_setting:Parameter Settings
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_es.ini b/TFT/src/User/Language Packs/language_es.ini
new file mode 100644
index 0000000000..41655f1a17
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_es.ini	
@@ -0,0 +1,281 @@
+#### Language Code:ES
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Español
+label_heat:Calentar
+label_move:Mover
+label_home:Origen
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extruir
+label_fan:Ventilar
+label_settings:Configurar
+label_screen_settings:Pantalla
+label_machine_settings:Máquina
+label_feature_settings:Añadidos
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Apagar
+label_rgb_settings:Color LED
+label_rgb_off:Apagar LED
+label_terminal:Terminal
+label_custom:Personalizar
+label_leveling:Nivelar
+label_point_1:Punto 1
+label_point_2:Punto 2
+label_point_3:Punto 3
+label_point_4:Punto 4
+label_point_5:Punto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Probar
+label_bltouch_deploy:Desplegar
+label_bltouch_stow:Plegar
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Sonda Compensar
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Grabar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Aumentar
+label_dec:Disminur
+label_nozzle:Punta
+label_bed:Cama
+label_chamber:Chamber
+label_start:Start
+label_stop:Parar
+label_back:Volver
+label_page_up:Retroceder
+label_page_down:Avanzar
+label_pause:Pausar
+label_resume:Continuar
+label_load:Cargar
+label_unload:Descargar
+label_slow_speed:Despacio
+label_normal_speed:Normal
+label_fast_speed:Rápido
+label_fan_full_speed:Todo
+label_fan_half_speed:Mitad
+label_rotate_ui:Rotar
+label_touchscreen_adjust:Calibrar
+label_more:Más
+label_screen_info:Informar
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Blanco
+label_black:Negro
+label_blue:Azul
+label_red:Rojo
+label_green:Verde
+label_cyan:Cyan
+label_yellow:Amarillo
+label_brown:Marrón
+label_gray:Gris
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Desconectar
+label_baudrate:BaudRate
+label_percentage:Porcentaje
+label_babystep:BabyStep
+label_percentage_speed:Velocidad
+label_percentage_flow:Flujo
+label_value_zero:Cero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:+X
+label_y_inc:+Y
+label_z_inc:+Z
+label_x_dec:-X
+label_y_dec:-Y
+label_z_dec:-Z
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Preparado
+label_busy:Procesamiento ocupado, por favor espere...
+label_unconnected:¡No hay comunicación con impresora!
+label_disconnect_info:¡Ahora puede controlar la impresora desde su ordenador!
+label_loading:Cargando...
+label_power_failed:¿Continuar imprimiendo?
+label_continue:Continuar
+label_cancel:Cancelar
+label_adjust_title:¡Calibrar la pantalla táctil
+label_adjust_info:Por favor haga clic en el punto rojo
+label_adjust_ok:Ajuste correcto
+label_adjust_failed:Ajuste fallido, por favor intentelo de nuevo
+label_warning:Advertencia
+label_stop_print:¿Desea parar la impresión?
+label_confirm:Confirmar
+label_tftsd:SD TFT
+label_read_tftsd_error:¡Error en la tarjeta SD TFT!
+label_tftsd_inserted:¡Tarjeta insertada!
+label_tftsd_removed:¡Tarjeta extraida!
+label_u_disk:Pendrive
+label_read_u_disk_error:¡Error en el Pendrive!
+label_u_disk_inserted:¡Pendrive insertado!
+label_u_disk_removed:¡Pendrive extraido!
+label_onboardsd:SD Placa
+label_read_onboardsd_error:¡Error en la tarjeta SD de la placa!
+label_filament_sensor:Filament sensor
+label_filament_runout:¡Filamento agotado!
+label_preheat:Precalentar
+label_preheat_both:Ambos
+label_is_pause:No se puede extruir\nal imprimir,¿\nPausar la impresión?
+label_auto_shut_down:Apag. aut.
+label_unifiedmove:Movimiento
+label_unifiedheat:Calor/Ventilador
+label_cooldown:Enfriarse
+label_emergencystop:PARADA EMERGENCIA
+label_touch_to_exit:Toca cualquier lugar para salir
+label_mainmenu:Menu
+label_wait_temp_shut_down:Espere a que la\ntemperatura del hotend\nsea inferior a %d℃
+label_force_shut_down:Forzar Apagado
+label_shutting_down:Apagando...
+label_parameter_setting:Parámetro
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Desbloquear XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_fr.ini b/TFT/src/User/Language Packs/language_fr.ini
new file mode 100644
index 0000000000..a6031b1aaa
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_fr.ini	
@@ -0,0 +1,281 @@
+#### Language Code:FR
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Français
+label_heat:Chauffer
+label_move:Déplacer
+label_home:Home
+label_disable_steppers:Moteurs
+label_print:Imprimer
+label_extrude:Extruder
+label_fan:Ventiler
+label_settings:Options
+label_screen_settings:Écran
+label_machine_settings:Machine
+label_feature_settings:Paramètres
+label_sound:Son
+label_touch_sound:Son des touches
+label_toast_sound:Notifications
+label_alert_sound:Popups et alertes
+label_shut_down:Eteindre
+label_rgb_settings:LED
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Gcode
+label_leveling:Niveaux
+label_point_1:Point 1
+label_point_2:Point 2
+label_point_3:Point 3
+label_point_4:Point 4
+label_point_5:Point 5
+label_bed_leveling:ABL
+label_bl_complete:Nivellement terminé
+label_bl_smart_fill:Les points de sonde manquants\nont été intelligemment remplis.\n \nNote : n'oubliez pas de sauvegarder !
+label_bl_enable:BL On
+label_bl_disable:BL Off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Nivellement Mesh
+label_abl_settings:Nivellement Automatique
+label_abl_settings_bbl:Nivellement bilinéaire
+label_abl_settings_ubl:Nivellement unifié
+label_abl_settings_ubl_save:Enregistrer dans l'emplacement
+label_abl_settings_ubl_load:Charger depuis l'emplacement
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Se souvenir de l'emplacement\nau prochain redémarrage ?\n(Sauvegarde EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Tester
+label_bltouch_deploy:Déployer
+label_bltouch_stow:Rentrer
+label_bltouch_repeat:Répéter
+label_z_offset:Z Offset
+label_probe_offset:Décalage Palpeur
+label_confirmation:Êtes-vous sûr ?
+label_down:Descendre
+label_up:Monter
+label_save:Sauver
+label_restore:Restaurer
+label_reset:Reset
+label_default:Défaut
+label_clear:Effacer
+label_next:Suivant
+label_distance:Distance
+label_invalid_value:Aucune valeur valide fournie !
+label_timeout_reached:Délai d'attente dépassé !
+label_process_running:Processus en cours ! Veuillez patienter
+label_process_completed:Processus terminé !
+label_process_aborted:Processus annulé !
+label_inc:Plus
+label_dec:Moins
+label_nozzle:Buse
+label_bed:Plateau
+label_chamber:Caisson
+label_start:Démarrer
+label_stop:Stopper
+label_back:Retour
+label_page_up:Précédent
+label_page_down:Suivant
+label_pause:Pause
+label_resume:Reprendre
+label_load:Charger
+label_unload:Décharger
+label_slow_speed:Lent
+label_normal_speed:Normal
+label_fast_speed:Rapide
+label_fan_full_speed:Max
+label_fan_half_speed:Moitié
+label_rotate_ui:Rotation
+label_touchscreen_adjust:Ajuster
+label_more:Plus
+label_screen_info:Infos
+label_status:Statut
+label_simulator_bg_color:Couleur de l'arrière-plan Marlin
+label_simulator_font_color:Couleur de la police Marlin
+label_white:Blanc
+label_black:Noir
+label_blue:Bleu
+label_red:Rouge
+label_green:Vert
+label_cyan:Cyan
+label_yellow:Jaune
+label_brown:Marron
+label_gray:Gris
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violette
+label_magenta:Magenta
+label_purple:Violet
+label_lime:Lime
+label_darkblue:Bleu Foncé
+label_darkgreen:Vert Foncé
+label_darkgray:Gris Foncé
+label_disconnect:Libérer
+label_baudrate:Vitesse
+label_percentage:Avancement
+label_babystep:BabyStep
+label_percentage_speed:Vitesse
+label_percentage_flow:Débit
+label_value_zero:Zéro
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Prête
+label_busy:Occupée, veuillez patienter...
+label_unconnected:Aucune imprimante connectée !
+label_disconnect_info:Vous pouvez maintenant contrôler l'imprimante depuis votre ordinateur !
+label_loading:Chargement...
+label_power_failed:Continuer l'impression ?
+label_continue:Continuer
+label_cancel:Annuler
+label_adjust_title:Calibration écran tactile
+label_adjust_info:Veuillez toucher le point rouge
+label_adjust_ok:Succès de l'ajustement
+label_adjust_failed:Ajustement incorrect, veuillez réessayer
+label_warning:Attention
+label_stop_print:Arrêter l'impression ?
+label_confirm:Confirmer
+label_tftsd:SD TFT
+label_read_tftsd_error:Erreur de lecture de la carte SD TFT !
+label_tftsd_inserted:Carte insérée !
+label_tftsd_removed:Carte retirée !
+label_u_disk:Clé USB
+label_read_u_disk_error:Erreur de lecture de la clé USB !
+label_u_disk_inserted:Clé USB insérée !
+label_u_disk_removed:Clé USB retirée !
+label_onboardsd:SD interne
+label_read_onboardsd_error:Erreur de lecture de la carte SD interne !
+label_filament_sensor:Capteur de filament
+label_filament_runout:Fin de Filament !
+label_preheat:Préparer
+label_preheat_both:Global
+label_is_pause:Extrusion impossible quand\nl'impression est en cours.\nMettre l'impression en pause ?
+label_auto_shut_down:Extinction automatique
+label_unifiedmove:Mouvement
+label_unifiedheat:Chauffer
+label_cooldown:Refroidir
+label_emergencystop:Arrêt
+label_touch_to_exit:Toucher n'importe où pour quitter
+label_mainmenu:Menu
+label_wait_temp_shut_down:Attendez que la température de la buse\nsoit inférieure à %d℃
+label_force_shut_down:Forcer l'extinction
+label_shutting_down:Extinction en cours...
+label_parameter_setting:Réglages
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Afficher ACK sur Terminal
+label_invert_xaxis:Inverser l'axe X
+label_invert_yaxis:Inverser l'axe Y
+label_invert_zaxis:Inverser l'axe Z
+label_move_speed:Vitesse de déplacement (X Y Z)
+label_knob_led:LED du bouton rotatif
+label_knob_led_idle:Veille du bouton rotatif
+label_m0_pause:Suspendu par la commande M0
+label_send_start_gcode:Gcode avant l'impression
+label_send_end_gcode:Gcode après l'impression
+label_send_cancel_gcode:Gcode d'annulation
+label_persistent_status_info:Temp. toujours affichées
+label_file_listmode:Fichiers en mode liste
+label_current_setting:Courant Driver (mA)
+label_steps_setting:Steps par mm
+label_maxfeedrate:Débit maximum
+label_maxacceleration:Accélération maximale
+label_acceleration:Accélération
+label_print_acceleration:Impression
+label_retract_acceleration:Rétraction
+label_travel_acceleration:Déplacements
+label_jerk:Jerk
+label_junction_deviation:Ecart de jonction
+label_bump_sensitivity:Sensibilité TMC
+label_fwretract:Rétraction FW
+label_fwrecover:Récupération FW
+label_lin_advance:Linear Advance
+label_reset_settings_info:Réinitialiser tous les\nparamètres aux valeurs\npar défaut ?
+label_reset_settings_done:Réinitialisation des paramètres\nréalisé avec succès.\nVeuillez redémarrer l'imprimante.
+label_info:Infos
+label_lcd_brightness:Luminosité LCD
+label_lcd_brightness_dim:Diminution luminosité
+label_lcd_dim_idle_timer:Durée avant diminution
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Mode Marlin plein écran
+label_plr_en:Reprise après coupure
+label_setting_save:Sauvegarder les paramètres
+label_setting_reset:RAZ des paramètres
+label_setting_restore:Restaurer les paramètres
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Enregistrer les paramètres\ndans l'EEPROM ?
+label_eeprom_restore_info:Restaurer les paramètres\nde l'EEPROM ?
+label_eeprom_reset_info:Réinitialiser l'EEPROM\naux paramètres d'origine\nde l'imprimante ?
+label_retract_feedrate:Vitesse
+label_retract_length:Longueur
+label_retract_swap_length:Longueur de swap
+label_retract_z_lift:Décalage en Z
+label_retract_auto:Rétraction Firmware auto
+label_recover_feedrate:Vitesse
+label_swap_recover_feedrate:Vitesse de swap
+label_recover_length:Longueur
+label_swap_recover_length:Longueur de swap
+label_start_print:Démarrer l'impression :\n%s ?
+label_ack_notification:Style de notification ACK
+label_leveling_edge_distance:Distance au bord du plateau
+label_xy_unlock:Moteurs XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:Autocalibrage PID
+label_pid_start_info:L'autocalibrage PID va être\nlancé. Cela peut prendre\nquelques minutes. Continuer ?
+label_pid_start_info_2:Autocalibrage PID en cours !
+label_pid_start_info_3:Ne touchez pas l'écran avant la fin (LED verte allumée) !
+label_tune_extruder:Extrudeur
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Réglage de l'extrudeur
+label_tune_ext_templow:Température souhaitée\ntrop basse !\nTempérature minimum : %d C
+label_tune_ext_desiredval:La température n'est pas\nencore à la valeur souhaitée
+label_tune_ext_mark120mm:Marquer 120 mm sur le filament\nAppuyer ensuite sur '%s'\nMesurer la longueur restante
+label_tune_ext_heatoff:Arrêter la chauffe ?
+label_tune_ext_adj_esteps:Ajustement E-Steps
+label_tune_ext_esteps_saved:Nouveau E-steps\nenregistré !
+label_tune_ext_measured:Longueur restante
+label_tune_ext_old_estep:Ancien : %0.2f
+label_tune_ext_new_estep:Nouveau : %0.2f
+label_connection_settings:Connexion
+label_offset_tool:Offset 2ème Buse
+label_hybrid_threshold:Seuil Hybride TMC
+label_notifications:Notifications
+label_mesh_editor:Maillage
+label_mesh_tuner:Edition du maillage
+label_case_light:Case light
\ No newline at end of file
diff --git a/TFT/src/User/Language Packs/language_gr.ini b/TFT/src/User/Language Packs/language_gr.ini
new file mode 100644
index 0000000000..48a8a04e2e
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_gr.ini	
@@ -0,0 +1,281 @@
+#### Language Code:GR
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Ελληνικά
+label_heat:Θέρμανση
+label_move:Μετακίνηση
+label_home:Αυτο-Κατεύθυνση
+label_disable_steppers:Disarm All
+label_print:Εκτύπωση
+label_extrude:Εκβολή
+label_fan:Ανεμιστήρας
+label_settings:Ρυθμίσεις
+label_screen_settings:Οθόνη
+label_machine_settings:Μηχανήματος
+label_feature_settings:Χαρακτηριστικών
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Απενεργοποίηση
+label_rgb_settings:Χρώμα LED
+label_rgb_off:Απενεργοποίηση LED
+label_terminal:Τερματικό
+label_custom:Τροποποιημένο
+label_leveling:Ισοπέδωση
+label_point_1:Σημείο 1
+label_point_2:Σημείο 2
+label_point_3:Σημείο 3
+label_point_4:Σημείο 4
+label_point_5:Σημείο 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Δοκιμή
+label_bltouch_deploy:Επέκταση
+label_bltouch_stow:Aπόσυρση
+label_bltouch_repeat:Επανάληψη
+label_z_offset:Αντιστάθμιση Z
+label_probe_offset:Αντιστάθμιση Καθετήρας
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Αποθήκευση
+label_restore:Restore
+label_reset:Επαναφορά
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Αύξηση
+label_dec:Μείωση
+label_nozzle:Στόμιο
+label_bed:Θερμή Βάση
+label_chamber:Chamber
+label_start:Start
+label_stop:Τερμάτιση
+label_back:Πίσω
+label_page_up:Σελίδα πάνω
+label_page_down:Σελίδα κάτω
+label_pause:Παύση
+label_resume:Ξαναρχίσει
+label_load:Φόρτωση
+label_unload:Ξεφόρτωση
+label_slow_speed:Αργά
+label_normal_speed:Κανονικά
+label_fast_speed:Γρήγορα
+label_fan_full_speed:Ολοταχώς
+label_fan_half_speed:Μισή ταχύτητα
+label_rotate_ui:Περιστροφή UI
+label_touchscreen_adjust:Προσαρμογή TOUCH
+label_more:Περισσότερα
+label_screen_info:Πληροφορίες
+label_status:ΚΑΤΑΣΤΑΣΗ
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Άσπρο
+label_black:Μάυρο
+label_blue:Μπλέ
+label_red:Κόκκινο
+label_green:Πράσινο
+label_cyan:Κυανό
+label_yellow:Κίτρινο
+label_brown:Καφέ
+label_gray:Γκρί
+label_orange:Πορτοκάλι
+label_indigo:Ινδικό
+label_violet:Βιολετί
+label_magenta:Πορφύρα
+label_purple:Μωβ
+label_lime:Πρασινοκίτρινο
+label_darkblue:Σκούρο μπλε
+label_darkgreen:Σκούρο πράσινο
+label_darkgray:Σκούρο γκρίζο
+label_disconnect:Αποσυνδέσει
+label_baudrate:BaudRate
+label_percentage:Ποσοστό
+label_babystep:Μικροβήμα
+label_percentage_speed:Ταχύτητα
+label_percentage_flow:Ροή
+label_value_zero:Μηδέν
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+#define GR_X                      X
+#define GR_Y                      Y
+#define GR_Z                      Z
+label_001_mm:0.01χιλ
+label_01_mm:0.1χιλ
+label_1_mm:1χιλ
+label_5_mm:5χιλ
+label_10_mm:10χιλ
+label_100_mm:100χιλ
+label_200_mm:200χιλ
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Έτοιμο
+label_busy:Απασχολημένη επεξεργασία, παρακάλω περιμένετε ...
+label_unconnected:Δεν υπάρχει συνδεδεμένος εκτυπωτής!
+label_disconnect_info:Τώρα μπορείτε να ελέγξετε τον εκτυπωτή από τον υπολογιστή σας!
+label_loading:Φόρτωση...
+label_power_failed:Συνέχεια εκτύπωσης;
+label_continue:Συνέχεια
+label_cancel:Ματαίωση
+label_adjust_title:Βαθμονόμηση οθόνης αφής
+label_adjust_info:Κάντε κλικ στην κόκκινη κουκκίδα
+label_adjust_ok:Επιτυχία προσαρμογής
+label_adjust_failed:Η προσαρμογή απέτυχε. Δοκιμάστε ξανά
+label_warning:Προειδοποίηση
+label_stop_print:Διακοπή εκτύπωσης?
+label_confirm:Εντάξει
+label_tftsd:TFT SD
+label_read_tftsd_error:Σφάλμα ανάγνωσης κάρτας SD οθόνης!
+label_tftsd_inserted:Η κάρτα έχει εισαχθεί!
+label_tftsd_removed:Η κάρτα αφαιρέθηκε!
+label_u_disk:USB Δίσκος
+label_read_u_disk_error:Σφάλμα ανάγνωσης USB Δίσκου!
+label_u_disk_inserted:Ο USB Δίσκος έχει εισαχθεί!
+label_u_disk_removed:Ο USB Δίσκος αφαιρέθηκε!
+label_onboardsd:Ενσωματωμένη κάρτα SD
+label_read_onboardsd_error:Σφάλμα ανάγνωσης ενσωματωμένης κάρτας SD!
+label_filament_sensor:Αισθητήρας νήματος
+label_filament_runout:τελείωσε το νημά!
+label_preheat:Προθέρμανση
+label_preheat_both:Και τα δυο
+label_is_pause:Δεν είναι δυνατή η εξώθηση κατα τη δυάρκεια\nεκτύπωσης.\nΠαύση εκτύπωσης?
+label_auto_shut_down:Αυτόματη απενεργοποίηση
+label_unifiedmove:Κίνηση
+label_unifiedheat:Θέρμανση/Ανεμιστήρας
+label_cooldown:Κρυώσει
+label_emergencystop:Σταμάτημα έκτακτης ανάγκης
+label_touch_to_exit:Αγγίξτε οπουδήποτε για έξοδο
+label_mainmenu:Μενού
+label_wait_temp_shut_down:Περιμένετε για την \nθερμοκρασία του hotend να πέσει \nχαμηλότερα απο %d ℃
+label_force_shut_down:Αναγκαστική απενεργοποίηση
+label_shutting_down:Απενεργοποίηση...
+label_parameter_setting:Ρυθμίσεις παραμέτρων
+label_on:Ενεργό
+label_off:Σβηστό
+label_smart:ΈΞΥΠΝΟ
+label_terminal_ack:Εμφάνιση ACK στο τερματικό
+label_invert_xaxis:Αντιστρέψει X άξονα
+label_invert_yaxis:Αντιστρέψει Y άξονα
+label_invert_zaxis:Αντιστρέψει Z άξονα
+label_move_speed:Ταχύτητα κίνησης(X Y Z)
+label_knob_led:LED περιστροφικού κουμπιού
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Διακόπηκε λόγω M0 εντολής
+label_send_start_gcode:Αρχικό Gcode προ εκτύπωσης
+label_send_end_gcode:Τερματικό Gcode εφότου εκτύπωσης
+label_send_cancel_gcode:Ματαίωση Gcode
+label_persistent_status_info:Πληροφορίες μόνιμης κατάστασης
+label_file_listmode:Λειτουργία λίστας προβολής αρχείων
+label_current_setting:Ένταση η. ρεύ. οδηγού(mA)
+label_steps_setting:Βήματα ανά χιλ
+label_maxfeedrate:Μέγιστο ποσοστό τροφοδοσίας
+label_maxacceleration:Μέγιστη επιτάχυνση
+label_acceleration:Eπιτάχυνση
+label_print_acceleration:Επιτάχυνση εκτύπωσης
+label_retract_acceleration:Eπιτάχυνση ανάκλησης
+label_travel_acceleration:Επιτάχυνση ταξιδιού
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC ευαισθησία χτυπήματος
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Όλες οι ρυθμίσεις θα \nεπαναφερθούν στις προεπιλεγμένες \nτιμές. Συνεχίσει?
+label_reset_settings_done:Η επαναφορά όλων των ρυθμίσεων \nολοκληρώθηκε με επιτυχία. \nΓια πλήρη εφαρμογή,\nπαρακάλω επανεκκινήστε τη συσκευή σας.
+label_info:Πληροφορίες
+label_lcd_brightness:Φωτεινότητα οθόνης
+label_lcd_brightness_dim:Φωτεινότητα LCD σκοτεινή
+label_lcd_dim_idle_timer:Xρονομετρητής αδράνειας οθόνης
+label_5_seconds:5 Δευτ.
+label_10_seconds:10 Δευτ.
+label_30_seconds:30 Δευτ.
+label_60_seconds:1 Λεπτό
+label_120_seconds:2 Λεπτά
+label_300_seconds:5 Λεπτά
+label_custom_seconds:Τροποποιημένες ρυθμίσεις
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Λειτουργία Marlin σε πλήρη οθόνη
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_hu.ini b/TFT/src/User/Language Packs/language_hu.ini
new file mode 100644
index 0000000000..99de127a3e
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_hu.ini	
@@ -0,0 +1,281 @@
+#### Language Code:HU
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Magyar
+label_heat:Fűtés
+label_move:Mozgás
+label_home:Végállás
+label_disable_steppers:Léptetők
+label_print:Nyomtatás
+label_extrude:Adagolás
+label_fan:Hűtés
+label_settings:Opciók
+label_screen_settings:Kijelző
+label_machine_settings:Gép
+label_feature_settings:Funkciók
+label_sound:Hangok
+label_touch_sound:Érintés hangja
+label_toast_sound:Fűtő értesítések
+label_alert_sound:Felugró riasztások
+label_shut_down:Leállítás
+label_rgb_settings:LED Szín
+label_rgb_off:LED KI
+label_terminal:Terminál
+label_custom:Egyedi
+label_leveling:Szintezés
+label_point_1:1. pont
+label_point_2:2. pont
+label_point_3:3. pont
+label_point_4:4. pont
+label_point_5:5. pont
+label_bed_leveling:Ágyszint
+label_bl_complete:Ágy Szintezése Sikeres
+label_bl_smart_fill:A hiányzó szonda pontok\nkitöltésre kerültek.\nMegjegyzés: Mentsd el!
+label_bl_enable:BL: be
+label_bl_disable:BL: ki
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Kézi Rács Szintezés
+label_abl_settings:Automata Szintezés
+label_abl_settings_bbl:Bilineáris Szintezés
+label_abl_settings_ubl:Egységes Szintezés
+label_abl_settings_ubl_save:Mentés szlotba
+label_abl_settings_ubl_load:Betöltés szlotból
+label_abl_slot0:Szlot 0
+label_abl_slot1:Szlot 1
+label_abl_slot2:Szlot 2
+label_abl_slot3:Szlot 3
+label_abl_slot_eeprom:Emlékezzen a következő\nújraindításnál? (EEPROM Mentése)
+label_abl_z:Z Áttűnés
+label_bltouch:BLTouch
+label_bltouch_test:Teszt
+label_bltouch_deploy:Telepítés
+label_bltouch_stow:Elhelyezés
+label_bltouch_repeat:Ismétlés
+label_z_offset:Z Eltolás
+label_probe_offset:Szonda Eltolás
+label_confirmation:Biztos vagy benne?
+label_down:Le
+label_up:Fel
+label_save:Mentés
+label_restore:Betöltés
+label_reset:Újratölt
+label_default:Alapért.
+label_clear:Tiszta
+label_next:Tovább
+label_distance:Távolság
+label_invalid_value:Nincs érvényes érték/s megadva
+label_timeout_reached:Időkorlát elérve!
+label_process_running:Folyamat fut!
+label_process_completed:Folyamat befejezve!
+label_process_aborted:Folyamat megszakítva!
+label_inc:Növel
+label_dec:Csökkent
+label_nozzle:Fej
+label_bed:Ágy
+label_chamber:Kamra
+label_start:Kezdés
+label_stop:Állj
+label_back:Vissza
+label_page_up:Fel
+label_page_down:Le
+label_pause:Szünet
+label_resume:Folytatás
+label_load:Betöltés
+label_unload:Kiadás
+label_slow_speed:Lassú
+label_normal_speed:Normál
+label_fast_speed:Gyors
+label_fan_full_speed:Teljes
+label_fan_half_speed:Fél
+label_rotate_ui:Forgatás
+label_touchscreen_adjust:Igazítás
+label_more:Több
+label_screen_info:Infó
+label_status:Státusz
+label_simulator_bg_color:Marlin mód háttérszín
+label_simulator_font_color:Marlin mód betűszín
+label_white:Fehér
+label_black:Fekete
+label_blue:Kék
+label_red:Piros
+label_green:Zöld
+label_cyan:Cián
+label_yellow:Sárga
+label_brown:Barna
+label_gray:Szürke
+label_orange:Narancs
+label_indigo:Indigó
+label_violet:Viola
+label_magenta:Bíborvörös
+label_purple:Lila
+label_lime:Mész
+label_darkblue:Sötétkék
+label_darkgreen:Sötétzöld
+label_darkgray:Sötétszürke
+label_disconnect:Leválaszt
+label_baudrate:Kapcsolat
+label_percentage:Százalék
+label_babystep:Mikrolépés
+label_percentage_speed:Sebesség
+label_percentage_flow:Folyás
+label_value_zero:Nulla
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Kész
+label_busy:Feldolgozás alatt, kérlek várj...
+label_unconnected:Nincs nyomtató csatlakoztatva!
+label_disconnect_info:Most a számítógépéről vezérelheted a nyomtatót!
+label_loading:Betöltés...
+label_power_failed:Folytatod a nyomtatást?
+label_continue:Folytatás
+label_cancel:Mégse
+label_adjust_title:Érintőképernyő kalibrálása.
+label_adjust_info:Kattints a piros pontra.
+label_adjust_ok:Kalibrálás sikeres.
+label_adjust_failed:A kalibrálás sikertelen, próbáld újra
+label_warning:Figyelem!
+label_stop_print:Megállítod a nyomtatást?
+label_confirm:Igen
+label_tftsd:TFT-SD
+label_read_tftsd_error:TFT-SD olvasási hiba!
+label_tftsd_inserted:SD-Kártya behelyezve!
+label_tftsd_removed:SD-Kártya eltávolítva!
+label_u_disk:USB Tár
+label_read_u_disk_error:USB olvasási hiba!
+label_u_disk_inserted:USB behelyezve!
+label_u_disk_removed:USB eltávolítva!
+label_onboardsd:Lap-SD
+label_read_onboardsd_error:Alaplap-SD olvasási hiba!
+label_filament_sensor:Filament érzékelő
+label_filament_runout:Filament kifutás!
+label_preheat:Előfűtés
+label_preheat_both:Mindkettő
+label_is_pause:Nem sikerült az adagolás\na nyomtatás alatt.\nSzünetelteted a nyomtatást?
+label_auto_shut_down:Automata kikapcsolás
+label_unifiedmove:Mozgás
+label_unifiedheat:Fűt/Hűt
+label_cooldown:Lehűtés
+label_emergencystop:VészSTOP
+label_touch_to_exit:Érintsd meg a kilépéshez.
+label_mainmenu:Főmenü
+label_wait_temp_shut_down:Várd meg a fej\nvisszahűlését.%d℃
+label_force_shut_down:Kényszerítés
+label_shutting_down:Leállítás...
+label_parameter_setting:Tényezők
+label_on:BE
+label_off:KI
+label_smart:OKOS
+label_terminal_ack:ACK Megjelenítése
+label_invert_xaxis:X megfordítása
+label_invert_yaxis:Y megfordítása
+label_invert_zaxis:Z megfordítása
+label_move_speed:Mozg.Sebesség (X-Y-Z)
+label_knob_led:Forgatógomb LED
+label_knob_led_idle:Forgatógomb tétlen
+label_m0_pause:Szünetelés M0 parancsal
+label_send_start_gcode:Kezdő G-Kód
+label_send_end_gcode:Befejező G-Kód
+label_send_cancel_gcode:Leállító G-Kód
+label_persistent_status_info:Perzisztens állapotinfó
+label_file_listmode:Fájlnéző listamód
+label_current_setting:Motoráramok Beállítása
+label_steps_setting:Lépés Beállítás
+label_maxfeedrate:Max Előtolási Sebesség
+label_maxacceleration:Max Gyorsulás
+label_acceleration:Gyorsulás
+label_print_acceleration:Nyomtatás Gyorsulás
+label_retract_acceleration:Adagoló Gyorsulása
+label_travel_acceleration:Utazási Gyorsulás
+label_jerk:Rántás
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC ütközés érzékenység
+label_fwretract:FW Visszahúzás
+label_fwrecover:FW Visszahúzás helyreáll.
+label_lin_advance:Lineáris Haladás
+label_reset_settings_info:Minden beállítás vissza\nfog állni alapértelmezett\nértékre. Folytatod?
+label_reset_settings_done:A beállítások visszaállítása\nsikeresen megtörtént.\nAz aktiváláshoz indítsd\nújra az eszközt.
+label_info:Infó
+label_lcd_brightness:LCD Fényerősség
+label_lcd_brightness_dim:LCD Halványítás
+label_lcd_dim_idle_timer:LCD Halványítási idő
+label_5_seconds:5 Mp.
+label_10_seconds:10 Mp.
+label_30_seconds:30 Mp.
+label_60_seconds:1 Perc.
+label_120_seconds:2 Perc.
+label_300_seconds:5 Perc.
+label_custom_seconds:Egyedi
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Nagyképernyős Marlin mód
+label_plr_en:Áramkiesés helyreálítása
+label_setting_save:Beállítások mentése
+label_setting_reset:Beállítás visszaállítása
+label_setting_restore:Beállítások újratöltése
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Menti a megváltozott\nbeállításokat az EEPROM-ba?
+label_eeprom_restore_info:Betöltöd a beállításokat az\nEEPROM-ból?
+label_eeprom_reset_info:Visszaállítod az EEPROM-ot a\ngyári beállításokra?
+label_retract_feedrate:Visszahúzás előtol.
+label_retract_length:Visszahúzás hossz
+label_retract_swap_length:Csere hossz vissza.
+label_retract_z_lift:Z emelése visszahú.
+label_retract_auto:Automata Visszahúzás
+label_recover_feedrate:Előtolás javítás
+label_swap_recover_feedrate:Csere előtolás jav.
+label_recover_length:Hossz javítás
+label_swap_recover_length:Cserehossz javítás
+label_start_print:Elindítod a %s\nfájl nyomtatását?
+label_ack_notification:ACK egyéb típus
+label_leveling_edge_distance:Ágy szélének távolsága
+label_xy_unlock:Felold XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID Automatikus Hangolás
+label_pid_start_info:A PID önhangolása elindul.\nPercekig is eltarthat.\nFolytatod?
+label_pid_start_info_2:PID Automatikus hangolása zajlik!
+label_pid_start_info_3:NE ÉRINTSD meg a kijelzőt míg nincs kész! (zöld LED jelzi)!
+label_tune_extruder:Lépés hangolás
+label_tune_ext_extrude_100:Kiad 100mm
+label_tune_ext_temp:Adagoló hangolás | Fűt
+label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d C
+label_tune_ext_desiredval:A hőfok még nem érte el a kívánt értéket
+label_tune_ext_mark120mm:A 120mm-t jelöld be a szálon\nNyomd '%s' ha kész\nMérd meg a hátralévő hosszt\nadagolás után.
+label_tune_ext_heatoff:Kikapcsolod a fűtést?
+label_tune_ext_adj_esteps:Állítható E-lépés
+label_tune_ext_esteps_saved:Új E-lépés mentve!\nNe felejtsd el\nmenteni EEPROM-ba.\nÚj érték: %0.2f
+label_tune_ext_measured:Fennmaradó Hossz:
+label_tune_ext_old_estep:Régi e-lépés: %0.2f
+label_tune_ext_new_estep:Új e-lépés: %0.2f
+label_connection_settings:Kapcsolat
+label_offset_tool:Második fej eltolása
+label_hybrid_threshold:TMC Hibrid Küszöbérték
+label_notifications:Értesítések
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_it.ini b/TFT/src/User/Language Packs/language_it.ini
new file mode 100644
index 0000000000..2dec0e7f1f
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_it.ini	
@@ -0,0 +1,281 @@
+#### Language Code:IT
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Italiano
+label_heat:Riscalda
+label_move:Muovi
+label_home:Home
+label_disable_steppers:Spegni mot
+label_print:Stampa
+label_extrude:Estrudi
+label_fan:Ventola
+label_settings:Opzioni
+label_screen_settings:Schermo
+label_machine_settings:Stampante
+label_feature_settings:Extra
+label_sound:Suono
+label_touch_sound:Suono touch
+label_toast_sound:Notifiche Toast
+label_alert_sound:Popup e Avvisi
+label_shut_down:Spegni
+label_rgb_settings:RGB LED
+label_rgb_off:Spegni
+label_terminal:Terminale
+label_custom:Custom
+label_leveling:Livella
+label_point_1:Punto 1
+label_point_2:Punto 2
+label_point_3:Punto 3
+label_point_4:Punto 4
+label_point_5:Punto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Livellamento Bed Completato
+label_bl_smart_fill:Punti di test mancanti\nsono stati scelti automaticamente.\n \nNote: ricorda di salvare!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Salva in slot
+label_abl_settings_ubl_load:Carica da slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Ricorda lo slot per il prossimo\nriavvio? (Salva EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Estrai
+label_bltouch_stow:Ritrai
+label_bltouch_repeat:Ripeti
+label_z_offset:Z Offset
+label_probe_offset:Offset Sonda
+label_confirmation:Sei sicuro?
+label_down:Giù
+label_up:Su
+label_save:Salva
+label_restore:Ripristina
+label_reset:Reset
+label_default:Default
+label_clear:Cancella
+label_next:Avanti
+label_distance:Distanza
+label_invalid_value:Valore invalido
+label_timeout_reached:Timeout raggiunto!
+label_process_running:Processo già in esecuzione!
+label_process_completed:Processo completato!
+label_process_aborted:Processo interrotto!
+label_inc:Aumenta
+label_dec:Diminuisci
+label_nozzle:Ugello
+label_bed:Piatto
+label_chamber:Camera
+label_start:Avvia
+label_stop:Stop
+label_back:Indietro
+label_page_up:Pagina Su
+label_page_down:Pagina Giu
+label_pause:Pausa
+label_resume:Riprendi
+label_load:Carica
+label_unload:Estrai
+label_slow_speed:Lento
+label_normal_speed:Normale
+label_fast_speed:Veloce
+label_fan_full_speed:Massimo
+label_fan_half_speed:Metà
+label_rotate_ui:Ruota UI
+label_touchscreen_adjust:Calibra
+label_more:Altro
+label_screen_info:Info
+label_status:Stato
+label_simulator_bg_color:Marlin simulator colore sfondo
+label_simulator_font_color:Marlin simulator colore scritte
+label_white:Bianco
+label_black:Nero
+label_blue:Blu
+label_red:Rosso
+label_green:Verde
+label_cyan:Ciano
+label_yellow:Giallo
+label_brown:Marrone
+label_gray:Grigio
+label_orange:Arancione
+label_indigo:Indaco
+label_violet:Viola
+label_magenta:Magenta
+label_purple:Viola
+label_lime:Lime
+label_darkblue:Blu Scuro
+label_darkgreen:Vrde Scuro
+label_darkgray:Grigio Scuro
+label_disconnect:Scollega
+label_baudrate:BaudRate
+label_percentage:Percentuale
+label_babystep:BabyStep
+label_percentage_speed:Velocità
+label_percentage_flow:Flusso
+label_value_zero:Zero
+label_1_degree:1°
+label_5_degree:5°
+label_10_degree:10°
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pronto
+label_busy:Caricamento,attendi...
+label_unconnected:Stampante non connessa
+label_disconnect_info:Puoi controllare la stampante dal PC!
+label_loading:Caricamento...
+label_power_failed:Vuoi continuare la stampa?
+label_continue:Continua
+label_cancel:Cancella
+label_adjust_title:Calibrazione Touch Screen
+label_adjust_info:Premi sui punti rossi
+label_adjust_ok:Regolazione Completata!
+label_adjust_failed:Regolazione Fallita. Riprova!
+label_warning:Attenzione
+label_stop_print:Vuoi fermare la stampa?
+label_confirm:Conferma
+label_tftsd:SD Schermo
+label_read_tftsd_error:Errore lettura SD!
+label_tftsd_inserted:SD Inserita
+label_tftsd_removed:SD Rimossa
+label_u_disk:USB Disk
+label_read_u_disk_error:Errore lettura U Disk
+label_u_disk_inserted:U Disk inserita!
+label_u_disk_removed:U Disk rimossa!
+label_onboardsd:Micro SD
+label_read_onboardsd_error:Errore lettura Micro SD!
+label_filament_sensor:Sensore Filamento
+label_filament_runout:Filamento finito!
+label_preheat:Prepara
+label_preheat_both:Entrambi
+label_is_pause:Impossibile estrudere\ndurante la stampa,\nvuoi sospendere?
+label_auto_shut_down:Auto Spegnimento
+label_unifiedmove:Movimento
+label_unifiedheat:Scalda
+label_cooldown:Raffredda
+label_emergencystop:EMERGENZA
+label_touch_to_exit:Premi ovunque per uscire
+label_mainmenu:Menu
+label_wait_temp_shut_down:Attendi che la temperatura\ndell'hotend scenda\nsotto %d℃
+label_force_shut_down:Forza
+label_shutting_down:Spegnimento...
+label_parameter_setting:Parametri
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Mostra ACK nel terminale
+label_invert_xaxis:Inverti Asse X
+label_invert_yaxis:Inverti Asse Y
+label_invert_zaxis:Inverti Asse Z
+label_move_speed:Vel. Movimenti (X Y Z)
+label_knob_led:LED Manopola
+label_knob_led_idle:LED Manopola inattivo
+label_m0_pause:Messo in pausa dal comando M0
+label_send_start_gcode:Gcode prima di stampare
+label_send_end_gcode:Gcode dopo la stampa
+label_send_cancel_gcode:Gcode Cancella
+label_persistent_status_info:Info/Stato Permanenti
+label_file_listmode:Files in modalità lista
+label_current_setting:Corrente Motori(mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Avanzamento
+label_maxacceleration:Max Accelerazione
+label_acceleration:Accelerazione
+label_print_acceleration:Accel. Stampa
+label_retract_acceleration:Accel. Ritrazione
+label_travel_acceleration:Accel. Spostamenti
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC Sensibilità Urto
+label_fwretract:FW Retrazione
+label_fwrecover:FW Recupero Retrazione
+label_lin_advance:Linear Advance
+label_reset_settings_info:Ripristinare tutte le\nimpostazioni\nai valori predefiniti?
+label_reset_settings_done:Ripristino di tutte le impostazioni\navvenuto con successo.\nperfavore riavvia il dispositivo.
+label_info:Info
+label_lcd_brightness:Luminosità LCD
+label_lcd_brightness_dim:Lumin. LCD ridotta
+label_lcd_dim_idle_timer:Riduzione lumin. dopo
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode schermo pieno
+label_plr_en:Recupero mancanza corrente
+label_setting_save:Salva le impostazioni
+label_setting_reset:Ripristina impost standard
+label_setting_restore:Ripristina impost precedenti
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Salvare le impostazioni di\nstampa nella EEPROM?
+label_eeprom_restore_info:Carica le impostazioni \ndalla EEPROM?
+label_eeprom_reset_info:Ripristino EEPROM alle \nimpostazioni di fabbrica?
+label_retract_feedrate:Avanzamento retraz
+label_retract_length:Lunghezza retraz
+label_retract_swap_length:Lunghezza cambio fil.
+label_retract_z_lift:Alza Z al cambio
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Avanzamento ripristino
+label_swap_recover_feedrate:Avanzamento cambio fil
+label_recover_length:Lunghezza extra al ripr.
+label_swap_recover_length:Lunghezza extra al cambio
+label_start_print:Inizia a stampare:\n %s?
+label_ack_notification:ACK stile notifica
+label_leveling_edge_distance:Distanza dai bordi
+label_xy_unlock:Sblocca XY
+label_tuning:Regola
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune potrebbe\nrichiedere un po' di tempo.\nContinuare?
+label_pid_start_info_2:PID autotune in corso!
+label_pid_start_info_3:Non toccare lo schermo prima del completamento (LED verde Acceso)!
+label_tune_extruder:Step E
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Temperatura desisderata troppo bassa!\nTemperatura minima: %d C
+label_tune_ext_desiredval:La temperatura non è ancora al valore desiderato
+label_tune_ext_mark120mm:Segna 120 mm sul filamento\nPremi '%s' quando pronto\nMisura lunghezza rimanente\ndopo l'estrusione
+label_tune_ext_heatoff:Spegnere il riscaldamento?
+label_tune_ext_adj_esteps:Regola E-Steps
+label_tune_ext_esteps_saved:Nuovi E-steps salvati!\nNon dimenticare di\nsalvarli nellaEEPROM\nNuovo valore: %0.2f
+label_tune_ext_measured:Lunghezza rimanente:
+label_tune_ext_old_estep:Vecchi e-steps: %0.2f
+label_tune_ext_new_estep:Nuovi e-steps: %0.2f
+label_connection_settings:Imp.Conn.
+label_offset_tool:Offset 2nd Ugello
+label_hybrid_threshold:TMC Soglia Modo Ibrido
+label_notifications:Notifiche
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_jp.ini b/TFT/src/User/Language Packs/language_jp.ini
new file mode 100644
index 0000000000..38271c522e
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_jp.ini	
@@ -0,0 +1,281 @@
+#### Language Code:JP
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:日本語
+label_heat:あたため
+label_move:移動
+label_home:ゼロにする
+label_disable_steppers:Disarm All
+label_print:プリント
+label_extrude:押出
+label_fan:ファン
+label_settings:設定
+label_screen_settings:画面
+label_machine_settings:マシン
+label_feature_settings:機能
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:シャットダウン
+label_rgb_settings:LED カラー
+label_rgb_off:LED オフ
+label_terminal:端末
+label_custom:カスタム
+label_leveling:レベリング
+label_point_1:ポイント1
+label_point_2:ポイント2
+label_point_3:ポイント3
+label_point_4:ポイント4
+label_point_5:ポイント5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:自動調整
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:テスト
+label_bltouch_deploy:展開
+label_bltouch_stow:収納
+label_bltouch_repeat:繰り返す
+label_z_offset:Zオフセット
+label_probe_offset:プローブオフセット
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:保存
+label_restore:Restore
+label_reset:リセット
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:増え
+label_dec:減る
+label_nozzle:ノズル
+label_bed:ベッド
+label_chamber:Chamber
+label_start:Start
+label_stop:停止
+label_back:戻る
+label_page_up:前ページ
+label_page_down:次ページ
+label_pause:一時停止
+label_resume:続ける
+label_load:増え
+label_unload:減る
+label_slow_speed:ゆっくり
+label_normal_speed:正常速度
+label_fast_speed:早め
+label_fan_full_speed:全速
+label_fan_half_speed:50%速さ
+label_rotate_ui:回転UI
+label_touchscreen_adjust:校正する
+label_more:詳細
+label_screen_info:ついて
+label_status:状態
+label_simulator_bg_color:Marlin シミュレータの背景色
+label_simulator_font_color:Marlinシミュレータフォントの色
+label_white:白色
+label_black:黒色
+label_blue:青色
+label_red:赤色
+label_green:緑色
+label_cyan:シアン
+label_yellow:黄色
+label_brown:茶色
+label_gray:灰色
+label_orange:オレンジ
+label_indigo:インディゴ
+label_violet:バイオレット
+label_magenta:赤紫色
+label_purple:紫
+label_lime:ライム
+label_darkblue:濃紺
+label_darkgreen:ダークグリーン
+label_darkgray:暗灰色
+label_disconnect:データ接続
+label_baudrate:ポートレート
+label_percentage:パーセント
+label_babystep:ベビーステップ
+label_percentage_speed:スビード
+label_percentage_flow:押出
+label_value_zero:ゼロ
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:準備中
+label_busy:ビジー状態、しばらくお待ちください...
+label_unconnected:プリンターに連続していない!
+label_disconnect_info:SDカード　PC両用
+label_loading:ロッド中...
+label_power_failed:プリントを継続しますか?
+label_continue:継続
+label_cancel:キャンセル
+label_adjust_title:タッチスクリーン較正
+label_adjust_info:赤星をタッチ
+label_adjust_ok:校正が成功しました
+label_adjust_failed:校正が失敗しました、も一度お試して下さい
+label_warning:注意
+label_stop_print:プリントを中止しますか?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SDカードの読み取りがエラー発生しました!
+label_tftsd_inserted:SDカード入りました!
+label_tftsd_removed:SDカード出しました!
+label_u_disk:USBメモリー
+label_read_u_disk_error:USBメモリー読み込みエラー!
+label_u_disk_inserted:U Diskカード入りました!
+label_u_disk_removed:U Diskカード出しました!
+label_onboardsd:内部 mSDカード
+label_read_onboardsd_error:内部 mSDカードの読み取りがエラー発生しました!
+label_filament_sensor:フィラメントセンサ
+label_filament_runout:フィラメントランアウト!
+label_preheat:予熱する
+label_preheat_both:両方
+label_is_pause:印刷時に押し出すことができない。印刷を中止しますか？
+label_auto_shut_down:オートパワー
+label_unifiedmove:移動
+label_unifiedheat:ヒート&ファン
+label_cooldown:クールダウン
+label_emergencystop:EM.停止
+label_touch_to_exit:クリックして終了します
+label_mainmenu:メニュー
+label_wait_temp_shut_down:ホットエンドの温度が%d℃未満になるまで待ちます。
+label_force_shut_down:フォース
+label_shutting_down:シャットダウン...
+label_parameter_setting:パラメータ
+label_on:ON
+label_off:OFF
+label_smart:スマート
+label_terminal_ack:端末でACKを表示する
+label_invert_xaxis:X軸を反転
+label_invert_yaxis:Y軸を反転
+label_invert_zaxis:Z軸を反転
+label_move_speed:移動速度(X Y Z)
+label_knob_led:回転ノブLED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:MOコマンドで一時停止
+label_send_start_gcode:印刷前にGコードを開始する
+label_send_end_gcode:印刷後にGコードを終了する
+label_send_cancel_gcode:Gコードをキャンセルする
+label_persistent_status_info:永続的なステータス情報
+label_file_listmode:ファイルビューアリストモード
+label_current_setting:ドライバー電流 (mA)
+label_steps_setting:MMあたりのステップ
+label_maxfeedrate:マックスフィード率
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:印刷加速度
+label_retract_acceleration:引き戻し加速度
+label_travel_acceleration:空振り加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC バンプ感度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:すべての設定をデフォルト値にリセットしますか?
+label_reset_settings_done:すべての設定が正常にリセットされました。デバイスを再起動してください。
+label_info:情報
+label_lcd_brightness:LCD明るさ
+label_lcd_brightness_dim:LCDの輝度が薄暗い
+label_lcd_dim_idle_timer:LCD調光アイドルタイマー
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:カスタム
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:フルスクリーンでマーリンモード
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:設定をリセットする
+label_setting_restore:設定を復元する
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:プリンタの設定をEEPROMに保存しますか?
+label_eeprom_restore_info:EEPROMから設定を再読み込み?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:引き戻し速度
+label_retract_length:引き戻し長さ
+label_retract_swap_length:交換時の引き戻し長さ
+label_retract_z_lift:引き戻し時のz軸上げの高さ
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:押出速度
+label_swap_recover_feedrate:交換時の押出速度
+label_recover_length:余分な押し出し長さ
+label_swap_recover_length:交換時の余分な押し出し長さ
+label_start_print:印刷を開始する:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_nl.ini b/TFT/src/User/Language Packs/language_nl.ini
new file mode 100644
index 0000000000..660432790b
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_nl.ini	
@@ -0,0 +1,281 @@
+#### Language Code:DU
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Dutch
+label_heat:Verwarm
+label_move:Verplaats
+label_home:Thuis
+label_disable_steppers:Disarm All
+label_print:Print
+label_extrude:Extrudeer
+label_fan:Ventilator
+label_settings:Instellingen
+label_screen_settings:Scherm
+label_machine_settings:Machine
+label_feature_settings:Kenmerk
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Uitschakelen
+label_rgb_settings:LED Kleur
+label_rgb_off:LED Uit
+label_terminal:Terminal
+label_custom:Aangepast
+label_leveling:Nivelleren
+label_point_1:Punt 1
+label_point_2:Punt 2
+label_point_3:Punt 3
+label_point_4:Punt 4
+label_point_5:Punt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling voltooid
+label_bl_smart_fill:Missende probe punten\nzijn slim opgevuld.\n \nNote: Vergeet niet op te slaan!
+label_bl_enable:BL: aan
+label_bl_disable:BL: uit
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Sla op naar sleuf
+label_abl_settings_ubl_load:Laad van sleuf
+label_abl_slot0:Sleuf 0
+label_abl_slot1:Sleuf 1
+label_abl_slot2:Sleuf 2
+label_abl_slot3:Sleuf 3
+label_abl_slot_eeprom:Onthoud sleuf voor\nvolgende reboot?\n(sla op in EEPROM)
+label_abl_z:Z vervagen
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Gebruiken
+label_bltouch_stow:Inzetten
+label_bltouch_repeat:Herhaal
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_confirmation:Weet u het zeker?
+label_down:Omlaag
+label_up:Omhoog
+label_save:Bewaren
+label_restore:Herstellen
+label_reset:Reset
+label_default:Standaard
+label_clear:Clear
+label_next:Volgende
+label_distance:Afstand
+label_invalid_value:Geen correcte waarde/s voorzien!
+label_timeout_reached:Time-out bereikt!
+label_process_running:Process bezig!
+label_process_completed:Process voltooid!
+label_process_aborted:Process geannuleerd!
+label_inc:Verhogen
+label_dec:Verlagen
+label_nozzle:Spuitneus
+label_bed:Verwarmd bed
+label_chamber:Kamer
+label_start:Start
+label_stop:Stop
+label_back:Terug
+label_page_up:Blz omhoog
+label_page_down:Blz omlaag
+label_pause:Pauze
+label_resume:Hervatten
+label_load:Laden
+label_unload:Lossen
+label_slow_speed:Traag
+label_normal_speed:Normaal
+label_fast_speed:Snel
+label_fan_full_speed:Volledig
+label_fan_half_speed:Half
+label_rotate_ui:Draai UI
+label_touchscreen_adjust:TSC Aanpassen
+label_more:Meer
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator achtergrond kleur
+label_simulator_font_color:Marlin simulator tekst kleur
+label_white:Wit
+label_black:Zwart
+label_blue:Blauw
+label_red:Rood
+label_green:Groen
+label_cyan:Cyaan
+label_yellow:Geel
+label_brown:Bruin
+label_gray:Grijs
+label_orange:Oranje
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Loskoppelen
+label_baudrate:Baudsnelheid
+label_percentage:Percentage
+label_babystep:BabyStap
+label_percentage_speed:Snelheid
+label_percentage_flow:Stromen
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Gereed
+label_busy:In verwerking ,wacht aub...
+label_unconnected:Geen printer gekoppeld!
+label_disconnect_info:De printer kan nu door de computer bestuurd worden!
+label_loading:Opladen...
+label_power_failed:Verder met printen?
+label_continue:Verder
+label_cancel:Afbreken
+label_adjust_title:Touch Screen Calibratie
+label_adjust_info:Klik op de rode punt
+label_adjust_ok:Calibratie Gelukt
+label_adjust_failed:Calibratie Mislukt, Probeer Opnieuw aub
+label_warning:Waarschuwing
+label_stop_print:Stop afdruk?
+label_confirm:Bevestig
+label_tftsd:TFT SD
+label_read_tftsd_error:TFT SD leesfout!
+label_tftsd_inserted:Kaart geplaatst!
+label_tftsd_removed:Kaart verwijdert!
+label_u_disk:U Disk
+label_read_u_disk_error:U Disk Leesfout!
+label_u_disk_inserted:U Disk geplaatst!
+label_u_disk_removed:U Disk verwijdert!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:Onboard SD-kaart leesfout!
+label_filament_sensor:Filament sensor
+label_filament_runout:filament op!
+label_preheat:Voorverwarmen
+label_preheat_both:Beide
+label_is_pause:Kan niet extruderen\ntijdens printen,\nPauzeer printen?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Beweging
+label_unifiedheat:Verwarm/Ventilator
+label_cooldown:Afkoelen
+label_emergencystop:NOODSTOP
+label_touch_to_exit:Aanraken om te verlaten
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wacht tot de temperatuur\nvan de spuitkop\nlager dan %d℃ is
+label_force_shut_down:Forceer Afsluiten
+label_shutting_down:Afsluiten...
+label_parameter_setting:Parameter
+label_on:AAN
+label_off:UIT
+label_smart:SLIM
+label_terminal_ack:Laat ACK in Terminal zien
+label_invert_xaxis:Inverteer X Axis
+label_invert_yaxis:Inverteer Y Axis
+label_invert_zaxis:Inverteer Z Axis
+label_move_speed:Bewegingssnelheid(X Y Z)
+label_knob_led:Draaiknop LED
+label_knob_led_idle:Draaiknop LED inactief
+label_m0_pause:Gepauseerd door M0 commando
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Aanhoudende statusinfo
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver stroom (mA)
+label_steps_setting:Stappen permm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleratie
+label_acceleration:Acceleratie
+label_print_acceleration:Afdruk Acceleratie
+label_retract_acceleration:Retract Acceleratie
+label_travel_acceleration:Travel Acceleratie
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitiviteit
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset alle instellingen \naar de standaard waardes?
+label_reset_settings_done:Reset van alle instellingen\nis succesvol gelukt.\nHerstart alstublieft het apparaat.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset instellingen
+label_setting_restore:Herstel instellingen
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Sla printer instellingen\nop naar EEPROM?
+label_eeprom_restore_info:Herlaad instellingen van \nde EEPROM?
+label_eeprom_reset_info:Reset EEPROM naar de standaard printer instellingen?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start afdruk:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Ontgrendel XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune zal starten.\nDit kan een paar minuten duren.\nDoorgaan?
+label_pid_start_info_2:PID autotune is bezig!
+label_pid_start_info_3:Raak het scherm NIET aan totdat deze klaar is (groene LED aan)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connecties
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_pl.ini b/TFT/src/User/Language Packs/language_pl.ini
new file mode 100644
index 0000000000..86c5d23421
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_pl.ini	
@@ -0,0 +1,282 @@
+
+#### Language Code:PL
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Polski
+label_heat:Temp.
+label_move:Ruch
+label_home:Powrót
+label_disable_steppers:Disarm All
+label_print:Druk
+label_extrude:Extrude
+label_fan:Wentylator
+label_settings:Ustawienia
+label_screen_settings:Ekran
+label_machine_settings:Drukarka
+label_feature_settings:Opcje
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Wyłącz
+label_rgb_settings:Kolor LED
+label_rgb_off:Wyłącz LED
+label_terminal:Terminal
+label_custom:Własne
+label_leveling:Poziomowanie
+label_point_1:Punkt 1
+label_point_2:Punkt 2
+label_point_3:Punkt 3
+label_point_4:Punkt 4
+label_point_5:Punkt 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Wysuń
+label_bltouch_stow:Schowaj
+label_bltouch_repeat:Powtórz
+label_z_offset:Z Offset
+label_probe_offset:Przesunięcie
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Zapisz
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Więcej
+label_dec:Mniej
+label_nozzle:Głowica
+label_bed:Stół
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Powrót
+label_page_up:Dalej
+label_page_down:Wstecz
+label_pause:Wstrzymaj
+label_resume:Wznów
+label_load:Load
+label_unload:Unload
+label_slow_speed:Wolno
+label_normal_speed:Normalnie
+label_fast_speed:Szybko
+label_fan_full_speed:Max
+label_fan_half_speed:Połowa
+label_rotate_ui:Obrót
+label_touchscreen_adjust:Kalibracja
+label_more:Więcej
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Biały
+label_black:Czarny
+label_blue:Niebieski
+label_red:Czerwony
+label_green:Zielony
+label_cyan:Turkusowy
+label_yellow:Żółty
+label_brown:Brązowy
+label_gray:Szary
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Odłącz
+label_baudrate:BaudRate
+label_percentage:Procent
+label_babystep:BabyStep
+label_percentage_speed:Prędkość
+label_percentage_flow:Flow
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Gotowy
+label_busy:Trwa przetwarzanie, proszę czekać...
+label_unconnected:Drukarka nie podłączona!
+label_disconnect_info:Teraz możesz kontrolować drukarkę z komputera!
+label_loading:Loading...
+label_power_failed:Kontynuować drukowanie?
+label_continue:Kontynuuj
+label_cancel:Anuluj
+label_adjust_title:Kalibracja ekranu dotykowego
+label_adjust_info:Dotykaj czerwoną kropkę
+label_adjust_ok:Kalibracja poprawna
+label_adjust_failed:Kalibracja niepoprawna, spróbuj ponownie
+label_warning:Uwaga
+label_stop_print:Zatrzymać drukowanie?
+label_confirm:Potwierdź
+label_tftsd:SD TFT
+label_read_tftsd_error:Błąd odczytu karty SD wyświetlacza!
+label_tftsd_inserted:Karta włożona!
+label_tftsd_removed:Karta wyjęta!
+label_u_disk:U Disk
+label_read_u_disk_error:Błąd odczytu U Disk!
+label_u_disk_inserted:U Disk włożony!
+label_u_disk_removed:U Disk wyjęty!
+label_onboardsd:SD płyta
+label_read_onboardsd_error:Błąd odczytu karty SD na płycie!
+label_filament_sensor:Filament sensor
+label_filament_runout:brak filamentu!
+label_preheat:Rozgrzew.
+label_preheat_both:Wszystko
+label_is_pause:Operacja niedostępna\nw trakcie drukowania,\nwstrzymać drukowanie?
+label_auto_shut_down:Auto Wył.
+label_unifiedmove:Ruch
+label_unifiedheat:Temperatura
+label_cooldown:Chłodzenie
+label_emergencystop:ZATRZYMAJ
+label_touch_to_exit:Dotkij aby wyjść
+label_mainmenu:Menu
+label_wait_temp_shut_down:Czekam na schłodzenie\ndo %d℃
+label_force_shut_down:Wymuś
+label_shutting_down:Wyłączanie...
+label_parameter_setting:Parametr
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Odblokuj XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_pt.ini b/TFT/src/User/Language Packs/language_pt.ini
new file mode 100644
index 0000000000..b79c1ac939
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_pt.ini	
@@ -0,0 +1,281 @@
+#### Language Code:PT
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Portugues
+label_heat:Aquecer
+label_move:Mover
+label_home:Inicio
+label_disable_steppers:Disarm All
+label_print:Imprimir
+label_extrude:Extrudir
+label_fan:Ventoinha
+label_settings:Configurar
+label_screen_settings:Ecra
+label_machine_settings:Impressora
+label_feature_settings:Extras
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Desligar
+label_rgb_settings:LED cor
+label_rgb_off:Desligar
+label_terminal:Terminal
+label_custom:Custom
+label_leveling:Nivelar
+label_point_1:Ponto 1
+label_point_2:Ponto 2
+label_point_3:Ponto 3
+label_point_4:Ponto 4
+label_point_5:Ponto 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Testar
+label_bltouch_deploy:Abrir
+label_bltouch_stow:Encolher
+label_bltouch_repeat:Repetir
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Gravar
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Aumentar
+label_dec:Diminuir
+label_nozzle:Nozzle
+label_bed:Hotbed
+label_chamber:Chamber
+label_start:Start
+label_stop:Parar
+label_back:Voltar
+label_page_up:Subir pagina
+label_page_down:Pagina abaixo
+label_pause:Pausar
+label_resume:Resumir
+label_load:Carregar
+label_unload:Descarregar
+label_slow_speed:Lento
+label_normal_speed:Normal
+label_fast_speed:Rapido
+label_fan_full_speed:Full
+label_fan_half_speed:Half
+label_rotate_ui:Rodar
+label_touchscreen_adjust:Ajustar
+label_more:Mais
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Branco
+label_black:Preto
+label_blue:Azul
+label_red:Vermelho
+label_green:Verde
+label_cyan:Turquesa
+label_yellow:Amarelo
+label_brown:Castanho
+label_gray:Cinzento
+label_orange:Orange
+label_indigo:Indigo
+label_violet:Violet
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Desconectar
+label_baudrate:BaudRate
+label_percentage:Percentagem
+label_babystep:BabyStep
+label_percentage_speed:Rapidez
+label_percentage_flow:Fluxo
+label_value_zero:Zero
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pronto
+label_busy:Em processamento, aguarde...
+label_unconnected:Nenhuma impressora conectada!
+label_disconnect_info:Agora podes controlar a impressora com o computador!
+label_loading:Carregando...
+label_power_failed:Continuar a imprimir?
+label_continue:Continuar
+label_cancel:Cancelar
+label_adjust_title:Calibracao do Touch Screen
+label_adjust_info:Por favor, clique no ponto vermelho
+label_adjust_ok:Ajustado com sucesso
+label_adjust_failed:Ajuste falhou, tente novamente
+label_warning:Aviso
+label_stop_print:Parar de imprimir?
+label_confirm:Confirme
+label_tftsd:TFT SD
+label_read_tftsd_error:Erro a ler TFT SD!
+label_tftsd_inserted:Cartao inserido!
+label_tftsd_removed:Cartao removido!
+label_u_disk:U Disk
+label_read_u_disk_error:Erro a ler U Disk!
+label_u_disk_inserted:U Disk inserido!
+label_u_disk_removed:U Disk removido!
+label_onboardsd:OnboardSD
+label_read_onboardsd_error:Erro a ler Onboard SD card!
+label_filament_sensor:Filament sensor
+label_filament_runout:Filamento runout!
+label_preheat:Aquecer
+label_preheat_both:Ambos
+label_is_pause:Nao e possível a extrusão\ndurante a impressao,\npausar a impressao?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Movimento
+label_unifiedheat:Heat/Fan
+label_cooldown:Arrefecer
+label_emergencystop:EMERGENCIA STOP
+label_touch_to_exit:Toque em qualquer lugar para sair
+label_mainmenu:Menu
+label_wait_temp_shut_down:Wait for the hotend\ntemperature to be\nlower than %d ℃
+label_force_shut_down:Force
+label_shutting_down:Shutting down...
+label_parameter_setting:Parâmetro
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invert X Axis
+label_invert_yaxis:Invert Y Axis
+label_invert_zaxis:Invert Z Axis
+label_move_speed:Move speed(X Y Z)
+label_knob_led:Rotary Knob LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Persistent Status Info
+label_file_listmode:Files viewer List Mode
+label_current_setting:Driver Current (mA)
+label_steps_setting:Steps per mm
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Max Acceleration
+label_acceleration:Acceleration
+label_print_acceleration:Print Acceleration
+label_retract_acceleration:Retract Acceleration
+label_travel_acceleration:Travel Acceleration
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump sensitivity
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset all settings to\ndefault values?
+label_reset_settings_done:Reset all settings\nsuccessful.\nplease restart the device.
+label_info:Info
+label_lcd_brightness:LCD Brightness
+label_lcd_brightness_dim:LCD Brightness dim
+label_lcd_dim_idle_timer:LCD dim idle timer
+label_5_seconds:5 Sec.
+label_10_seconds:10 Sec.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Desbloquear XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_ru.ini b/TFT/src/User/Language Packs/language_ru.ini
new file mode 100644
index 0000000000..fdacc00204
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_ru.ini	
@@ -0,0 +1,281 @@
+#### Language Code:RU
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Русский
+label_heat:Нагрев
+label_move:Движение
+label_home:Домой
+label_disable_steppers:Двигатели
+label_print:Печать
+label_extrude:Экструзия
+label_fan:Вентилятор
+label_settings:Настройки
+label_screen_settings:Экран
+label_machine_settings:Принтер
+label_feature_settings:Опции
+label_sound:Звуки
+label_touch_sound:Звуки нажатий
+label_toast_sound:Звуки инфостроки
+label_alert_sound:Предупреждения
+label_shut_down:Выключить
+label_rgb_settings:Цвет LED
+label_rgb_off:LED выкл
+label_terminal:Терминал
+label_custom:Своё меню
+label_leveling:Стол вруч.
+label_point_1:Точка 1
+label_point_2:Точка 2
+label_point_3:Точка 3
+label_point_4:Точка 4
+label_point_5:Точка 5
+label_bed_leveling:Стол равнен.
+label_bl_complete:Выравнивание стола окончено
+label_bl_smart_fill:Отсутствующие точки\nзамера были атоматически\nзаполнены.\nЗапомните для сохраниения!
+label_bl_enable:BL: вкл
+label_bl_disable:BL: выкл
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Равнение по сетке
+label_abl_settings:Автовыравнивание
+label_abl_settings_bbl:Билинейная калибровка
+label_abl_settings_ubl:Универсальная калибровка
+label_abl_settings_ubl_save:Сохранить в ячейку
+label_abl_settings_ubl_load:Загрузить из ячейки
+label_abl_slot0:Ячейка 0
+label_abl_slot1:Ячейка 1
+label_abl_slot2:Ячейка 2
+label_abl_slot3:Ячейка 3
+label_abl_slot_eeprom:Восстановить из ячейки\nпри перезагрузке?\n(Сохранить в EEPROM)
+label_abl_z:Z затухание
+label_bltouch:BLTouch
+label_bltouch_test:BLT тест
+label_bltouch_deploy:BLT вниз
+label_bltouch_stow:BLT вверх
+label_bltouch_repeat:Точность Z
+label_z_offset:Отступ Z
+label_probe_offset:Смещение датчика
+label_confirmation:Вы уверены?
+label_down:Вниз
+label_up:Вверх
+label_save:Сохранить
+label_restore:Вернуть
+label_reset:Сброс
+label_default:По умолчанию
+label_clear:Убрать
+label_next:Следующий
+label_distance:Отступы
+label_invalid_value:Остутствуют правильные значения!
+label_timeout_reached:Время истекло!
+label_process_running:Идёт процесс!
+label_process_completed:Процесс завершён!
+label_process_aborted:Процесс прерван!
+label_inc:Увеличить
+label_dec:Уменьшить
+label_nozzle:Сопло
+label_bed:Стол
+label_chamber:Камера
+label_start:Начать
+label_stop:Стоп
+label_back:Назад
+label_page_up:Предыущая
+label_page_down:Следующая
+label_resume:Продолжить
+label_pause:Пауза
+label_load:Загрузка
+label_unload:Выгрузка
+label_slow_speed:Медленно
+label_normal_speed:Обычно
+label_fast_speed:Быстро
+label_fan_full_speed:Максимум
+label_fan_half_speed:50%
+label_rotate_ui:Переворот
+label_touchscreen_adjust:Калибровка
+label_more:Больше
+label_screen_info:Инфо
+label_status:Статус
+label_simulator_bg_color:Задний фон Marlin режима
+label_simulator_font_color:Передний фон Marlin режима
+label_white:Белый
+label_black:Чёрный
+label_blue:Синий
+label_red:Красный
+label_green:Зелёный
+label_cyan:Голубой
+label_yellow:Жёлтый
+label_brown:Коричневый
+label_gray:Серый
+label_orange:Оранжевый
+label_indigo:Индиго
+label_violet:Фиолетовый
+label_magenta:Маджента
+label_purple:Пурпурный
+label_lime:Лаймовый
+label_darkblue:Тёмно-синий
+label_darkgreen:Тёмно-зелёный
+label_darkgray:Тёмно-серый
+label_disconnect:Отключить
+label_baudrate:Скорость
+label_percentage:Подстройки
+label_babystep:Микрошаг Z
+label_percentage_speed:Скорость
+label_percentage_flow:Поток
+label_value_zero:Обнулить
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01мм
+label_01_mm:0.1мм
+label_1_mm:1мм
+label_5_mm:5мм
+label_10_mm:10мм
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Готов
+label_busy:Занято процессом, подождите...
+label_unconnected:Нет подключения!
+label_disconnect_info:Управление принтером через компьютер
+label_loading:Загрузка...
+label_power_failed:Продолжить печать?
+label_continue:Продолжение
+label_cancel:Отмена
+label_adjust_title:Калибровка экрана
+label_adjust_info:Нажмите на красную точку
+label_adjust_ok:Успешная калибровка
+label_adjust_failed:Неудачная калибровка, попробуйте снова
+label_warning:Внимание
+label_stop_print:Остановить печать?
+label_confirm:OK
+label_tftsd:SD экрана
+label_read_tftsd_error:Ошибка чтения SD карты!
+label_tftsd_inserted:SD карта вставлена!
+label_tftsd_removed:SD карта извлечена!
+label_u_disk:Флеш карта
+label_read_u_disk_error:Ошибка чтения флеш карты!
+label_u_disk_inserted:Флеш карта вставлена!
+label_u_disk_removed:Флеш карта извлечена!
+label_onboardsd:SD платы
+label_read_onboardsd_error:Ошибка чтения SD карты!
+label_filament_sensor:Сенсор прутка
+label_filament_runout:Пруток закончился
+label_preheat:Преднагрев
+label_preheat_both:Оба
+label_is_pause:Невозможна экструзия\nпри печати, поставить\nна паузу?
+label_auto_shut_down:Автовыключение
+label_unifiedmove:Движение
+label_unifiedheat:Нагрев
+label_cooldown:Охладить
+label_emergencystop:Экст.стоп
+label_touch_to_exit:Нажмите для возврата
+label_mainmenu:Меню
+label_wait_temp_shut_down:Дождитесь температуры\nсопла не ниже чем %d℃
+label_force_shut_down:Принудительно выкл
+label_shutting_down:Выключаю...
+label_parameter_setting:Параметры
+label_on:Вкл
+label_off:Выкл
+label_smart:Умный
+label_terminal_ack:ACK терминала (C°)
+label_invert_xaxis:Инверсия оси X
+label_invert_yaxis:Инверсия оси Y
+label_invert_zaxis:Инверсия оси Z
+label_move_speed:Скорость (X Y Z)
+label_knob_led:Подсветка энкодера
+label_knob_led_idle:Простой подсветки энкодера
+label_m0_pause:Пауза по команде M0
+label_send_start_gcode:G-код перед печатью
+label_send_end_gcode:G-код после печати
+label_send_cancel_gcode:G-код отмены печати
+label_persistent_status_info:Нагрев в инфостроке
+label_file_listmode:Файлы в режиме строк
+label_current_setting:Настройка TMC драйверов
+label_steps_setting:Настройка шагов на мм
+label_maxfeedrate:MAX скорость подачи
+label_maxacceleration:MAX ускорение
+label_acceleration:Ускорение
+label_print_acceleration:Печати
+label_retract_acceleration:Ретракта
+label_travel_acceleration:Перемещения
+label_jerk:Рывок
+label_junction_deviation:Отклонение узла
+label_bump_sensitivity:TMC чувствительность удара
+label_fwretract:M207 ретракт
+label_fwrecover:M208 восстановление ретракта
+label_lin_advance:К-фактор
+label_reset_settings_info:Все настройки будут\nсброшены по умолчанию.\nПродолжить?
+label_reset_settings_done:Успешный сброс настроек\nэкрана. Для полного\nвступления в силу,\nперегрузите устройство.
+label_info:Информация
+label_lcd_brightness:Яркость LCD
+label_lcd_brightness_dim:Регулировка яркости LCD
+label_lcd_dim_idle_timer:Время до гашения LCD
+label_5_seconds:5 сек.
+label_10_seconds:10 сек.
+label_30_seconds:30 сек.
+label_60_seconds:1 мин.
+label_120_seconds:2 мин.
+label_300_seconds:5 мин.
+label_custom_seconds:Своё
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin на весь экран
+label_plr_en:Работа после потери питания
+label_setting_save:Сохранить настройки
+label_setting_reset:Сбросить настройки
+label_setting_restore:Восстановить настройки
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Сохранить настройки\nпринтера в EEPROM?
+label_eeprom_restore_info:Загрузить настройки\nиз EEPROM?
+label_eeprom_reset_info:Сбрость EEPROM настройки\nпринтера на начальные?
+label_retract_feedrate:Скорость
+label_retract_length:Длина
+label_retract_swap_length:Длина при смене сопла
+label_retract_z_lift:Подъём по Z
+label_retract_auto:Авто FW ретракт
+label_recover_feedrate:Скорость
+label_swap_recover_feedrate:Скорость при смене сопла
+label_recover_length:Длина
+label_swap_recover_length:Длина при смене сопла
+label_start_print:Начать печать:\n %s?
+label_ack_notification:ACK стиль уведомления
+label_leveling_edge_distance:Отступы от краёв стола
+label_xy_unlock:Моторы выкл
+label_tuning:Наладка
+label_pid:PID
+label_pid_title:PID автонастройка
+label_pid_start_info:Сейчас будет запущена PID\nавтонастройка, это займёт\nнекоторое время. Продолжить?
+label_pid_start_info_2:Автонастройка PID в работе!
+label_pid_start_info_3:Не трогайте экран до\nокончания настройки\n(загориться зелёным LED)!
+label_tune_extruder:Настройка шагов
+label_tune_ext_extrude_100:100mm экст.
+label_tune_ext_temp:Настройка экструдера/Нагрев
+label_tune_ext_templow:Требуемая температура\nслишком низкая!\nМинимальная температура: %d℃
+label_tune_ext_desiredval:Температура еще не достигла требуемого значения
+label_tune_ext_mark120mm:Отметьте 120 мм на филаменте\nНажмите '%s' по говности\nИзмерьте полученную длину/nпосле экструдирования
+label_tune_ext_heatoff:Отключить нагрев?
+label_tune_ext_adj_esteps:Подстройка E-шагов
+label_tune_ext_esteps_saved:E-шаги установлены!\nНе забудьте сохранить\nих в EEPROM\nНовое значение: %0.2f
+label_tune_ext_measured:Оставшаяся длина:
+label_tune_ext_old_estep:Старые E-шаги: %0.2f
+label_tune_ext_new_estep:Новые E-шаги: %0.2f
+label_connection_settings:Соединение
+label_offset_tool:Смещение 2-го сопла
+label_hybrid_threshold:TMC гибридный порог
+label_notifications:Уведомления
+label_mesh_editor:Сетка ред.
+label_mesh_tuner:Сетка настр.
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_sk.ini b/TFT/src/User/Language Packs/language_sk.ini
new file mode 100644
index 0000000000..30423a0a24
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_sk.ini	
@@ -0,0 +1,281 @@
+#### Language Code:SK
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Slovensky
+label_heat:Teplota
+label_move:Posunúť
+label_home:Domov
+label_disable_steppers:Disarm All
+label_print:Tlačiť
+label_extrude:Extrúder
+label_fan:Ofuk
+label_settings:Nastavenia
+label_screen_settings:Obrazovka
+label_machine_settings:Tlačiareň
+label_feature_settings:Funkcie
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Vypnúť
+label_rgb_settings:Farba LED
+label_rgb_off:Vypnúť LED
+label_terminal:Terminál
+label_custom:Vlastné
+label_leveling:Vyrovnanie
+label_point_1:Bod 1
+label_point_2:Bod 2
+label_point_3:Bod 3
+label_point_4:Bod 4
+label_point_5:Bod 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Vystrčiť
+label_bltouch_stow:Stiahnuť
+label_bltouch_repeat:Opakovať
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Uložiť
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Pridať
+label_dec:Ubrať
+label_nozzle:Tryska
+label_bed:Podložka
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Naspäť
+label_page_up:Ďalej
+label_page_down:Naspäť
+label_pause:Pauza
+label_resume:Pokračovať
+label_load:Zaviesť
+label_unload:Vysunúť
+label_slow_speed:Pomaly
+label_normal_speed:Normálne
+label_fast_speed:Rýchlo
+label_fan_full_speed:Naplno
+label_fan_half_speed:Polovičná
+label_rotate_ui:Otočiť
+label_touchscreen_adjust:Kalibrácia
+label_more:Viacej
+label_screen_info:Info
+label_status:Status
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Biela
+label_black:Čierna
+label_blue:Modrá
+label_red:Červená
+label_green:Zelená
+label_cyan:Tyrkysová
+label_yellow:Žltá
+label_brown:Hnedá
+label_gray:Šedá
+label_orange:Oranžová
+label_indigo:Indigo
+label_violet:Fialová
+label_magenta:Magenta
+label_purple:Purple
+label_lime:Lime
+label_darkblue:DarkBlue
+label_darkgreen:DarkGreen
+label_darkgray:DarkGray
+label_disconnect:Odpojiť
+label_baudrate:BaudRate
+label_percentage:Percentá
+label_babystep:BabyStep
+label_percentage_speed:Rýchlosť
+label_percentage_flow:Prietok
+label_value_zero:Vypnúť
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pripravená
+label_busy:Počkajte prosím...
+label_unconnected:Tlačiareň odpojená!
+label_disconnect_info:Teraz môžete tlačiareň ovládať z počítača!
+label_loading:Načítavam...
+label_power_failed:Pokračovať v tlači?
+label_continue:Pokračovať
+label_cancel:Zrušiť
+label_adjust_title:Kalibrácia
+label_adjust_info:Dotknite sa postupne všetkých bodov
+label_adjust_ok:Kalibrácia úspešná
+label_adjust_failed:Kalibrácia zlyhala, opakovať
+label_warning:Varovanie
+label_stop_print:Zastaviť tlač?
+label_confirm:Potvrdiť
+label_tftsd:TFT SD
+label_read_tftsd_error:Chyba pri načítaní SD karty!
+label_tftsd_inserted:SD karta vložená!
+label_tftsd_removed:SD karta odstránená!
+label_u_disk:USB kľúč
+label_read_u_disk_error:Chyba pri načítaní USB kľúča!
+label_u_disk_inserted:USB kľúč vložený!
+label_u_disk_removed:USB disk odstránený!
+label_onboardsd:SD karta na doske
+label_read_onboardsd_error:Chyba pri načítaní SD karty na doske!
+label_filament_sensor:Filament senzor
+label_filament_runout:Chýba filament!
+label_preheat:Nahriať
+label_preheat_both:Tryska/Podložka
+label_is_pause:Nemožno extrudovať\npočas tlače,\npozastaviť tlač?
+label_auto_shut_down:Auto vyp.
+label_unifiedmove:Pohyb
+label_unifiedheat:Nahriať
+label_cooldown:Ochladiť
+label_emergencystop:STOP
+label_touch_to_exit:Dotknite sa obrazovky pre ukončenie
+label_mainmenu:Menu
+label_wait_temp_shut_down:Počkať na teplotu\ntrysky menej ako %d℃
+label_force_shut_down:Vynútené vypnutie
+label_shutting_down:Vypínanie...
+label_parameter_setting:Parametre
+label_on:ZAP
+label_off:VYP
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:Invertovať os X
+label_invert_yaxis:Invertovať os Y
+label_invert_zaxis:Invertovať os Z
+label_move_speed:Rýchlosť pohybu XYZ
+label_knob_led:LED otočného tlačidla
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Pauza príkazom M0
+label_send_start_gcode:Začiatočný Gcode
+label_send_end_gcode:Koncový Gcode
+label_send_cancel_gcode:Cancel Gcode
+label_persistent_status_info:Trvalé info o stave
+label_file_listmode:Zobraziť súbory ako zoznam
+label_current_setting:Prúd ovládača (mA)
+label_steps_setting:Počet krokov na MM
+label_maxfeedrate:Max Feed Rate
+label_maxacceleration:Maximálna akcelerácia
+label_acceleration:Akcelerácia
+label_print_acceleration:Akcelerácia pri tlači
+label_retract_acceleration:Akcelerácia retrakcie
+label_travel_acceleration:Akcelerácia presunu
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC bump citlivosť
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Resetovať všetky nastavenia.
+label_reset_settings_done:Reset všetkých nastavení\nvykonaný. Pre správne\nfungovanie, prosím,\nreštartovať zariadenie.
+label_info:Info
+label_lcd_brightness:Jas LCD
+label_lcd_brightness_dim:Zníženie jasu LCD
+label_lcd_dim_idle_timer:Zníženie jasu LCD po
+label_5_seconds:5 sek.
+label_10_seconds:10 sek.
+label_30_seconds:30 Sec.
+label_60_seconds:1 Min.
+label_120_seconds:2 Min.
+label_300_seconds:5 Min.
+label_custom_seconds:Custom
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Odomknite XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_sl.ini b/TFT/src/User/Language Packs/language_sl.ini
new file mode 100644
index 0000000000..0ae02fdba1
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_sl.ini	
@@ -0,0 +1,281 @@
+#### Language Code:SL
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Slovenski
+label_heat:Gretje
+label_move:Pomik
+label_home:Domov
+label_disable_steppers:Disarm All
+label_print:Tisk
+label_extrude:Filament
+label_fan:Hlajenje
+label_settings:Nastavitve
+label_screen_settings:Zaslon
+label_machine_settings:Naprava
+label_feature_settings:Funkcije
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Izklop
+label_rgb_settings:Barva LED
+label_rgb_off:LED Off
+label_terminal:Terminal
+label_custom:Po meri
+label_leveling:Niveliraj
+label_point_1:Točka 1
+label_point_2:Točka 2
+label_point_3:Točka 3
+label_point_4:Točka 4
+label_point_5:Točka 5
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Postavi
+label_bltouch_stow:Skrij
+label_bltouch_repeat:Ponovi
+label_z_offset:Z odmik
+label_probe_offset:Odmik sonde
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Shrani
+label_restore:Restore
+label_reset:Reset
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Več
+label_dec:Manj
+label_nozzle:Šoba
+label_bed:Miza
+label_chamber:Chamber
+label_start:Start
+label_stop:Stop
+label_back:Nazaj
+label_page_up:Stran gor
+label_page_down:Stran dol
+label_pause:Pavza
+label_resume:Nadaljuj
+label_load:Naloži
+label_unload:Izvrzi
+label_slow_speed:Počasi
+label_normal_speed:Normalo
+label_fast_speed:Hitro
+label_fan_full_speed:100% moč
+label_fan_half_speed:50% moč
+label_rotate_ui:Obrni UI
+label_touchscreen_adjust:Umeri
+label_more:Več
+label_screen_info:Info
+label_status:Info
+label_simulator_bg_color:Barva ozadja Marlin simulatorja
+label_simulator_font_color:Barva pisave Marlin simulatorja
+label_white:Belo
+label_black:Črno
+label_blue:Mordo
+label_red:Rdeče
+label_green:Zeleno
+label_cyan:Modrozelena
+label_yellow:Rumena
+label_brown:Rjana
+label_gray:Siva
+label_orange:Oranžna
+label_indigo:Indigo
+label_violet:Vijolična
+label_magenta:Magenta
+label_purple:Temno vijolična
+label_lime:Limeta
+label_darkblue:Temno morda
+label_darkgreen:Temno zelena
+label_darkgray:Temno siva
+label_disconnect:Odklopi
+label_baudrate:Baud hitr.
+label_percentage:Procent
+label_babystep:BabyStep
+label_percentage_speed:Hitrost
+label_percentage_flow:Pretok
+label_value_zero:Nič
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:Pripravljen
+label_busy:Zaseden s procesiranjem, prosim počakaj...
+label_unconnected:Nobenega tiskalnika priključenega!
+label_disconnect_info:Zdaj lahko upravljaš tiskalnik z računalnikom!
+label_loading:Nalagam...
+label_power_failed:Nadaljuj s tiskanjem?
+label_continue:Nadaljuj
+label_cancel:Prekliči
+label_adjust_title:Kalibracija zaslona na dotik
+label_adjust_info:Pritisni na rdečo piko
+label_adjust_ok:Nastavitev uspešna
+label_adjust_failed:Nastavitev neuspešna, prosim poskusi ponovno
+label_warning:Opozorilo
+label_stop_print:Ustavim tisk?
+label_confirm:OK
+label_tftsd:TFT SD
+label_read_tftsd_error:Napaka branja TFT SD kartice!
+label_tftsd_inserted:Kartica vstavljena!
+label_tftsd_removed:Kartica odstranjena!
+label_u_disk:USB disk
+label_read_u_disk_error:Napaka branja USB diska!
+label_u_disk_inserted:USB disk vstavljen!
+label_u_disk_removed:USB disk odstranjen!
+label_onboardsd:SKR SD
+label_read_onboardsd_error:Napaka branja SKR SD kartice!
+label_filament_sensor:Senzor filamenta
+label_filament_runout:Ni več filamenta!
+label_preheat:Predgretje
+label_preheat_both:Oboje
+label_is_pause:Ne morem estrudirat\nmed tiskanjem.\nPavziram tisk?
+label_auto_shut_down:Samodejni izklop
+label_unifiedmove:Vodenje
+label_unifiedheat:Gretje
+label_cooldown:Ohlajanje
+label_emergencystop:EM. STOP
+label_touch_to_exit:Klikni kjerkoli za izhod
+label_mainmenu:Meni
+label_wait_temp_shut_down:Čakam, da se šoba\nohladi pod %d °C
+label_force_shut_down:Prisilni izklop
+label_shutting_down:Ugašam...
+label_parameter_setting:Parametri
+label_on:ON
+label_off:OFF
+label_smart:SMART
+label_terminal_ack:Pokaži ACK v terminalu
+label_invert_xaxis:Invertiraj X os
+label_invert_yaxis:Invertiraj Y os
+label_invert_zaxis:Invertiraj Z os
+label_move_speed:Hitr. pomika (X Y Z)
+label_knob_led:LED enkoder gumba
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Pavza (M0 ukaz)
+label_send_start_gcode:Zaženi startno G-kodo
+label_send_end_gcode:Zaženi končno G-kodo
+label_send_cancel_gcode:Zaženi G-kodo preklica
+label_persistent_status_info:Stalno prikazuj status
+label_file_listmode:Prikaz datotek v seznamu
+label_current_setting:Tok driverja mot. (mA)
+label_steps_setting:Št. korakov na MM
+label_maxfeedrate:Max hitr. dovajanja fil.
+label_maxacceleration:Max pospešek
+label_acceleration:Pospešek
+label_print_acceleration:Pospešek tiska
+label_retract_acceleration:Pospešek privleka fil.
+label_travel_acceleration:Pospešek pomika
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC občutljivost trka
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Reset vseh nastavitev na\nprivzete vrednosti?
+label_reset_settings_done:Reset vseh nastavitev\nuspešna.\nPonovno zaženi napravo.
+label_info:Info
+label_lcd_brightness:Svetilnost LCD
+label_lcd_brightness_dim:Zatemnitev LCD
+label_lcd_dim_idle_timer:Zatemnitev po času
+label_5_seconds:5 sek.
+label_10_seconds:10 sek.
+label_30_seconds:30 sek.
+label_60_seconds:1 min.
+label_120_seconds:2 min.
+label_300_seconds:5 min.
+label_custom_seconds:Po meri
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin čez cel zaslon
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset nastavitev
+label_setting_restore:Obnovi nastavitve
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Shrani nastavitve tiskalnika\nv EEPROM?
+label_eeprom_restore_info:Naloži nastavitve iz\nEEPROM-a?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start tiska:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_tc.ini b/TFT/src/User/Language Packs/language_tc.ini
new file mode 100644
index 0000000000..bd4b1a41bd
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_tc.ini	
@@ -0,0 +1,281 @@
+#### Language Code:TC
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:正體中文
+label_heat:加熱
+label_move:移動
+label_home:回原點
+label_disable_steppers:解鎖電機
+label_print:列印
+label_extrude:擠出
+label_fan:風扇
+label_settings:設定
+label_screen_settings:螢幕設定
+label_machine_settings:機器設定
+label_feature_settings:功能設定
+label_sound:聲音
+label_touch_sound:按鈕聲音
+label_toast_sound:Toast 提示聲音
+label_alert_sound:彈窗和提示聲音
+label_shut_down:關閉電源
+label_rgb_settings:燈光顏色
+label_rgb_off:關閉燈光
+label_terminal:終端
+label_custom:自定義
+label_leveling:調平
+label_point_1:第一點
+label_point_2:第二點
+label_point_3:第三點
+label_point_4:第四點
+label_point_5:第五點
+label_bed_leveling:Bed Level
+label_bl_complete:平臺調平完成!
+label_bl_smart_fill:部分點未探測，已被自動填充，需要手動保存!
+label_bl_enable:BL:已開啟
+label_bl_disable:BL:已關閉
+label_abl:自動調平
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:BLTouch檢測
+label_bltouch_deploy:探針彈出
+label_bltouch_stow:探針收回
+label_bltouch_repeat:精度測試
+label_z_offset:Z軸偏移
+label_probe_offset:探針偏移
+label_confirmation:Are you sure?
+label_down:降低
+label_up:抬升
+label_save:儲存設定
+label_restore:恢復
+label_reset:重設
+label_default:默認
+label_clear:Clear
+label_next:下一個
+label_distance:距離
+label_invalid_value:沒有有效的條件!
+label_timeout_reached:已超時!
+label_process_running:正在運行,請稍後
+label_process_completed:處理已完成!
+label_process_aborted:處理已被中斷!
+label_inc:增加
+label_dec:減少
+label_nozzle:噴頭
+label_bed:熱床
+label_chamber:機殼
+label_start:開始
+label_stop:停止
+label_back:返回
+label_page_up:上一頁
+label_page_down:下一頁
+label_pause:暫停
+label_resume:繼續
+label_load:進料
+label_unload:退料
+label_slow_speed:慢速
+label_normal_speed:常速
+label_fast_speed:快速
+label_fan_full_speed:全速
+label_fan_half_speed:半速
+label_rotate_ui:顯示方向
+label_touchscreen_adjust:觸控校正
+label_more:更多
+label_screen_info:關於
+label_status:狀態
+label_simulator_bg_color:Marlin模式背景顏色
+label_simulator_font_color:Marlin模式字體顏色
+label_white:白
+label_black:黑
+label_blue:藍
+label_red:紅
+label_green:綠
+label_cyan:青
+label_yellow:黃
+label_brown:棕
+label_gray:灰
+label_orange:橘
+label_indigo:靛藍
+label_violet:藍紫
+label_magenta:桃紅
+label_purple:紫
+label_lime:萊姆
+label_darkblue:暗藍
+label_darkgreen:暗綠
+label_darkgray:深灰
+label_disconnect:中斷連線
+label_baudrate:串列傳輸速率
+label_percentage:百分比
+label_babystep:Z軸微調
+label_percentage_speed:速度百分比
+label_percentage_flow:流量百分比
+label_value_zero:歸零
+label_1_degree:1℃
+label_5_degree:5℃
+label_10_degree:10℃
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%%
+label_ready:已準備好
+label_busy:系統繁忙請稍等
+label_unconnected:尚未連線到主機板
+label_disconnect_info:電腦控制模式
+label_loading:讀取中
+label_power_failed:要繼續列印嗎？
+label_continue:繼續
+label_cancel:取消
+label_adjust_title:觸控校正
+label_adjust_info:點擊紅點
+label_adjust_ok:校正成功
+label_adjust_failed:校正失敗
+label_warning:警告
+label_stop_print:要停止列印嗎？
+label_confirm:確定
+label_tftsd:SD卡
+label_read_tftsd_error:SD卡讀取失敗
+label_tftsd_inserted:偵測到SD卡
+label_tftsd_removed:SD卡已拔出
+label_u_disk:隨身碟
+label_read_u_disk_error:隨身碟讀取失敗
+label_u_disk_inserted:偵測到隨身碟
+label_u_disk_removed:隨身碟已拔出
+label_onboardsd:主機板插槽的SD卡
+label_read_onboardsd_error:主機板插槽的SD卡讀取失敗
+label_filament_sensor:耗材感應器
+label_filament_runout:沒偵測到耗材
+label_preheat:預熱
+label_preheat_both:全部
+label_is_pause:列印時無法擠出耗材，要暫停列印嗎？
+label_auto_shut_down:自動關機
+label_unifiedmove:運動
+label_unifiedheat:溫度
+label_cooldown:冷卻
+label_emergencystop:立刻停止
+label_touch_to_exit:觸控任意位置退出頁面
+label_mainmenu:選單
+label_wait_temp_shut_down:噴頭降溫中，直到%d ℃時自動關機
+label_force_shut_down:強制關機
+label_shutting_down:關機中
+label_parameter_setting:參數設定
+label_on:開啟
+label_off:關閉
+label_smart:自動
+label_terminal_ack:在G-code終端顯示溫度
+label_invert_xaxis:X軸反向運轉
+label_invert_yaxis:Y軸反向運轉
+label_invert_zaxis:Z軸反向運轉
+label_move_speed:移動速度(X Y Z)
+label_knob_led:旋鈕LED顏色
+label_knob_led_idle:旋鈕LED自動睡眠
+label_m0_pause:M0暫停
+label_send_start_gcode:執行起始G-code
+label_send_end_gcode:執行結尾G-code
+label_send_cancel_gcode:中斷執行G-code
+label_persistent_status_info:頂部溫度訊息
+label_file_listmode:文件預覽列表模式
+label_current_setting:驅動晶片電流設定 (mA)
+label_steps_setting:電機每毫米步數Steps/mm
+label_maxfeedrate:最大移動速度
+label_maxacceleration:最大加速度
+label_acceleration:加速度
+label_print_acceleration:列印加速度
+label_retract_acceleration:回抽加速度
+label_travel_acceleration:空跑加速度
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:堵料檢測靈敏度
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:所有設定都會恢復預設值，確定嗎?
+label_reset_settings_done:重設成功，請重新開機
+label_info:提示
+label_lcd_brightness:螢幕亮度
+label_lcd_brightness_dim:睡眠狀態螢幕亮度
+label_lcd_dim_idle_timer:螢幕進入睡眠時間
+label_5_seconds:5秒.
+label_10_seconds:10秒.
+label_30_seconds:30秒.
+label_60_seconds:1分鐘
+label_120_seconds:2分鐘
+label_300_seconds:5分鐘
+label_custom_seconds:自訂
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:全螢幕Marlin模式
+label_plr_en:断电续打
+label_setting_save:保存设置
+label_setting_reset:重置设置
+label_setting_restore:保存设置
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:是否保存打印机设置到EEPROM?
+label_eeprom_restore_info:是否从EEPROM加载设置?
+label_eeprom_reset_info:重置EEPROM到出厂设置?
+label_retract_feedrate:FW回抽速度
+label_retract_length:FW回抽长度
+label_retract_swap_length:换料时回抽的长度
+label_retract_z_lift:回抽时Z轴抬升的高度
+label_retract_auto:FW自动回抽
+label_recover_feedrate:FW挤出速度
+label_swap_recover_feedrate:换料时挤出的速度
+label_recover_length:额外挤出的长度
+label_swap_recover_length:换料时额外挤出的长度
+label_start_print:是否开始打印:\n %s?
+label_ack_notification:ACK 弹窗类型
+label_leveling_edge_distance:手动调平边沿距离
+label_xy_unlock:解锁XY
+label_tuning:调整
+label_pid:PID
+label_pid_title:PID自动整定
+label_pid_start_info:开始PID自动整定,需要几分钟来完成,是否继续?
+label_pid_start_info_2:PID 正在自动整定中!
+label_pid_start_info_3:不要操作触控屏直到整定完成!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:挤出100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:连接
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Language Packs/language_tr.ini b/TFT/src/User/Language Packs/language_tr.ini
new file mode 100644
index 0000000000..b49546df81
--- /dev/null
+++ b/TFT/src/User/Language Packs/language_tr.ini	
@@ -0,0 +1,281 @@
+#### Language Code:TR
+## Language Version:20201001
+## Maximum byte per keyword is 250 Bytes.
+## Escape characters are not supported except newline '\n'
+
+label_language:Türkçe
+label_heat:Isıt
+label_move:Hareket
+label_home:Sıfırla
+label_disable_steppers:Disarm All
+label_print:Yazdır
+label_extrude:Filament
+label_fan:Fan
+label_settings:Ayarlar
+label_screen_settings:Ekran
+label_machine_settings:Makine
+label_feature_settings:Özellik
+label_sound:Sound
+label_touch_sound:Touch sounds
+label_toast_sound:Toast Notifications
+label_alert_sound:Popups and Alerts
+label_shut_down:Kapat
+label_rgb_settings:LED Rengi
+label_rgb_off:LED'i Kapat
+label_terminal:Terminal
+label_custom:Diğer
+label_leveling:Kalibrasyon
+label_point_1:1.Nokta
+label_point_2:2.Nokta
+label_point_3:3.Nokta
+label_point_4:4.Nokta
+label_point_5:5.Nokta
+label_bed_leveling:Bed Level
+label_bl_complete:Bed Leveling Complete
+label_bl_smart_fill:Missing probe points\nhave been smart filled.\n \nNote: remember to save!
+label_bl_enable:BL: on
+label_bl_disable:BL: off
+label_abl:ABL
+label_bbl:BBL
+label_ubl:UBL
+label_mbl:MBL
+label_mbl_settings:Mesh Bed Leveling
+label_abl_settings:Auto Bed Leveling
+label_abl_settings_bbl:Bilinear Bed Leveling
+label_abl_settings_ubl:Unified Bed Leveling
+label_abl_settings_ubl_save:Save to slot
+label_abl_settings_ubl_load:Load from slot
+label_abl_slot0:Slot 0
+label_abl_slot1:Slot 1
+label_abl_slot2:Slot 2
+label_abl_slot3:Slot 3
+label_abl_slot_eeprom:Remember slot for next\nreboot? (Save EEPROM)
+label_abl_z:Z Fade
+label_bltouch:BLTouch
+label_bltouch_test:Test
+label_bltouch_deploy:Deploy
+label_bltouch_stow:Stow
+label_bltouch_repeat:Repeat
+label_z_offset:Z Offset
+label_probe_offset:Probe Offset
+label_confirmation:Are you sure?
+label_down:Down
+label_up:Up
+label_save:Kaydet
+label_restore:Restore
+label_reset:Sıfırla
+label_default:Default
+label_clear:Clear
+label_next:Next
+label_distance:Distance
+label_invalid_value:Invalid value(s)
+label_timeout_reached:Timeout reached!
+label_process_running:Process already running!
+label_process_completed:Process completed!
+label_process_aborted:Process aborted!
+label_inc:Arttır
+label_dec:Azalt
+label_nozzle:Nozül
+label_bed:Tabla
+label_chamber:Chamber
+label_start:Start
+label_stop:Durdur
+label_back:Geri
+label_page_up:Yukarı
+label_page_down:Aşağı
+label_pause:Duraklat
+label_resume:Devam
+label_load:Yükle
+label_unload:Çıkar
+label_slow_speed:Yavaş
+label_normal_speed:Normal
+label_fast_speed:Hızlı
+label_fan_full_speed:Tam
+label_fan_half_speed:Yarım
+label_rotate_ui:Döndür
+label_touchscreen_adjust:Kalibre
+label_more:Daha
+label_screen_info:Bilgi
+label_status:Bilgi
+label_simulator_bg_color:Marlin simulator background color
+label_simulator_font_color:Marlin simulator font color
+label_white:Beyaz
+label_black:Siyah
+label_blue:Mavi
+label_red:Kırmızı
+label_green:Yeşil
+label_cyan:Camgöbeği
+label_yellow:Sarı
+label_brown:Kahverengi
+label_gray:Gri
+label_orange:Turuncu
+label_indigo:Çivit Mavisi
+label_violet:Menekşe
+label_magenta:Eflatun
+label_purple:Mor
+label_lime:Çim Rengi
+label_darkblue:Koyu Mavi
+label_darkgreen:Koyu Yeşil
+label_darkgray:Koyu Gri
+label_disconnect:Bağlt. Kes
+label_baudrate:BaudRate
+label_percentage:Yüzde
+label_babystep:BabyStep
+label_percentage_speed:Hız
+label_percentage_flow:Akış
+label_value_zero:Sıfır
+label_1_degree:1°C
+label_5_degree:5°C
+label_10_degree:10°C
+label_x_inc:X+
+label_y_inc:Y+
+label_z_inc:Z+
+label_x_dec:X-
+label_y_dec:Y-
+label_z_dec:Z-
+label_x:X
+label_y:Y
+label_z:Z
+label_001_mm:0.01mm
+label_01_mm:0.1mm
+label_1_mm:1mm
+label_5_mm:5mm
+label_10_mm:10mm
+label_100_mm:100mm
+label_200_mm:200mm
+label_1_percent:1%
+label_5_percent:5%
+label_10_percent:10%
+label_percent_value:%d%
+label_ready:Hazır
+label_busy:İşlem devam ediyor, lütfen bekleyiniz...
+label_unconnected:Yazıcı bağlı değil!
+label_disconnect_info:Artık yazıcıyı\nbilgisayarınızdan kontrol\nedebilirsiniz!
+label_loading:Yükleniyor...
+label_power_failed:Yazdırmaya devam edilsin mi?
+label_continue:Devam et
+label_cancel:İptal
+label_adjust_title:Dokunmatik Ekran Kalibrasyonu
+label_adjust_info:Lütfen kırmızı noktaya\ntıklayın
+label_adjust_ok:Kalibrasyon başarılı.
+label_adjust_failed:Kalibrasyon başarısız,\nlütfen tekrar deneyiniz.
+label_warning:Uyarı
+label_stop_print:Baskı durdurulsun mu?
+label_confirm:Tamam
+label_tftsd:SD Kart
+label_read_tftsd_error:SD kart okunamadı!
+label_tftsd_inserted:SD Kart Takıldı!
+label_tftsd_removed:SD Kart Çıkarıldı!
+label_u_disk:USB Disk
+label_read_u_disk_error:USB disk okunamadı!
+label_u_disk_inserted:USB Disk Takıldı!
+label_u_disk_removed:USB Disk Çıkarıldı!
+label_onboardsd:Dahili SD
+label_read_onboardsd_error:Dahili SD Okunamadı!
+label_filament_sensor:Filament sensörü
+label_filament_runout:Filament Bitti!
+label_preheat:Ön Isıtma
+label_preheat_both:Birlikte
+label_is_pause:Ekstrüde edilemiyor\nyazdırırken,\nNbaskı duraklatılsın mı?
+label_auto_shut_down:Auto Power
+label_unifiedmove:Hareket
+label_unifiedheat:Isıtma/Fan
+label_cooldown:Soğutma
+label_emergencystop:AcilDurdur
+label_touch_to_exit:Çıkmak için herhangi bir yere dokunun
+label_mainmenu:Menü
+label_wait_temp_shut_down:Wait for the hotend\ntemperature to be\nlower than %d℃
+label_force_shut_down:Zorlamak
+label_shutting_down:Kapatılıyor...
+label_parameter_setting:Parametre Ayarları
+label_on:Açık
+label_off:Kapalı
+label_smart:SMART
+label_terminal_ack:Show ACK in Terminal
+label_invert_xaxis:X Eksenini Tersine Çevir
+label_invert_yaxis:Y Eksenini Tersine Çevir
+label_invert_zaxis:Z Eksenini Tersine Çevir
+label_move_speed:Hareket Hızı(X Y Z)
+label_knob_led:Döner Düğme LED
+label_knob_led_idle:Rotary Knob LED idle
+label_m0_pause:Paused by M0 command
+label_send_start_gcode:Start Gcode before print
+label_send_end_gcode:End Gcode after print
+label_send_cancel_gcode:Gcode'u iptal et
+label_persistent_status_info:Dosyaları Liste Şeklinde
+label_file_listmode:Dosya Görüntüleyici Liste Modu
+label_current_setting:Sürücü Akımı (mA)
+label_steps_setting:MM başına adım sayısı
+label_maxfeedrate:Maks. İlerleme Hızı
+label_maxacceleration:Maks. İvmelenme
+label_acceleration:İvmelenme
+label_print_acceleration:Baskı İvmelenmesi
+label_retract_acceleration:Geriçekme İvmelenmesi
+label_travel_acceleration:Gezinti İvmelenmesi
+label_jerk:Jerk
+label_junction_deviation:Junction Deviation
+label_bump_sensitivity:TMC çarpma hassasiyeti
+label_fwretract:FW Retraction
+label_fwrecover:FW Retraction Recover
+label_lin_advance:Linear Advance
+label_reset_settings_info:Tüm ayarlar varsayılana\nsıfırlanacak değerler.\nDevam edilsin mi?
+label_reset_settings_done:Tüm ayarları başarıyla\nsıfırlama tamamlandı. Tam\nolarak etkili olması için\nlütfen cihazı yeniden\nbaşlatın.
+label_info:Bilgi
+label_lcd_brightness:Ekran Parlaklığı
+label_lcd_brightness_dim:Ekran Parlaklığı Kısılma Oranı
+label_lcd_dim_idle_timer:Ekran Parlaklığı Kısılma Süresi
+label_5_seconds:5 Sn.
+label_10_seconds:10 Sn.
+label_30_seconds:30 Sn.
+label_60_seconds:1 Dak.
+label_120_seconds:2 Dak.
+label_300_seconds:5 Dak.
+label_custom_seconds:Kişisel
+label_event_led_mode:Event led mode
+label_st7920_fullscreen:Marlin mode in fullscreen
+label_plr_en:Power loss recovery
+label_setting_save:Save settings
+label_setting_reset:Reset default settings
+label_setting_restore:Restore settings
+label_eeprom_settings:EEPROM
+label_eeprom_save_info:Save printer settings\nto EEPROM?
+label_eeprom_restore_info:Reload settings from\nEEPROM?
+label_eeprom_reset_info:Reset EEPROM to stock printer settings?
+label_retract_feedrate:Retract feedrate
+label_retract_length:Retract length
+label_retract_swap_length:Retract swap length
+label_retract_z_lift:Z lift on retraction
+label_retract_auto:Auto Firmware Retract
+label_recover_feedrate:Recover feedrate
+label_swap_recover_feedrate:Swap recover feedrate
+label_recover_length:Extra recover length
+label_swap_recover_length:Extra recover swap length
+label_start_print:Start Printing:\n %s?
+label_ack_notification:ACK notification style
+label_leveling_edge_distance:Bed edge distance
+label_xy_unlock:Disarm XY
+label_tuning:Tuning
+label_pid:PID
+label_pid_title:PID autotune
+label_pid_start_info:PID autotune may take\nsome time to complete.\nContinue?
+label_pid_start_info_2:PID autotune in progress!
+label_pid_start_info_3:Do not touch the screen until completed (green LED ON)!
+label_tune_extruder:Tune steps
+label_tune_ext_extrude_100:Ext. 100mm
+label_tune_ext_temp:Extruder tuning | Heat
+label_tune_ext_templow:Desired temperature too low!\nMinimum temperature: %d C
+label_tune_ext_desiredval:Temperature is not yet at the desired value
+label_tune_ext_mark120mm:Mark 120 mm on your fillament\nPress '%s' when ready\nMeasure remaining length\nafter extruding
+label_tune_ext_heatoff:Turn the heater off?
+label_tune_ext_adj_esteps:Adjust E-Steps
+label_tune_ext_esteps_saved:New E-steps saved!\nDon't forget to\nsave it in EEPROM\nNew value: %0.2f
+label_tune_ext_measured:Length remaining:
+label_tune_ext_old_estep:Old e-steps: %0.2f
+label_tune_ext_new_estep:New e-steps: %0.2f
+label_connection_settings:Connection
+label_offset_tool:Offset 2nd Nozzle
+label_hybrid_threshold:TMC HybridThreshold
+label_notifications:Notifications
+label_mesh_editor:Mesh edit
+label_mesh_tuner:Mesh tuner
+label_case_light:Case light
diff --git a/TFT/src/User/Menu/ABL.h b/TFT/src/User/Menu/ABL.h
index aeabe47ae0..c3e5346123 100644
--- a/TFT/src/User/Menu/ABL.h
+++ b/TFT/src/User/Menu/ABL.h
@@ -1,5 +1,4 @@
-#ifndef _ABL_H_
-#define _ABL_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,5 +17,3 @@ void menuABL(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/BLTouch.h b/TFT/src/User/Menu/BLTouch.h
index 778316332e..022346f5f3 100644
--- a/TFT/src/User/Menu/BLTouch.h
+++ b/TFT/src/User/Menu/BLTouch.h
@@ -1,14 +1,11 @@
-#ifndef _BLTOUCH_H_
-#define _BLTOUCH_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void menuBLTouch(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void menuBLTouch(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/TFT/src/User/Menu/Babystep.h b/TFT/src/User/Menu/Babystep.h
index cc000f720a..e83674eddc 100644
--- a/TFT/src/User/Menu/Babystep.h
+++ b/TFT/src/User/Menu/Babystep.h
@@ -1,5 +1,4 @@
-#ifndef _BABYSTEP_H_
-#define _BABYSTEP_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,5 +11,3 @@ void menuBabystep(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/BedLeveling.h b/TFT/src/User/Menu/BedLeveling.h
index 47c3bc9a76..caf43e2af8 100644
--- a/TFT/src/User/Menu/BedLeveling.h
+++ b/TFT/src/User/Menu/BedLeveling.h
@@ -1,5 +1,4 @@
-#ifndef _BED_LEVELING_H_
-#define _BED_LEVELING_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuBedLeveling(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/ConnectionSettings.c b/TFT/src/User/Menu/ConnectionSettings.c
index 69471f8439..ffab3a992e 100644
--- a/TFT/src/User/Menu/ConnectionSettings.c
+++ b/TFT/src/User/Menu/ConnectionSettings.c
@@ -67,7 +67,8 @@ void menuBaudrate(void)
       break;
 
     default:
-      if(key_num < LISTITEM_PER_PAGE){
+      if (key_num < LISTITEM_PER_PAGE)
+      {
         uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num;
         if (tmp_i != cur_item) { // has changed
           totalItems[cur_item].icon = ICONCHAR_UNCHECKED;
@@ -88,7 +89,7 @@ void menuBaudrate(void)
     loopProcess();
   }
 
-  if(memcmp(&now, &infoSettings, sizeof(SETTINGS)))
+  if (memcmp(&now, &infoSettings, sizeof(SETTINGS)))
   {
     storePara();
   }
diff --git a/TFT/src/User/Menu/ConnectionSettings.h b/TFT/src/User/Menu/ConnectionSettings.h
index a041f62892..46b87fdcc0 100644
--- a/TFT/src/User/Menu/ConnectionSettings.h
+++ b/TFT/src/User/Menu/ConnectionSettings.h
@@ -1,5 +1,4 @@
-#ifndef _CONNECTION_SETTINGS_H_
-#define _CONNECTION_SETTINGS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuConnectionSettings(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Extrude.c b/TFT/src/User/Menu/Extrude.c
index 57d1e09775..c67d3401f3 100644
--- a/TFT/src/User/Menu/Extrude.c
+++ b/TFT/src/User/Menu/Extrude.c
@@ -82,7 +82,7 @@ void menuExtrude(void)
   #if LCD_ENCODER_SUPPORT
     encoderPosition = 0;
   #endif
-  if(eRelative) mustStoreCmd("M82\n"); // Set extruder to absolute
+  if (eRelative) mustStoreCmd("M82\n"); // Set extruder to absolute
   while(infoMenu.menu[infoMenu.cur] == menuExtrude)
   {
     key_num = menuKeyGetValue();
@@ -130,7 +130,7 @@ void menuExtrude(void)
 
       default:
         #if LCD_ENCODER_SUPPORT
-          if(encoderPosition)
+          if (encoderPosition)
           {
             eTemp += item_len[item_len_i]*encoderPosition;
             encoderPosition = 0;
@@ -138,11 +138,11 @@ void menuExtrude(void)
         #endif
         break;
     }
-    if(extrudeCoordinate != eTemp)
+    if (extrudeCoordinate != eTemp)
     {
       extrudeCoordinate = eTemp;
       extrudeCoordinateReDraw(true);
-      if(item_extruder_i != heatGetCurrentTool())
+      if (item_extruder_i != heatGetCurrentTool())
         storeCmd("%s\n", tool_change[item_extruder_i]);
       storeCmd("G0 E%.5f F%d\n", extrudeCoordinate, infoSettings.ext_speed[item_speed_i]);
     }
@@ -150,5 +150,5 @@ void menuExtrude(void)
   }
   mustStoreCmd("G92 E%.5f\n",eSaved);
   mustStoreCmd("G0 F%d\n",feedrate);
-  if(eRelative) mustStoreCmd("M83\n"); // Set extruder to relative
+  if (eRelative) mustStoreCmd("M83\n"); // Set extruder to relative
 }
diff --git a/TFT/src/User/Menu/Extrude.h b/TFT/src/User/Menu/Extrude.h
index 1d569dd884..f42d97b89c 100644
--- a/TFT/src/User/Menu/Extrude.h
+++ b/TFT/src/User/Menu/Extrude.h
@@ -1,5 +1,4 @@
-#ifndef _EXTRUDE_H_
-#define _EXTRUDE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,5 +12,3 @@ void menuExtrude(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Fan.c b/TFT/src/User/Menu/Fan.c
index 028c185919..cbdd6ac56f 100644
--- a/TFT/src/User/Menu/Fan.c
+++ b/TFT/src/User/Menu/Fan.c
@@ -20,9 +20,13 @@ void fanSpeedReDraw(bool skip_header)
   }
 
   if(infoSettings.fan_percentage == 1)
+  {
     sprintf(tempstr, "  %d%%  ", fanGetDesiredPercent(curIndex));
+  }
   else
+  {
     sprintf(tempstr, "  %d  ", (int)fanGetDesiredSpeed(curIndex));
+  }
 
   setLargeFont(true);
   GUI_DispStringInPrect(&exhibitRect, (u8 *)tempstr);
@@ -132,7 +136,7 @@ void menuFan(void)
 
     default:
       #if LCD_ENCODER_SUPPORT
-        if(encoderPosition)
+        if (encoderPosition)
         {
           if (actFan < infoSettings.fan_max[curIndex] && encoderPosition > 0)
           {
diff --git a/TFT/src/User/Menu/Fan.h b/TFT/src/User/Menu/Fan.h
index b9d0a69da4..78c8c91d04 100644
--- a/TFT/src/User/Menu/Fan.h
+++ b/TFT/src/User/Menu/Fan.h
@@ -1,5 +1,4 @@
-#ifndef _FAN_H_
-#define _FAN_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuFan(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/FeatureSettings.c b/TFT/src/User/Menu/FeatureSettings.c
index cdd5055128..cc0a5ca27d 100644
--- a/TFT/src/User/Menu/FeatureSettings.c
+++ b/TFT/src/User/Menu/FeatureSettings.c
@@ -74,15 +74,16 @@ typedef enum
   SKEY_ACK_NOTIFICATION,
   #ifdef LED_COLOR_PIN
     SKEY_KNOB,
-  #ifdef LCD_LED_PWM_CHANNEL
-    SKEY_KNOB_LED_IDLE,
-  #endif
+    #ifdef LCD_LED_PWM_CHANNEL
+      SKEY_KNOB_LED_IDLE,
+    #endif
   #endif
   #ifdef LCD_LED_PWM_CHANNEL
     SKEY_LCD_BRIGHTNESS,
     SKEY_LCD_BRIGTHNESS_DIM,
     SKEY_LCD_DIM_IDLE_TIMER,
   #endif
+  SKEY_EVENT_LED_MODE,
   #ifdef ST7920_SPI
     SKEY_ST7920_FULLSCREEN,
   #endif
@@ -117,21 +118,22 @@ LISTITEM settingPage[SKEY_COUNT] = {
   {ICONCHAR_BLANK,      LIST_CUSTOMVALUE,   LABEL_ACK_NOTIFICATION,         LABEL_DYNAMIC},
   #ifdef LED_COLOR_PIN
     {ICONCHAR_BLANK,      LIST_CUSTOMVALUE,   LABEL_KNOB_LED,                 LABEL_OFF},
-  #ifdef LCD_LED_PWM_CHANNEL
-    {ICONCHAR_BLANK,      LIST_TOGGLE,        LABEL_KNOB_LED_IDLE,            LABEL_BACKGROUND},
-  #endif
+    #ifdef LCD_LED_PWM_CHANNEL
+      {ICONCHAR_BLANK,      LIST_TOGGLE,        LABEL_KNOB_LED_IDLE,            LABEL_BACKGROUND},
+    #endif
   #endif
   #ifdef LCD_LED_PWM_CHANNEL
     {ICONCHAR_BLANK,      LIST_CUSTOMVALUE,   LABEL_LCD_BRIGHTNESS,           LABEL_DYNAMIC},
     {ICONCHAR_BLANK,      LIST_CUSTOMVALUE,   LABEL_LCD_BRIGHTNESS_DIM,       LABEL_DYNAMIC},
     {ICONCHAR_BLANK,      LIST_CUSTOMVALUE,   LABEL_LCD_DIM_IDLE_TIMER,       LABEL_DYNAMIC},
   #endif
+  {ICONCHAR_BLANK,      LIST_TOGGLE,        LABEL_EVENT_LED_MODE,          LABEL_BACKGROUND},
   #ifdef ST7920_SPI
     {ICONCHAR_BLANK,      LIST_TOGGLE,        LABEL_ST7920_FULLSCREEN,        LABEL_OFF},
   #endif
-  {ICONCHAR_TOGGLE_ON,  LIST_TOGGLE,        LABEL_PLR_EN,                   LABEL_BACKGROUND},
+  {ICONCHAR_TOGGLE_ON,    LIST_TOGGLE,        LABEL_PLR_EN,                   LABEL_BACKGROUND},
   // Keep reset settings always at the bottom of the settings menu list.
-  {ICONCHAR_BLANK,      LIST_MOREBUTTON,    LABEL_SETTING_RESET,            LABEL_BACKGROUND}
+  {ICONCHAR_BLANK,        LIST_MOREBUTTON,    LABEL_SETTING_RESET,            LABEL_BACKGROUND}
 };
 
 void resetSettings(void)
@@ -225,13 +227,13 @@ void updateFeatureSettings(uint8_t key_val)
         WS2812_Send_DAT(led_color[infoSettings.knob_led_color]);
         break;
 
-    #ifdef LCD_LED_PWM_CHANNEL
-      case SKEY_KNOB_LED_IDLE:
-        infoSettings.knob_led_idle = (infoSettings.knob_led_idle + 1) % TOGGLE_NUM;
-        settingPage[item_index].icon = toggleitem[infoSettings.knob_led_idle];
-        break;
-    #endif //LCD_LED_PWM_CHANNEL
-    #endif
+      #ifdef LCD_LED_PWM_CHANNEL
+        case SKEY_KNOB_LED_IDLE:
+          infoSettings.knob_led_idle = (infoSettings.knob_led_idle + 1) % TOGGLE_NUM;
+          settingPage[item_index].icon = toggleitem[infoSettings.knob_led_idle];
+          break;
+      #endif //LCD_LED_PWM_CHANNEL
+    #endif //LED_COLOR_PIN
 
     case SKEY_RESET_SETTINGS:
       setDialogText(LABEL_SETTING_RESET, LABEL_RESET_SETTINGS_INFO, LABEL_CONFIRM, LABEL_CANCEL);
@@ -242,8 +244,10 @@ void updateFeatureSettings(uint8_t key_val)
       case SKEY_LCD_BRIGHTNESS:
       {
         infoSettings.lcd_brightness = (infoSettings.lcd_brightness + 1) % ITEM_BRIGHTNESS_NUM;
-        if(infoSettings.lcd_brightness == 0)
+        if (infoSettings.lcd_brightness == 0)
+        {
           infoSettings.lcd_brightness = 1; //In Normal it should not be off. Set back to 5%
+        }
 
         char tempstr[8];
         sprintf(tempstr, (char *)textSelect(LABEL_PERCENT_VALUE), LCD_BRIGHTNESS[infoSettings.lcd_brightness]);
@@ -268,11 +272,16 @@ void updateFeatureSettings(uint8_t key_val)
 
     #endif //LCD_LED_PWM_CHANNEL
 
-    #ifdef ST7920_SPI
-    case SKEY_ST7920_FULLSCREEN:
-      infoSettings.marlin_mode_fullscreen = (infoSettings.marlin_mode_fullscreen + 1) % TOGGLE_NUM;
-      settingPage[item_index].icon = toggleitem[infoSettings.marlin_mode_fullscreen];
+    case SKEY_EVENT_LED_MODE:
+      infoSettings.event_led_mode = (infoSettings.event_led_mode + 1) % TOGGLE_NUM;
+      settingPage[item_index].icon = toggleitem[infoSettings.event_led_mode];
       break;
+
+    #ifdef ST7920_SPI
+      case SKEY_ST7920_FULLSCREEN:
+        infoSettings.marlin_mode_fullscreen = (infoSettings.marlin_mode_fullscreen + 1) % TOGGLE_NUM;
+        settingPage[item_index].icon = toggleitem[infoSettings.marlin_mode_fullscreen];
+        break;
     #endif
 
     case SKEY_PLR_EN:
@@ -289,7 +298,8 @@ void updateFeatureSettings(uint8_t key_val)
 //
 //load values on page change and reload
 //
-void loadFeatureSettings(){
+void loadFeatureSettings()
+{
   for (uint8_t i = 0; i < LISTITEM_PER_PAGE; i++)
   {
     uint8_t item_index = fe_cur_page * LISTITEM_PER_PAGE + i;
@@ -355,17 +365,20 @@ void loadFeatureSettings(){
 
       case SKEY_RESET_SETTINGS:
         break;
+
       #ifdef LED_COLOR_PIN
         case SKEY_KNOB:
           settingPage[item_index].valueLabel = itemLedcolor[infoSettings.knob_led_color];
           featureSettingsItems.items[i] = settingPage[item_index];
           break;
+
         #ifdef LCD_LED_PWM_CHANNEL
-        case SKEY_KNOB_LED_IDLE:
-          settingPage[item_index].icon = toggleitem[infoSettings.knob_led_idle];
-          break;
+          case SKEY_KNOB_LED_IDLE:
+            settingPage[item_index].icon = toggleitem[infoSettings.knob_led_idle];
+            break;
         #endif
       #endif
+
       #ifdef LCD_LED_PWM_CHANNEL
         case SKEY_LCD_BRIGHTNESS:
         {
@@ -384,7 +397,11 @@ void loadFeatureSettings(){
         case SKEY_LCD_DIM_IDLE_TIMER:
           settingPage[item_index].valueLabel = itemDimTime[infoSettings.lcd_idle_timer];
           break;
-      #endif //PS_ON_PIN
+      #endif //LCD_LED_PWM_CHANNEL
+
+      case SKEY_EVENT_LED_MODE:
+        settingPage[item_index].icon = toggleitem[infoSettings.event_led_mode];
+        break;
 
       #ifdef ST7920_SPI
         case SKEY_ST7920_FULLSCREEN:
@@ -414,11 +431,13 @@ void loadFeatureSettings(){
   }
   else
   {
-    if(fe_cur_page == 0){
+    if (fe_cur_page == 0)
+    {
       featureSettingsItems.items[5].icon = ICONCHAR_BACKGROUND;
       featureSettingsItems.items[6].icon = ICONCHAR_PAGEDOWN;
     }
-    else if(fe_cur_page == (FE_PAGE_COUNT-1)){
+    else if (fe_cur_page == (FE_PAGE_COUNT-1))
+    {
       featureSettingsItems.items[5].icon = ICONCHAR_PAGEUP;
       featureSettingsItems.items[6].icon = ICONCHAR_BACKGROUND;
     }
@@ -447,8 +466,10 @@ void menuFeatureSettings(void)
     switch (key_num)
     {
     case KEY_ICON_5:
-      if(FE_PAGE_COUNT > 1){
-        if (fe_cur_page > 0){
+      if (FE_PAGE_COUNT > 1)
+      {
+        if (fe_cur_page > 0)
+        {
           fe_cur_page--;
           loadFeatureSettings();
           menuRefreshListPage();
@@ -457,8 +478,10 @@ void menuFeatureSettings(void)
       break;
 
     case KEY_ICON_6:
-      if(FE_PAGE_COUNT > 1){
-        if (fe_cur_page < FE_PAGE_COUNT - 1){
+      if (FE_PAGE_COUNT > 1)
+      {
+        if (fe_cur_page < FE_PAGE_COUNT - 1)
+        {
           fe_cur_page++;
           loadFeatureSettings();
           menuRefreshListPage();
@@ -471,9 +494,10 @@ void menuFeatureSettings(void)
       infoMenu.cur--;
       break;
     default:
-      if(key_num < LISTITEM_PER_PAGE){
-      updateFeatureSettings(key_num);
-      menuDrawListItem(&featureSettingsItems.items[key_num],key_num);
+      if (key_num < LISTITEM_PER_PAGE)
+      {
+        updateFeatureSettings(key_num);
+        menuDrawListItem(&featureSettingsItems.items[key_num],key_num);
       }
       break;
     }
@@ -481,7 +505,7 @@ void menuFeatureSettings(void)
     loopProcess();
   }
 
-  if(memcmp(&now, &infoSettings, sizeof(SETTINGS)))
+  if (memcmp(&now, &infoSettings, sizeof(SETTINGS)))
   {
     storePara();
   }
diff --git a/TFT/src/User/Menu/FeatureSettings.h b/TFT/src/User/Menu/FeatureSettings.h
index 07118fcd32..d0ab4ffeec 100644
--- a/TFT/src/User/Menu/FeatureSettings.h
+++ b/TFT/src/User/Menu/FeatureSettings.h
@@ -1,5 +1,4 @@
-#ifndef _FEATURE_SETTINGS_H_
-#define _FEATURE_SETTINGS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,5 +10,3 @@ void resetSettings(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Heat.c b/TFT/src/User/Menu/Heat.c
index c6f0561e69..85582eeade 100644
--- a/TFT/src/User/Menu/Heat.c
+++ b/TFT/src/User/Menu/Heat.c
@@ -115,6 +115,7 @@ void menuHeat(void)
         do{
           c_heater = (c_heater + 1) % MAX_HEATER_COUNT;
         } while(!heaterIsValid(c_heater));
+
         heatItems.items[key_num] = itemTool[c_heater];
         menuDrawItem(&heatItems.items[key_num], key_num);
         showTemperature(c_heater);
@@ -136,12 +137,16 @@ void menuHeat(void)
 
       default :
         #if LCD_ENCODER_SUPPORT
-          if(encoderPosition)
+          if (encoderPosition)
           {
-            if(encoderPosition > 0)
-                heatSetTargetTemp(c_heater, actTarget + item_degree[item_degree_i]);
-            if(encoderPosition < 0)
-                heatSetTargetTemp(c_heater, actTarget - item_degree[item_degree_i]);
+            if (encoderPosition > 0)
+            {
+              heatSetTargetTemp(c_heater, actTarget + item_degree[item_degree_i]);
+            }
+            if (encoderPosition < 0)
+            {
+              heatSetTargetTemp(c_heater, actTarget - item_degree[item_degree_i]);
+            }
             encoderPosition = 0;
           }
         #endif
@@ -159,5 +164,7 @@ void menuHeat(void)
 
   // Set slow update time if not waiting for target temperature
   if(heatHasWaiting() == false)
+  {
     heatSetUpdateSeconds(TEMPERATURE_QUERY_SLOW_SECONDS);
+  }
 }
diff --git a/TFT/src/User/Menu/Heat.h b/TFT/src/User/Menu/Heat.h
index 1c12ccd898..f61cc8832f 100644
--- a/TFT/src/User/Menu/Heat.h
+++ b/TFT/src/User/Menu/Heat.h
@@ -1,5 +1,4 @@
-#ifndef _HEAT_H_
-#define _HEAT_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,5 +16,3 @@ void heatSetCurrentIndex(uint8_t index);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Home.h b/TFT/src/User/Menu/Home.h
index 605caa09d5..31ac54a1c7 100644
--- a/TFT/src/User/Menu/Home.h
+++ b/TFT/src/User/Menu/Home.h
@@ -1,5 +1,4 @@
-#ifndef _HOME_H_
-#define _HOME_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuHome(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Leveling.h b/TFT/src/User/Menu/Leveling.h
index b1338a647a..0814968f7f 100644
--- a/TFT/src/User/Menu/Leveling.h
+++ b/TFT/src/User/Menu/Leveling.h
@@ -1,5 +1,4 @@
-#ifndef _LEVELING_H_
-#define _LEVELING_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuManualLeveling(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/MBL.c b/TFT/src/User/Menu/MBL.c
index 29631ff325..50e7678963 100644
--- a/TFT/src/User/Menu/MBL.c
+++ b/TFT/src/User/Menu/MBL.c
@@ -179,17 +179,25 @@ void menuMBL(void)
       // decrease Z height
       case KEY_ICON_0:
         if (!mblRunning)
+        {
           mblNotifyError();
+        }
         else
+        {
           probeHeightMove(unit, -1);
+        }
         break;
 
       // increase Z height
       case KEY_ICON_3:
         if (!mblRunning)
+        {
           mblNotifyError();
+        }
         else
+        {
           probeHeightMove(unit, 1);
+        }
         break;
 
       // change unit
@@ -204,9 +212,13 @@ void menuMBL(void)
       // reset Z height to 0
       case KEY_ICON_5:
         if (!mblRunning)
+        {
           mblNotifyError();
+        }
         else
+        {
           probeHeightMove(curValue, -1);
+        }
         break;
 
       // start MBL or move to next mesh point
@@ -236,7 +248,9 @@ void menuMBL(void)
 
       case KEY_ICON_7:
         if (mblRunning)
+        {
           mblStop();
+        }
 
         infoMenu.cur--;
         break;
@@ -246,9 +260,13 @@ void menuMBL(void)
           if (encoderPosition)
           {
             if (!mblRunning)
+            {
               mblNotifyError();
+            }
             else
+            {
               probeHeightMove(unit, encoderPosition > 0 ? 1 : -1);
+            }
 
             encoderPosition = 0;
           }
diff --git a/TFT/src/User/Menu/MBL.h b/TFT/src/User/Menu/MBL.h
index 2ef4991d87..ac9089d743 100644
--- a/TFT/src/User/Menu/MBL.h
+++ b/TFT/src/User/Menu/MBL.h
@@ -1,5 +1,4 @@
-#ifndef _MBL_H_
-#define _MBL_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,5 +14,3 @@ void menuMBL(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/MachineSettings.c b/TFT/src/User/Menu/MachineSettings.c
index f4bdbac50d..81e70ac505 100644
--- a/TFT/src/User/Menu/MachineSettings.c
+++ b/TFT/src/User/Menu/MachineSettings.c
@@ -30,12 +30,14 @@ void loaditemsCustomGcode()
   for (uint32_t i = 0; i < LISTITEM_PER_PAGE; i++)
   {
     uint32_t item_index = gc_cur_page*LISTITEM_PER_PAGE + i;
-    if (item_index < gcode_num){
+    if (item_index < gcode_num)
+    {
       customItems.items[i].icon = ICONCHAR_CODE;
       customItems.items[i].titlelabel.index = LABEL_DYNAMIC;
       customItems.items[i].titlelabel.address = customcodes->name[item_index];
     }
-    else{
+    else
+    {
       customItems.items[i].icon = ICONCHAR_BACKGROUND;
       customItems.items[i].titlelabel.index = LABEL_BACKGROUND;
     }
@@ -48,11 +50,13 @@ void loaditemsCustomGcode()
   }
   else
   {
-    if(gc_cur_page == 0){
+    if (gc_cur_page == 0)
+    {
       customItems.items[5].icon = ICONCHAR_BACKGROUND;
       customItems.items[6].icon = ICONCHAR_PAGEDOWN;
     }
-    else if(gc_cur_page == (gc_page_count-1)){
+    else if (gc_cur_page == (gc_page_count-1))
+    {
       customItems.items[5].icon = ICONCHAR_PAGEUP;
       customItems.items[6].icon = ICONCHAR_BACKGROUND;
     }
@@ -314,7 +318,8 @@ void menuMachineSettings(void)
         break;
 #endif
       case KEY_ICON_6:
-        if (infoMachineSettings.caseLightsBrightness == ENABLED){
+        if (infoMachineSettings.caseLightsBrightness == ENABLED)
+        {
           infoMenu.menu[++infoMenu.cur] = menuCaseLight;
         }
         break;
diff --git a/TFT/src/User/Menu/MachineSettings.h b/TFT/src/User/Menu/MachineSettings.h
index 6560edc83a..7984900a0e 100644
--- a/TFT/src/User/Menu/MachineSettings.h
+++ b/TFT/src/User/Menu/MachineSettings.h
@@ -1,5 +1,4 @@
-#ifndef _MACHINE_SETTINGS_H_
-#define _MACHINE_SETTINGS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,5 +13,3 @@ void menuCustom(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/MainPage.c b/TFT/src/User/Menu/MainPage.c
index f947a7c194..815c3845ba 100644
--- a/TFT/src/User/Menu/MainPage.c
+++ b/TFT/src/User/Menu/MainPage.c
@@ -132,9 +132,13 @@ void classicMenu(void)
 
       case KEY_ICON_7:
         if (infoMachineSettings.leveling != BL_DISABLED)
+        {
           infoMenu.menu[++infoMenu.cur] = menuBedLeveling;
+        }
         else
+        {
           infoMenu.menu[++infoMenu.cur] = menuManualLeveling;
+        }
         break;
 
       default:
diff --git a/TFT/src/User/Menu/MainPage.h b/TFT/src/User/Menu/MainPage.h
index ea264980f9..666d0c6e52 100644
--- a/TFT/src/User/Menu/MainPage.h
+++ b/TFT/src/User/Menu/MainPage.h
@@ -1,5 +1,4 @@
-#ifndef _MAINPAGE_H_
-#define _MAINPAGE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,5 +10,3 @@ void classicMenu(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/MarlinMode.c b/TFT/src/User/Menu/MarlinMode.c
index 4583d1e7fe..cf21bdb8fe 100644
--- a/TFT/src/User/Menu/MarlinMode.c
+++ b/TFT/src/User/Menu/MarlinMode.c
@@ -20,28 +20,30 @@ void menuMarlinMode(void)
   GUI_Clear(infoSettings.marlin_mode_bg_color);
   GUI_SetColor(infoSettings.marlin_mode_font_color);
   GUI_SetBkColor(infoSettings.marlin_mode_bg_color);
-  if(infoSettings.marlin_mode_showtitle == 1){
+  if (infoSettings.marlin_mode_showtitle == 1)
+  {
     STRINGS_STORE tempST;
     W25Qxx_ReadBuffer((uint8_t *)&tempST,STRINGS_STORE_ADDR,sizeof(STRINGS_STORE));
     GUI_DispStringInRect(0, 0, LCD_WIDTH, ST7920_GYSTART_FULLSCREEN, (uint8_t *)tempST.marlin_title);
   }
 
-#if defined(ST7920_SPI)
-  if (infoSettings.marlin_type == LCD12864) {
-    marlinInit = SPI_Slave;
-    marlinDeInit = SPI_SlaveDeInit;
-    marlinGetData = SPI_SlaveGetData;
-    marlinParse = ST7920_ParseRecv;
-  }
-#endif
-#if defined(LCD2004_simulator)
-  if (infoSettings.marlin_type == LCD2004) {
-    marlinInit = HD44780_Config;
-    marlinDeInit = HD44780_DeConfig;
-    marlinGetData = HD44780_getData;
-    marlinParse = HD44780_ParseRecv;
-  }
-#endif
+  #if defined(ST7920_SPI)
+    if (infoSettings.marlin_type == LCD12864) {
+      marlinInit = SPI_Slave;
+      marlinDeInit = SPI_SlaveDeInit;
+      marlinGetData = SPI_SlaveGetData;
+      marlinParse = ST7920_ParseRecv;
+    }
+  #endif
+
+  #if defined(LCD2004_simulator)
+    if (infoSettings.marlin_type == LCD2004) {
+      marlinInit = HD44780_Config;
+      marlinDeInit = HD44780_DeConfig;
+      marlinGetData = HD44780_getData;
+      marlinParse = HD44780_ParseRecv;
+    }
+  #endif
 
   CIRCULAR_QUEUE marlinQueue;
   uint8_t data;
@@ -54,12 +56,16 @@ void menuMarlinMode(void)
     {
       marlinParse(data);
     }
+
     #if LCD_ENCODER_SUPPORT
       sendEncoder(LCD_ReadTouch());
 
-      if(LCD_BtnTouch(LCD_BUTTON_INTERVALS))
+      if (LCD_BtnTouch(LCD_BUTTON_INTERVALS))
+      {
         sendEncoder(1);
+      }
     #endif
+
     loopCheckMode();
 
     #ifdef LCD_LED_PWM_CHANNEL
diff --git a/TFT/src/User/Menu/MarlinMode.h b/TFT/src/User/Menu/MarlinMode.h
index a3e840b3d8..35a02255eb 100644
--- a/TFT/src/User/Menu/MarlinMode.h
+++ b/TFT/src/User/Menu/MarlinMode.h
@@ -1,5 +1,4 @@
-#ifndef _MARLIN_MODE_H_
-#define _MARLIN_MODE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,5 +21,3 @@ void menuMarlinMode(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/MeshEditor.c b/TFT/src/User/Menu/MeshEditor.c
index 5166585c34..559a7d9f60 100644
--- a/TFT/src/User/Menu/MeshEditor.c
+++ b/TFT/src/User/Menu/MeshEditor.c
@@ -202,7 +202,9 @@ const GUI_RECT meshAreaRect[ME_AREA_NUM] = {
 void meshInitData(void)
 {
   if (meshData == NULL)
+  {
     return;
+  }
 
   meshData->dataSize = 0;
   meshData->colsNum = 0;
@@ -240,7 +242,9 @@ void meshInitData(void)
 void meshAllocData(void)
 {
   if (meshData != NULL)                                    // if data already exist (e.g. when the menu is reloaded), continue to use the existing data
+  {
     return;
+  }
 
   meshData = (MESH_DATA *) malloc(sizeof(MESH_DATA));
 
@@ -252,7 +256,9 @@ void meshAllocData(void)
 void meshDeallocData(void)
 {
   if (meshData == NULL)
+  {
     return;
+  }
 
   free(meshData);
 
@@ -311,7 +317,9 @@ bool processKnownDataFormat(char *dataRow)
 void meshSaveCallback(void)
 {
   if (meshSaveCallbackPtr != NULL)
+  {
     meshSaveCallbackPtr();
+  }
 
   meshDeallocData();                                       // deallocate mesh data. It forces data reloading during Mesh Editor menu reloading
 }
@@ -319,7 +327,9 @@ void meshSaveCallback(void)
 bool meshGetStatus(void)
 {
   if (meshData->status != ME_DATA_FULL)
+  {
     return false;
+  }
 
   return true;
 }
@@ -327,7 +337,9 @@ bool meshGetStatus(void)
 uint16_t meshGetSize(void)
 {
   if (!meshGetStatus())
+  {
     return 0;
+  }
 
   return meshData->dataSize;
 }
@@ -335,7 +347,9 @@ uint16_t meshGetSize(void)
 uint16_t meshGetColsNum(void)
 {
   if (!meshGetStatus())
+  {
     return 0;
+  }
 
   return meshData->colsNum;
 }
@@ -343,7 +357,9 @@ uint16_t meshGetColsNum(void)
 uint16_t meshGetRowsNum(void)
 {
   if (!meshGetStatus())
+  {
     return 0;
+  }
 
   return meshData->rowsNum;
 }
@@ -411,9 +427,13 @@ uint16_t meshGetJ()
 uint16_t meshGetValueRow(uint16_t index)
 {
   if (meshData->rowsInverted)
+  {
     return (meshData->rowsNum - 1) - (index / meshData->colsNum);
+  }
   else
+  {
     return (index / meshData->colsNum);
+  }
 }
 
 float meshGetValueOrig(uint16_t index)
@@ -470,7 +490,9 @@ bool meshUpdateValueMinMax(float value)
   }
 
   if (isValueChanged)
+  {
     meshData->valueDelta = meshData->valueMax - meshData->valueMin;
+  }
 
   return isValueChanged;
 }
@@ -478,7 +500,9 @@ bool meshUpdateValueMinMax(float value)
 void meshFullUpdateValueMinMax(void)
 {
   if (!meshGetStatus())
+  {
     return;
+  }
 
   meshData->initValueMinMax = true;
 
@@ -491,7 +515,9 @@ void meshFullUpdateValueMinMax(void)
 uint16_t meshGetRGBColor(float value)
 {
   if (meshData->valueDelta == 0)
+  {
     return (meshData->rStart << 11) | (meshData->gStart << 5) | (meshData->bStart);
+  }
 
   float valueDiff;
   uint16_t r, g, b;
@@ -515,13 +541,19 @@ void meshDrawGridCell(uint16_t index, uint16_t edgeDistance, bool clearBgColor)
   uint16_t radius = cellWidth / MESH_POINT_MAX_RATIO;
 
   if (index == meshGetIndex())
+  {
     radius = MIN(cellWidth, cellHeight) / MESH_POINT_MIN_RATIO;
+  }
   else if (value == meshGetValueMin() || value == meshGetValueMax())
+  {
     radius = MIN(cellWidth, cellHeight) / MESH_POINT_MED_RATIO;
+  }
 
   if (clearBgColor)
+  {
     GUI_ClearRect(meshGridRect.x0 + col * cellWidth + 1, meshGridRect.y0 + row * cellHeight + 1,
                   meshGridRect.x0 + (col + 1) * cellWidth - 1, meshGridRect.y0 + (row + 1) * cellHeight - 1);
+  }
 
   GUI_SetColor(infoSettings.list_border_color);
 
@@ -568,7 +600,9 @@ void meshDrawInfoCell(const GUI_RECT *rect, float *val, bool largeFont, uint16_t
     sprintf(tempstr, "%.3f", *val);
 
     if (largeFont)
+    {
       setLargeFont(true);
+    }
 
     GUI_SetColor(color);
     GUI_DispStringInPrect(rect, (u8 *) tempstr);
@@ -583,10 +617,14 @@ void meshDrawInfoCell(const GUI_RECT *rect, float *val, bool largeFont, uint16_t
 void meshDrawInfo(float *minVal, float *maxVal, float *origVal, float *curVal)
 {
   if (minVal != NULL)
+  {
     meshDrawInfoCell(&meshInfoRect[ME_INFO_MIN], minVal, false, meshGetRGBColor(*minVal), infoSettings.bg_color, 1, false);
+  }
 
   if (maxVal != NULL)
+  {
     meshDrawInfoCell(&meshInfoRect[ME_INFO_MAX], maxVal, false, meshGetRGBColor(*maxVal), infoSettings.bg_color, 1, false);
+  }
 
   meshDrawInfoCell(&meshInfoRect[ME_INFO_ORIG], origVal, false, infoSettings.font_color, infoSettings.bg_color, 1, false);
   meshDrawInfoCell(&meshInfoRect[ME_INFO_CUR], curVal, true, VALUE_FONT_COLOR, VALUE_BG_COLOR, 2, false);
@@ -616,16 +654,24 @@ void meshKeyPress(u8 index, u8 isPressed)
   if (isPressed)
   {
     if (index != ME_KEY_EDIT)
+    {
       GUI_SetColor(infoSettings.list_border_color);
+    }
     else
+    {
       GUI_SetColor(VALUE_FONT_COLOR);
+    }
   }
   else
   {
     if (index != ME_KEY_EDIT)
+    {
       GUI_SetColor(infoSettings.bg_color);
+    }
     else
+    {
       GUI_SetColor(VALUE_BG_COLOR);
+    }
   }
 
   GUI_DrawRect(meshKeyRect[index].x0 + 2, meshKeyRect[index].y0 + 2, meshKeyRect[index].x1 - 2, meshKeyRect[index].y1 - 2);
@@ -645,11 +691,15 @@ void meshDrawKeyboard(void)
   for (uint8_t i = 0; i < ME_KEY_NUM; i++)
   {
     if (!(i == ME_KEY_SAVE || i == ME_KEY_OK || i == ME_KEY_RESET || i == ME_KEY_HOME))            // if not a unicode string
+    {
       GUI_DispStringInPrect(&meshKeyRect[i], (u8 *) meshKeyString[i]);
+    }
   }
 
   if (infoMachineSettings.EEPROM == 1)
+  {
     DrawCharIcon(&meshKeyRect[ME_KEY_SAVE], MIDDLE, ICONCHAR_SAVE, false, 0);
+  }
   DrawCharIcon(&meshKeyRect[ME_KEY_OK], MIDDLE, ICONCHAR_OK, false, 0);
   DrawCharIcon(&meshKeyRect[ME_KEY_RESET], MIDDLE, ICONCHAR_RESET, false, 0);
   DrawCharIcon(&meshKeyRect[ME_KEY_HOME], MIDDLE, ICONCHAR_MOVE, false, 0);
@@ -703,7 +753,9 @@ void meshSave(bool saveOnChange)
 {
   if (!meshGetStatus() ||
     (saveOnChange && !memcmp(&meshData->data, &meshData->dataOrig, sizeof(meshData->dataOrig))))   // if no changes, nothing to do
+  {
     return;
+  }
 
   if (infoMachineSettings.EEPROM == 1)
   {
@@ -714,9 +766,10 @@ void meshSave(bool saveOnChange)
 
 bool meshIsWaitingFirstData(void)
 {
-  if (meshData == NULL ||
-    meshData->status != ME_DATA_IDLE)                      // if mesh editor is not running or is already handling data
+  if (meshData == NULL || meshData->status != ME_DATA_IDLE) // if mesh editor is not running or is already handling data
+  {
     return false;
+  }
 
   return true;
 }
@@ -727,7 +780,9 @@ bool meshIsWaitingData(void)
     meshData->status == ME_DATA_IDLE ||
     meshData->status == ME_DATA_FULL ||
     meshData->status == ME_DATA_FAILED)                    // if mesh editor is not running or is not waiting for data
+  {
     return false;
+  }
 
   return true;
 }
@@ -735,7 +790,9 @@ bool meshIsWaitingData(void)
 uint16_t meshParseDataRow(char *dataRow, float *dataGrid, uint16_t maxCount)
 {
   if (meshData->parsedRows < meshData->rowsToSkip)
+  {
     return 0;
+  }
 
   uint16_t curCount;
   uint16_t validCount;
@@ -776,12 +833,18 @@ void meshUpdateData(char *dataRow)
   if (meshIsWaitingFirstData())                            // if waiting for first data
   {
     if (processKnownDataFormat(dataRow))                   // if known data format, change state to EMPTY and proceed with data handling
+    {
       meshData->status = ME_DATA_EMPTY;
+    }
     else
+    {
       failed = true;
+    }
   }
   else if (!meshIsWaitingData())                           // if not waiting for data, nothing to do
+  {
     return;
+  }
 
   if (!failed)
   {
@@ -823,7 +886,9 @@ void meshUpdateData(char *dataRow)
         memcpy(&meshData->data, &meshData->dataOrig, sizeof(meshData->dataOrig));
       }
       else                                                 // if mesh grid is smaller than a 1x1 matrix, data grid is marked as failed
+      {
         failed = true;
+      }
     }
   }
 
diff --git a/TFT/src/User/Menu/MeshEditor.h b/TFT/src/User/Menu/MeshEditor.h
index ae2f4029d1..d685076c2a 100644
--- a/TFT/src/User/Menu/MeshEditor.h
+++ b/TFT/src/User/Menu/MeshEditor.h
@@ -1,5 +1,4 @@
-#ifndef _MESH_EDITOR_H_
-#define _MESH_EDITOR_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,5 +16,3 @@ void menuMeshEditor(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/MeshTuner.h b/TFT/src/User/Menu/MeshTuner.h
index 422d71210f..d97934aceb 100644
--- a/TFT/src/User/Menu/MeshTuner.h
+++ b/TFT/src/User/Menu/MeshTuner.h
@@ -1,5 +1,4 @@
-#ifndef _MESH_TUNER_H_
-#define _MESH_TUNER_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,5 +11,3 @@ float menuMeshTuner(uint16_t col, uint16_t row, float value);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Mode.c b/TFT/src/User/Menu/Mode.c
index 304430d16e..d269eaad68 100644
--- a/TFT/src/User/Menu/Mode.c
+++ b/TFT/src/User/Menu/Mode.c
@@ -7,6 +7,7 @@ bool freshboot = true;
 void Serial_ReSourceDeInit(void)
 {
   if (!serialHasBeenInitialized) return;
+
   serialHasBeenInitialized = false;
   Serial_DeInit();
 }
@@ -14,6 +15,7 @@ void Serial_ReSourceDeInit(void)
 void Serial_ReSourceInit(void)
 {
   if (serialHasBeenInitialized) return;
+
   serialHasBeenInitialized = true;
 
   memset(&infoHost, 0, sizeof(infoHost));
@@ -44,10 +46,14 @@ void infoMenuSelect(void)
         setEncActiveSignal(0);
       #endif
       GUI_RestoreColorDefault();
-      if(infoSettings.unified_menu == 1) //if Unified menu is selected
+      if (infoSettings.unified_menu == 1) //if Unified menu is selected
+      {
         infoMenu.menu[infoMenu.cur] = menuStatus; //status screen as default screen on boot
+      }
       else
+      {
         infoMenu.menu[infoMenu.cur] = classicMenu;   // classic UI
+      }
 
       #ifdef SHOW_BTT_BOOTSCREEN
         if (freshboot)
diff --git a/TFT/src/User/Menu/Mode.h b/TFT/src/User/Menu/Mode.h
index b9995cf007..264e12c3e8 100644
--- a/TFT/src/User/Menu/Mode.h
+++ b/TFT/src/User/Menu/Mode.h
@@ -1,5 +1,4 @@
-#ifndef _MODE_H_
-#define _MODE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,5 +12,3 @@ void Serial_ReSourceInit(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/More.c b/TFT/src/User/Menu/More.c
index 05b5164363..bb573fa70a 100644
--- a/TFT/src/User/Menu/More.c
+++ b/TFT/src/User/Menu/More.c
@@ -3,8 +3,10 @@
 
 void isPauseConfirm(void)
 {
-  if(setPrintPause(true,false))
+  if (setPrintPause(true,false))
+  {
     infoMenu.menu[infoMenu.cur] = menuExtrude;
+  }
 }
 
 void menuMore(void)
diff --git a/TFT/src/User/Menu/More.h b/TFT/src/User/Menu/More.h
index 8d9190495f..b6c787a270 100644
--- a/TFT/src/User/Menu/More.h
+++ b/TFT/src/User/Menu/More.h
@@ -1,5 +1,4 @@
-#ifndef _MORE_H_
-#define _MORE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuMore(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Move.c b/TFT/src/User/Menu/Move.c
index 730d24ac30..bbae426049 100644
--- a/TFT/src/User/Menu/Move.c
+++ b/TFT/src/User/Menu/Move.c
@@ -94,19 +94,30 @@ void menuMove(void)
     {{0, 4}, {1, 5}, {2, 6}}
   #endif
     ;
-  if(infoSettings.invert_axis[X_AXIS] != 1){
+  if (infoSettings.invert_axis[X_AXIS] != 1)
+  {
     LOAD_XYZ_LABEL_INDEX(table[X_AXIS][0], INC, table[X_AXIS][1], DEC, X); // table[0] <--> INC(+) table[1] <--> DEC(+) if not inverted
-  } else {
+  }
+  else
+  {
     LOAD_XYZ_LABEL_INDEX(table[X_AXIS][0], DEC, table[X_AXIS][1], INC, X); // table[0] <--> DEC(-) table[1] <--> INC(-) if inverted
   }
-  if(infoSettings.invert_axis[Y_AXIS] != 1){
+
+  if (infoSettings.invert_axis[Y_AXIS] != 1)
+  {
     LOAD_XYZ_LABEL_INDEX(table[Y_AXIS][0], INC, table[Y_AXIS][1], DEC, Y);
-  } else {
+  }
+  else
+  {
     LOAD_XYZ_LABEL_INDEX(table[Y_AXIS][0], DEC, table[Y_AXIS][1], INC, Y);
   }
-  if(infoSettings.invert_axis[Z_AXIS] != 1){
+
+  if (infoSettings.invert_axis[Z_AXIS] != 1)
+  {
     LOAD_XYZ_LABEL_INDEX(table[Z_AXIS][0], INC, table[Z_AXIS][1], DEC, Z);
-  } else {
+  }
+  else
+  {
     LOAD_XYZ_LABEL_INDEX(table[Z_AXIS][0], DEC, table[Z_AXIS][1], INC, Z);
   }
 
@@ -160,7 +171,7 @@ void menuMove(void)
       #endif
         default:
           #if LCD_ENCODER_SUPPORT
-            if(encoderPosition)
+            if (encoderPosition)
             {
               storeMoveCmd(nowAxis, encoderPosition > 0 ? 1 : -1);
               encoderPosition = 0;
@@ -184,7 +195,8 @@ void update_gantry(void)
   }
 }
 
-void drawXYZ(void){
+void drawXYZ(void)
+{
   char tempstr[20];
   if (nowAxis == X_AXIS) GUI_SetColor(INFOBOX_ICON_COLOR);
   sprintf(tempstr, "X:%.2f  ", coordinateGetAxisActual(X_AXIS));
diff --git a/TFT/src/User/Menu/Move.h b/TFT/src/User/Menu/Move.h
index 207516e93b..abddcdf7c5 100644
--- a/TFT/src/User/Menu/Move.h
+++ b/TFT/src/User/Menu/Move.h
@@ -1,5 +1,4 @@
-#ifndef _MOVE_H_
-#define _MOVE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,5 +11,3 @@ void update_gantry(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/NotificationMenu.h b/TFT/src/User/Menu/NotificationMenu.h
index 002d5f2c03..4c15022d08 100644
--- a/TFT/src/User/Menu/NotificationMenu.h
+++ b/TFT/src/User/Menu/NotificationMenu.h
@@ -1,5 +1,4 @@
-#ifndef _NOTIFICAITONMENU_H_
-#define _NOTIFICAITONMENU_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,5 +11,3 @@ void menuNotification(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Parametersetting.c b/TFT/src/User/Menu/Parametersetting.c
index e69ec3cca2..2284e41ebb 100644
--- a/TFT/src/User/Menu/Parametersetting.c
+++ b/TFT/src/User/Menu/Parametersetting.c
@@ -48,7 +48,8 @@ LABEL_PARAMETER_SETTING,
 };
 
 //show menu for selected parameter type
-void menuShowParameter(void){
+void menuShowParameter(void)
+{
   KEY_VALUES key_num = KEY_IDLE;
   PARAMETERS now = infoParameters;
   float oldval[LISTITEM_PER_PAGE];
@@ -140,7 +141,9 @@ void menuShowParameter(void){
       if (key_num < (KEY_VALUES)STEPPER_COUNT)
       {
         if (parameter_menuitems.items[key_num].icon == ICONCHAR_BACKGROUND)
+        {
           break;
+        }
 
         VAL_TYPE v_type = getParameterValType(cur_parameter, key_num);
         //accept negative values only for probe offset
@@ -149,9 +152,13 @@ void menuShowParameter(void){
         float v = getParameter(cur_parameter, key_num);
 
         if (v_type == VAL_TYPE_FLOAT || v_type == VAL_TYPE_NEG_FLOAT)
+        {
           v = numPadFloat(NULL, v, v, negative_val); // parameter is a decimal number
+        }
         else
+        {
           v = (float)numPadInt(NULL, v, v, negative_val); // parameter is an integer
+        }
 
         if (v != getParameter(cur_parameter, key_num))
         {
@@ -178,23 +185,29 @@ void menuShowParameter(void){
 }
 
 //Load main parameter list page
-void loadParameterPage(void){
-for (uint8_t i = 0; i < LISTITEM_PER_PAGE; i++)
+void loadParameterPage(void)
+{
+  for (uint8_t i = 0; i < LISTITEM_PER_PAGE; i++)
   {
     uint8_t item_index = ps_cur_page * LISTITEM_PER_PAGE + i;
     if (item_index < P_ITEMSCOUNT)
     {
       if (infoMachineSettings.EEPROM != 1 && (item_index == P_RESET_SETTINGS || item_index == P_RESTORE_SETTINGS || item_index == P_SAVE_SETTINGS))
+      {
         parameterMainItems.items[i].icon = ICONCHAR_BACKGROUND;
+      }
       else
+      {
         parameterMainItems.items[i] = parametertypes[item_index];
+      }
     }
     else
     {
       parameterMainItems.items[i].icon = ICONCHAR_BACKGROUND;
     }
   }
-// set page up down button according to page count and current page
+
+  // set page up down button according to page count and current page
   if (P_ITEMSCOUNT <= LISTITEM_PER_PAGE)
   {
     parameterMainItems.items[5].icon = ICONCHAR_BACKGROUND;
@@ -202,11 +215,13 @@ for (uint8_t i = 0; i < LISTITEM_PER_PAGE; i++)
   }
   else
   {
-    if(ps_cur_page == 0){
+    if (ps_cur_page == 0)
+    {
       parameterMainItems.items[5].icon = ICONCHAR_BACKGROUND;
       parameterMainItems.items[6].icon = ICONCHAR_PAGEDOWN;
     }
-    else if(ps_cur_page == (total_pages-1)){
+    else if (ps_cur_page == (total_pages-1))
+    {
       parameterMainItems.items[5].icon = ICONCHAR_PAGEUP;
       parameterMainItems.items[6].icon = ICONCHAR_BACKGROUND;
     }
@@ -218,13 +233,18 @@ for (uint8_t i = 0; i < LISTITEM_PER_PAGE; i++)
   }
 }
 
-void menuParameterSettings(void){
+void menuParameterSettings(void)
+{
   KEY_VALUES key_num = KEY_IDLE;
 
   if (infoMachineSettings.EEPROM != 1)
+  {
     total_pages = (P_SAVE_SETTINGS+LISTITEM_PER_PAGE-1)/LISTITEM_PER_PAGE;
+  }
   else
+  {
     total_pages = (P_ITEMSCOUNT+LISTITEM_PER_PAGE-1)/LISTITEM_PER_PAGE;
+  }
 
   loadParameterPage();
   menuDrawListPage(&parameterMainItems);
@@ -234,7 +254,7 @@ void menuParameterSettings(void){
     switch (key_num)
     {
     case KEY_ICON_5:
-      if(total_pages > 1)
+      if (total_pages > 1)
       {
         if (ps_cur_page > 0)
         {
@@ -246,7 +266,7 @@ void menuParameterSettings(void){
       break;
 
     case KEY_ICON_6:
-      if(total_pages > 1)
+      if (total_pages > 1)
       {
         if (ps_cur_page < total_pages - 1)
         {
@@ -330,7 +350,7 @@ bool temperatureStatusValid(void)
 
 void loopTemperatureStatus(void)
 {
-  if(getMenuType() == MENU_TYPE_FULLSCREEN) return;
+  if (getMenuType() == MENU_TYPE_FULLSCREEN) return;
   if (!temperatureStatusValid()) return;
 
   uint8_t tmpHeater[3]; // chamber, bed, hotend
@@ -360,30 +380,34 @@ void loopTemperatureStatus(void)
   if (update) menuReDrawCurTitle();
 }
 
-int16_t drawTemperatureStatus(void){
-
+int16_t drawTemperatureStatus(void)
+{
   int16_t x_offset = LCD_WIDTH - 10;
   if (!temperatureStatusValid()) return x_offset;
 
   uint8_t tmpHeater[3]; // chamber, bed, hotend
   uint16_t tmpIcon[3];
   uint8_t tmpIndex = 0;
-  if (infoSettings.hotend_count) { // global hotend
+  if (infoSettings.hotend_count) // global hotend
+  {
     tmpIcon[tmpIndex] = ICON_GLOBAL_NOZZLE;
     tmpHeater[tmpIndex++] = heatGetCurrentHotend();
   }
-  if (infoSettings.bed_en) { // global bed
+  if (infoSettings.bed_en) // global bed
+  {
     tmpIcon[tmpIndex] = ICON_GLOBAL_BED;
     tmpHeater[tmpIndex++] = BED;
   }
-  if (infoSettings.chamber_en) { // global chamber
+  if (infoSettings.chamber_en) // global chamber
+  {
     tmpIcon[tmpIndex] = ICON_GLOBAL_CHAMBER;
     tmpHeater[tmpIndex++] = CHAMBER;
   }
 
   uint16_t start_y = (TITLE_END_Y - BYTE_HEIGHT) / 2;
   GUI_SetBkColor(infoSettings.title_bg_color);
-  for(int8_t i = tmpIndex - 1; i >= 0; i--) {
+  for(int8_t i = tmpIndex - 1; i >= 0; i--)
+  {
     char tempstr[10];
     x_offset -= GLOBALICON_INTERVAL;
     GUI_ClearRect(x_offset, start_y, x_offset + GLOBALICON_INTERVAL, start_y + GLOBALICON_HEIGHT);
@@ -398,6 +422,7 @@ int16_t drawTemperatureStatus(void){
     x_offset -= GLOBALICON_WIDTH;
     ICON_ReadDisplay(x_offset, start_y, tmpIcon[i]); // icon
   }
+
   GUI_SetBkColor(infoSettings.bg_color);
   return x_offset;
 }
diff --git a/TFT/src/User/Menu/Parametersetting.h b/TFT/src/User/Menu/Parametersetting.h
index 715226c14c..12b37ed0c9 100644
--- a/TFT/src/User/Menu/Parametersetting.h
+++ b/TFT/src/User/Menu/Parametersetting.h
@@ -1,5 +1,4 @@
-#ifndef _PARAMETERSETTING_H_
-#define _PARAMETERSETTING_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -21,5 +20,3 @@ int16_t drawTemperatureStatus(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Pid.c b/TFT/src/User/Menu/Pid.c
index 9ad35ba4bb..82f530d85c 100644
--- a/TFT/src/User/Menu/Pid.c
+++ b/TFT/src/User/Menu/Pid.c
@@ -20,38 +20,46 @@ bool pidInitialized = false;
 void pidUpdateStatus(bool succeeded)
 {
   if (pidCounter > 0)
+  {
     pidCounter--;
+  }
 
   if (!succeeded)                                          // if one PID process fails, the overall PID process must be marked as failed so no save to EEPROM will be allowed
+  {
     pidSucceeded = false;
+  }
 
   if (pidCounter > 0)                                      // if all the PID processes were still not terminated, simply provide a notification
   {
-#ifdef ENABLE_PID_STATUS_UPDATE_NOTIFICATION
-    labelChar(tempMsg, LABEL_PID_TITLE);
+    #ifdef ENABLE_PID_STATUS_UPDATE_NOTIFICATION
+      labelChar(tempMsg, LABEL_PID_TITLE);
 
-    if (succeeded)
-    {
-      sprintf(&tempMsg[strlen(tempMsg)], " %s", textSelect(LABEL_PROCESS_COMPLETED));
+      if (succeeded)
+      {
+        sprintf(&tempMsg[strlen(tempMsg)], " %s", textSelect(LABEL_PROCESS_COMPLETED));
 
-      BUZZER_PLAY(sound_notify);
+        BUZZER_PLAY(sound_notify);
 
-      addToast(DIALOG_TYPE_INFO, tempMsg);
-    }
-    else
-    {
-      sprintf(&tempMsg[strlen(tempMsg)], " %s", textSelect(LABEL_PROCESS_ABORTED));
+        addToast(DIALOG_TYPE_INFO, tempMsg);
+      }
+      else
+      {
+        sprintf(&tempMsg[strlen(tempMsg)], " %s", textSelect(LABEL_PROCESS_ABORTED));
 
-      BUZZER_PLAY(sound_error);
+        BUZZER_PLAY(sound_error);
 
-      addToast(DIALOG_TYPE_ERROR, tempMsg);
-    }
-#endif
+        addToast(DIALOG_TYPE_ERROR, tempMsg);
+      }
+    #endif
   }
   else                                                     // if all the PID processes terminated, provide the final dialog
   {
     pidRunning = false;
-
+    #ifdef LED_COLOR_PIN
+      #ifdef LCD_LED_PWM_CHANNEL
+        WS2812_Send_DAT(LED_GREEN);                        // Set encoder LED to GREEN
+      #endif
+    #endif
     if (pidSucceeded)                                      // if all the PID processes successfully terminated, allow to save to EEPROM
     {
       BUZZER_PLAY(sound_success);
@@ -108,7 +116,9 @@ void pidUpdateCounter(void)
   for (uint8_t i = 0; i < MAX_HEATER_COUNT; i++)           // hotends + bed + chamber
   {
     if (pidHeater.T[i].target > 0)
+    {
       pidCounter++;
+    }
   }
 }
 
@@ -142,7 +152,9 @@ void menuPidWait(void)
     if (!isPressed)                                        // if touch screen is not yet pressed
     {
       if (isPress())                                       // if touch screen is now pressed
+      {
         isPressed = true;
+      }
     }
     else if (!isPress())                                   // if touch screen is now released
     {
@@ -150,7 +162,9 @@ void menuPidWait(void)
     }
 
     if (isReleased)
+    {
       infoMenu.cur--;
+    }
 
     pidCheckTimeout();
 
@@ -166,7 +180,14 @@ void pidStart(void)
   pidUpdateCounter();                                                          // update the number of set temperatures (number of PID processes to execute)
   pidTimeout = OS_GetTimeMs() + PID_PROCESS_TIMEOUT;                           // set timeout for overall PID process
 
-  mustStoreCmd("M150 R255 U0 B0\n");                                           // set LED light to RED
+  mustStoreCmd("M150 R255 U0 B0 P255\n");                                      // set neopixel LED light to RED
+
+  #ifdef LED_COLOR_PIN
+    #ifdef LCD_LED_PWM_CHANNEL
+      WS2812_Send_DAT(LED_RED);                                                // Set encoder LED to RED
+    #endif
+  #endif
+
   mustStoreCmd("M106 S255\n");                                                 // set fan speed to max
   mustStoreCmd("G4 S1\n");                                                     // wait 1 sec
 
@@ -180,7 +201,7 @@ void pidStart(void)
   }
 
   mustStoreCmd("M107\n");                                                      // stop fan
-  mustStoreCmd("M150 R0 U255 B0\n");                                           // set LED light to GREEN
+  mustStoreCmd("M150 R0 U255 B0 P255\n");                                      // set LED light to GREEN
 
   infoMenu.menu[++infoMenu.cur] = menuPidWait;
 }
@@ -207,6 +228,7 @@ void pidTemperatureReDraw(bool skip_header)
 
 void menuPid(void)
 {
+  wakeLCD(); //Wakeup screen (restore RGB knob to it's normal color)
   const ITEM itemPidTool[] = {
     // icon                         label
     {ICON_NOZZLE,                   LABEL_NOZZLE},
@@ -271,12 +293,16 @@ void menuPid(void)
     switch (key_num)
     {
       case KEY_ICON_0:
+      {
         if (pidHeater.T[pidHeater.toolIndex].target > 0)
-          pidHeater.T[pidHeater.toolIndex].target =
-            NOBEYOND(0, pidHeater.T[pidHeater.toolIndex].target - pidDegree[curDegree], infoSettings.max_temp[pidHeater.toolIndex]);
+        {
+          pidHeater.T[pidHeater.toolIndex].target = NOBEYOND(0,
+                                                             pidHeater.T[pidHeater.toolIndex].target - pidDegree[curDegree],
+                                                             infoSettings.max_temp[pidHeater.toolIndex]);
+        }
 
         pidTemperatureReDraw(true);
-        break;
+      }break;
 
       case KEY_INFOBOX:
       {
@@ -297,14 +323,19 @@ void menuPid(void)
       }
       break;
       case KEY_ICON_3:
+      {
         if (pidHeater.T[pidHeater.toolIndex].target < infoSettings.max_temp[pidHeater.toolIndex])
-          pidHeater.T[pidHeater.toolIndex].target =
-            NOBEYOND(0, pidHeater.T[pidHeater.toolIndex].target + pidDegree[curDegree], infoSettings.max_temp[pidHeater.toolIndex]);
+        {
+          pidHeater.T[pidHeater.toolIndex].target = NOBEYOND(0,
+                                                             pidHeater.T[pidHeater.toolIndex].target + pidDegree[curDegree],
+                                                             infoSettings.max_temp[pidHeater.toolIndex]);
+        }
 
         pidTemperatureReDraw(true);
-        break;
+      }break;
 
       case KEY_ICON_4:
+      {
         do
         {
           pidHeater.toolIndex = (pidHeater.toolIndex + 1) % MAX_HEATER_COUNT;
@@ -315,17 +346,19 @@ void menuPid(void)
 
         menuDrawItem(&pidItems.items[key_num], key_num);
         pidTemperatureReDraw(false);
-        break;
+      }break;
 
       case KEY_ICON_5:
+      {
         curDegree = (curDegree + 1) % ITEM_PID_DEGREE_NUM;
 
         pidItems.items[key_num] = itemPidDegree[curDegree];
 
         menuDrawItem(&pidItems.items[key_num], key_num);
-        break;
+      }break;
 
       case KEY_ICON_6:
+      {
         if (pidRunning)
         {
           addToast(DIALOG_TYPE_ERROR, (char *) textSelect(LABEL_PROCESS_RUNNING));
@@ -344,31 +377,42 @@ void menuPid(void)
             showDialog(DIALOG_TYPE_QUESTION, pidStart, NULL, NULL);
           }
         }
-        break;
+      }break;
 
       case KEY_ICON_7:
         infoMenu.cur--;
         break;
 
       default:
+      {
         #if LCD_ENCODER_SUPPORT
           if (encoderPosition)
           {
             if (encoderPosition > 0)
+            {
               if (pidHeater.T[pidHeater.toolIndex].target < infoSettings.max_temp[pidHeater.toolIndex])
-                pidHeater.T[pidHeater.toolIndex].target =
-                  NOBEYOND(0, pidHeater.T[pidHeater.toolIndex].target + pidDegree[curDegree], infoSettings.max_temp[pidHeater.toolIndex]);
+              {
+                pidHeater.T[pidHeater.toolIndex].target = NOBEYOND(0,
+                                                                   pidHeater.T[pidHeater.toolIndex].target + pidDegree[curDegree],
+                                                                   infoSettings.max_temp[pidHeater.toolIndex]);
+              }
+            }
 
             if (encoderPosition < 0)
+            {
               if (pidHeater.T[pidHeater.toolIndex].target > 0)
-                pidHeater.T[pidHeater.toolIndex].target =
-                  NOBEYOND(0, pidHeater.T[pidHeater.toolIndex].target - pidDegree[curDegree], infoSettings.max_temp[pidHeater.toolIndex]);
+              {
+                pidHeater.T[pidHeater.toolIndex].target = NOBEYOND(0,
+                                                                   pidHeater.T[pidHeater.toolIndex].target - pidDegree[curDegree],
+                                                                   infoSettings.max_temp[pidHeater.toolIndex]);
+              }
+            }
 
             pidTemperatureReDraw(true);
             encoderPosition = 0;
           }
         #endif
-        break;
+      }break;
     }
 
     pidCheckTimeout();
diff --git a/TFT/src/User/Menu/Pid.h b/TFT/src/User/Menu/Pid.h
index f37742f410..5ca36dc289 100644
--- a/TFT/src/User/Menu/Pid.h
+++ b/TFT/src/User/Menu/Pid.h
@@ -1,5 +1,4 @@
-#ifndef _PID_H_
-#define _PID_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,5 +14,3 @@ void menuPid(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Popup.c b/TFT/src/User/Menu/Popup.c
index d453003a98..07eb4f80bd 100644
--- a/TFT/src/User/Menu/Popup.c
+++ b/TFT/src/User/Menu/Popup.c
@@ -45,14 +45,10 @@ static DIALOG_TYPE popup_type;
 
 void windowReDrawButton(u8 position, u8 pressed)
 {
-  if (position >= buttonNum)
-    return;
-  if (pressed >= 2)
-    return;
-  if (windowButton == NULL)
-    return;
-  if (windowButton->context == NULL)
-    return;
+  if (position >= buttonNum) return;
+  if (pressed >= 2) return;
+  if (windowButton == NULL) return;
+  if (windowButton->context == NULL) return;
 
   GUI_DrawButton(windowButton + position, pressed);
 }
@@ -84,7 +80,9 @@ void popupDrawPage(DIALOG_TYPE type, BUTTON *btn, const uint8_t *title, const ui
     GUI_DrawWindow(&window, title, context, true);
 
     for(u8 i = 0; i < buttonNum; i++)
+    {
       GUI_DrawButton(&windowButton[i], 0);
+    }
   }
   else                                 // draw a window with no buttons bar
   {
@@ -116,7 +114,9 @@ static void menuDialog(void)
     }
 
     if (action_loop != NULL)
+    {
       action_loop();
+    }
 
     loopProcess();
   }
@@ -190,7 +190,9 @@ void _setDialogCancelTextLabel(int16_t index)
 void showDialog(DIALOG_TYPE type, void (*ok_action)(), void (*cancel_action)(), void (*loop_action)())
 {
   if (infoSettings.mode == MARLIN)
+  {
     return;
+  }
 
   popup_redraw = true;
   popup_type = type;
@@ -213,7 +215,9 @@ void showDialog(DIALOG_TYPE type, void (*ok_action)(), void (*cancel_action)(),
 void loopPopup(void)
 {
   if (popup_redraw == false)
+  {
     return;
+  }
 
   popup_redraw = false;
 
diff --git a/TFT/src/User/Menu/Popup.h b/TFT/src/User/Menu/Popup.h
index e65bf37d8f..16a01ec3c9 100644
--- a/TFT/src/User/Menu/Popup.h
+++ b/TFT/src/User/Menu/Popup.h
@@ -1,5 +1,4 @@
-#ifndef _POPUP_H_
-#define _POPUP_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,5 +50,3 @@ void loopPopup(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/PowerFailed.c b/TFT/src/User/Menu/PowerFailed.c
index d94aef7ded..7e61411efc 100644
--- a/TFT/src/User/Menu/PowerFailed.c
+++ b/TFT/src/User/Menu/PowerFailed.c
@@ -69,7 +69,10 @@ void powerFailedCache(u32 offset)
     infoBreakPoint.relative = coorGetRelative();
     infoBreakPoint.relative_e = eGetRelative();
   }
-  else if (infoBreakPoint.pause) return; // paused and the pause state has been saved
+  else if (infoBreakPoint.pause)
+  {
+    return; // paused and the pause state has been saved
+  }
 
   infoBreakPoint.pause = isPause();
 
@@ -80,14 +83,14 @@ void powerFailedCache(u32 offset)
 
 void powerFailedClose(void)
 {
-  if(create_ok==false)   return;
+  if (create_ok==false)   return;
 
   f_close(&fpPowerFailed);
 }
 
 void  powerFailedDelete(void)
 {
-  if(create_ok==false)   return;
+  if (create_ok==false)   return;
 
   f_unlink(powerFailedFileName);
   clearPowerFailed();
@@ -97,9 +100,9 @@ static bool powerFailedExist(void)
 {
   FIL  fp;
   UINT br;
-  if(f_open(&fp, powerFailedFileName, FA_OPEN_EXISTING|FA_READ) != FR_OK) return false;
-  if(f_read(&fp, infoFile.title, MAX_PATH_LEN, &br) != FR_OK)             return false;
-  if(f_close(&fp) != FR_OK)                                               return false;
+  if (f_open(&fp, powerFailedFileName, FA_OPEN_EXISTING|FA_READ) != FR_OK) return false;
+  if (f_read(&fp, infoFile.title, MAX_PATH_LEN, &br) != FR_OK)             return false;
+  if (f_close(&fp) != FR_OK)                                               return false;
 
   create_ok = true;
   return true;
@@ -108,7 +111,7 @@ static bool powerFailedExist(void)
 
 bool powerFailedlSeek(FIL* fp)
 {
-  if(f_lseek(fp,infoBreakPoint.offset) != FR_OK)  return false;
+  if (f_lseek(fp,infoBreakPoint.offset) != FR_OK)  return false;
 
   return true;
 }
@@ -120,34 +123,42 @@ bool powerOffGetData(void)
   UINT    br;
   uint8_t model_icon;
 
-  if(f_open(&fp, powerFailedFileName, FA_OPEN_EXISTING|FA_READ) != FR_OK) return false;
-  if(f_lseek(&fp, MAX_PATH_LEN)                                 != FR_OK) return false;
-  if(f_read(&fp, &model_icon, 1, &br) != FR_OK)                           return false;
-  if(f_read(&fp, &infoBreakPoint,  sizeof(infoBreakPoint), &br) != FR_OK) return false;
+  if (f_open(&fp, powerFailedFileName, FA_OPEN_EXISTING|FA_READ) != FR_OK) return false;
+  if (f_lseek(&fp, MAX_PATH_LEN)                                 != FR_OK) return false;
+  if (f_read(&fp, &model_icon, 1, &br) != FR_OK)                           return false;
+  if (f_read(&fp, &infoBreakPoint,  sizeof(infoBreakPoint), &br) != FR_OK) return false;
 
   setPrintModelIcon(model_icon);
   for(int8_t i = MAX_HEATER_COUNT - 1; i >= 0; i--)
   {
-    if(infoBreakPoint.target[i] != 0)
+    if (infoBreakPoint.target[i] != 0)
+    {
       mustStoreCacheCmd("%s S%d\n", heatWaitCmd[i], infoBreakPoint.target[i]);
+    }
   }
 
   for(uint8_t i = 0; i < infoSettings.fan_count; i++)
   {
-    if(infoBreakPoint.fan[i] != 0 && fanIsType(i,FAN_TYPE_F))
+    if (infoBreakPoint.fan[i] != 0 && fanIsType(i,FAN_TYPE_F))
     {
       mustStoreCacheCmd("%s S%d\n", fanCmd[i], infoBreakPoint.fan[i]);
     }
   }
 
   mustStoreCacheCmd("%s\n", tool_change[infoBreakPoint.tool]);
-  if(infoBreakPoint.feedrate != 0)
+  if (infoBreakPoint.feedrate != 0)
   {
     uint16_t z_raised = 0;
-    if(infoSettings.btt_ups == 1)
+    if (infoSettings.btt_ups == 1)
+    {
         z_raised += infoSettings.powerloss_z_raise;
-    if(infoBreakPoint.pause)
+    }
+
+    if (infoBreakPoint.pause)
+    {
         z_raised += infoSettings.pause_z_raise;
+    }
+
     mustStoreCacheCmd("G92 Z%.3f\n", infoBreakPoint.axis[Z_AXIS] + z_raised);
     mustStoreCacheCmd("G1 Z%.3f\n", infoBreakPoint.axis[Z_AXIS] + infoSettings.powerloss_z_raise);
     if (infoSettings.powerloss_home)
@@ -171,11 +182,11 @@ bool powerOffGetData(void)
     mustStoreCacheCmd("G92 E%.5f\n",infoBreakPoint.axis[E_AXIS]);
     mustStoreCacheCmd("G1 F%d\n",infoBreakPoint.feedrate);
 
-    if(infoBreakPoint.relative_e == false)
+    if (infoBreakPoint.relative_e == false)
     {
       mustStoreCacheCmd("M82\n");
     }
-    if(infoBreakPoint.relative == true)
+    if (infoBreakPoint.relative == true)
     {
       mustStoreCacheCmd("G91\n");
     }
@@ -193,7 +204,7 @@ void menuPowerOff(void)
 
   GUI_DispString((LCD_WIDTH - GUI_StrPixelWidth(LABEL_LOADING))/2, LCD_HEIGHT/2 - BYTE_HEIGHT, LABEL_LOADING);
 
-  if(mountFS()==true && powerFailedExist())
+  if (mountFS()==true && powerFailedExist())
   {
     popupDrawPage(DIALOG_TYPE_QUESTION, bottomDoubleBtn, textSelect(LABEL_POWER_FAILED), (u8* )infoFile.title,
                     textSelect(LABEL_CONFIRM), textSelect(LABEL_CANCEL));
@@ -218,7 +229,7 @@ void menuPowerOff(void)
       }
 
       #ifdef SD_CD_PIN
-      if(isVolumeExist(infoFile.source) != true)
+      if (isVolumeExist(infoFile.source) != true)
       {
         resetInfoFile();
         clearPowerFailed();
diff --git a/TFT/src/User/Menu/PowerFailed.h b/TFT/src/User/Menu/PowerFailed.h
index 0a377af3fd..25bd9a4af8 100644
--- a/TFT/src/User/Menu/PowerFailed.h
+++ b/TFT/src/User/Menu/PowerFailed.h
@@ -1,5 +1,4 @@
-#ifndef _POWERFAILED_H_
-#define _POWERFAILED_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,5 +40,3 @@ bool powerFailedlSeek(FIL* fp);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/PreheatMenu.c b/TFT/src/User/Menu/PreheatMenu.c
index 4e584c814d..a1ec2c1595 100644
--- a/TFT/src/User/Menu/PreheatMenu.c
+++ b/TFT/src/User/Menu/PreheatMenu.c
@@ -1,6 +1,9 @@
 #include "PreheatMenu.h"
 #include "includes.h"
 
+//Set this for preheatnotification to 1
+#define preheatNotification 1
+
 const GUI_POINT preheat_title = {ICON_WIDTH/2, PREHEAT_TITLE_Y };
 const GUI_POINT preheat_val_tool = {ICON_WIDTH - BYTE_WIDTH/2, PREHEAT_TOOL_Y};
 const GUI_POINT preheat_val_bed = {ICON_WIDTH - BYTE_WIDTH/2, PREHEAT_BED_Y};
diff --git a/TFT/src/User/Menu/PreheatMenu.h b/TFT/src/User/Menu/PreheatMenu.h
index 0715b45fa5..5c30e9be9a 100644
--- a/TFT/src/User/Menu/PreheatMenu.h
+++ b/TFT/src/User/Menu/PreheatMenu.h
@@ -1,5 +1,4 @@
-#ifndef _PREHEATMENU_H_
-#define _PREHEATMENU_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,5 +18,3 @@ void menuPreheat(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Print.c b/TFT/src/User/Menu/Print.c
index 8aed8e18b7..b1fb98503d 100644
--- a/TFT/src/User/Menu/Print.c
+++ b/TFT/src/User/Menu/Print.c
@@ -61,16 +61,16 @@ void scrollFileNameCreate(u8 i)
 {
   u8 num=infoFile.cur_page * NUM_PER_PAGE + i;
 
-  if(infoFile.F_num + infoFile.f_num==0)
+  if (infoFile.F_num + infoFile.f_num==0)
   {
     memset(&gcodeScroll,0,sizeof(SCROLL));
     return;
   }
-  if(num<infoFile.F_num)
+  if (num<infoFile.F_num)
   {
     Scroll_CreatePara(&gcodeScroll, (u8* )infoFile.folder[num],&gcodeRect[i]);
   }
-  else if(num<infoFile.F_num+infoFile.f_num)
+  else if (num<infoFile.F_num+infoFile.f_num)
   {
     if (infoMachineSettings.long_filename_support == ENABLED)
     {
@@ -86,7 +86,7 @@ void scrollFileNameCreate(u8 i)
 
 void normalNameDisp(const GUI_RECT *rect, u8 *name)
 {
-  if(name == NULL) return;
+  if (name == NULL) return;
 
   GUI_ClearPrect(rect);
   GUI_SetRange(rect->x0, rect->y0, rect->x1, rect->y1);
@@ -117,9 +117,10 @@ void gocdeIconDraw(void)
   //draw files
   for( ;(i + infoFile.cur_page * NUM_PER_PAGE < infoFile.f_num + infoFile.F_num) && (i < NUM_PER_PAGE) ;i++)  // gcode file
   {
-    if(EnterDir(infoFile.file[i + infoFile.cur_page * NUM_PER_PAGE - infoFile.F_num]) == false) break;
+    if (EnterDir(infoFile.file[i + infoFile.cur_page * NUM_PER_PAGE - infoFile.F_num]) == false) break;
     // if model preview bmp exists, display bmp directly without writing to flash
-    if(model_DirectDisplay(getIconStartPoint(i), infoFile.title) != true){
+    if (model_DirectDisplay(getIconStartPoint(i), infoFile.title) != true)
+    {
       curItem.icon = ICON_FILE;
       menuDrawItem(&curItem, i);
     }
@@ -182,11 +183,13 @@ void gocdeListDraw(void)
     }
     else
     {
-      if(infoFile.cur_page == 0){
+      if (infoFile.cur_page == 0)
+      {
         printListItems.items[5].icon = ICONCHAR_BACKGROUND;
         printListItems.items[6].icon = ICONCHAR_PAGEDOWN;
       }
-      else if(infoFile.cur_page == (t_pagenum-1)){
+      else if (infoFile.cur_page == (t_pagenum-1))
+      {
         printListItems.items[5].icon = ICONCHAR_PAGEUP;
         printListItems.items[6].icon = ICONCHAR_BACKGROUND;
       }
@@ -219,21 +222,27 @@ void menuPrintFromSource(void)
 
   if (mountFS() == true && scanPrintFiles() == true)
   {
-    if(list_mode != true){
+    if (list_mode != true)
+    {
       menuDrawPage(&printIconItems);
       gocdeIconDraw();
     }
-    else{
+    else
+    {
       menuDrawListPage(&printListItems);
       gocdeListDraw();
     }
   }
   else
   {
-    if(infoFile.source == BOARD_SD)
+    if (infoFile.source == BOARD_SD)
+    {
       GUI_DispStringInRect(0, 0, LCD_WIDTH, LCD_HEIGHT, (u8*)requestCommandInfo.cmd_rev_buf);
+    }
     else
+    {
       GUI_DispStringInRect(0, 0, LCD_WIDTH, LCD_HEIGHT, labelVolumeError[infoFile.source]);
+    }
     Delay_ms(1000);
     infoMenu.cur--;
   }
@@ -244,7 +253,8 @@ void menuPrintFromSource(void)
     Scroll_DispString(&titleScroll, LEFT);    //
     GUI_SetBkColor(infoSettings.bg_color);
 
-    if(list_mode != true){
+    if (list_mode != true)
+    {
       Scroll_DispString(&gcodeScroll, CENTER); //
     }
 
@@ -252,94 +262,96 @@ void menuPrintFromSource(void)
 
     switch(key_num)
     {
-      case KEY_ICON_5:
-        if(infoFile.cur_page > 0)
-        {
-          infoFile.cur_page--;
-          update=1;
-        }
-        break;
+    case KEY_ICON_5:
+      if (infoFile.cur_page > 0)
+      {
+        infoFile.cur_page--;
+        update=1;
+      }
+      break;
 
-      case KEY_ICON_6:
-        if(infoFile.cur_page+1 < (infoFile.F_num+infoFile.f_num+(NUM_PER_PAGE-1))/NUM_PER_PAGE)
-        {
-          infoFile.cur_page++;
-          update=1;
-        }
+    case KEY_ICON_6:
+      if (infoFile.cur_page+1 < (infoFile.F_num+infoFile.f_num+(NUM_PER_PAGE-1))/NUM_PER_PAGE)
+      {
+        infoFile.cur_page++;
+        update=1;
+      }
+      break;
+
+    case KEY_ICON_7:
+      infoFile.cur_page = 0;
+      if (IsRootDir() == true)
+      {
+        clearInfoFile();
+        infoMenu.cur--;
         break;
+      }
+      else
+      {
+        ExitDir();
+        scanPrintFiles();
+        update = 1;
+      }
+      break;
 
-      case KEY_ICON_7:
-        infoFile.cur_page = 0;
-        if(IsRootDir() == true)
-        {
-          clearInfoFile();
-          infoMenu.cur--;
-          break;
-        }
-        else
+    case KEY_IDLE:
+      break;
+
+    default:
+      if (key_num < ITEM_PER_PAGE)
+      {
+        u16 start = infoFile.cur_page * NUM_PER_PAGE;
+        if (key_num + start < infoFile.F_num)						//folder
         {
-          ExitDir();
+          if (EnterDir(infoFile.folder[key_num + start]) == false)  break;
           scanPrintFiles();
-          update = 1;
+          update=1;
+          infoFile.cur_page=0;
         }
-        break;
-
-      case KEY_IDLE:
-        break;
-
-      default:
-        if(key_num < ITEM_PER_PAGE)
+        else if (key_num+start < infoFile.F_num+infoFile.f_num)	//gcode
         {
-          u16 start = infoFile.cur_page * NUM_PER_PAGE;
-          if(key_num + start < infoFile.F_num)						//folder
-          {
-            if(EnterDir(infoFile.folder[key_num + start]) == false)  break;
-            scanPrintFiles();
-            update=1;
-            infoFile.cur_page=0;
-          }
-          else if(key_num+start < infoFile.F_num+infoFile.f_num)	//gcode
-          {
-            if(infoHost.connected !=true) break;
-            if(EnterDir(infoFile.file[key_num + start - infoFile.F_num]) == false) break;
-            //load model preview in flash if icon exists
-            setPrintModelIcon(infoFile.source != BOARD_SD && model_DecodeToFlash(infoFile.title));
-
-            char temp_info[FILE_NUM + 50];
-            sprintf(temp_info, (char *)textSelect(LABEL_START_PRINT), infoFile.file[key_num + start - infoFile.F_num]);
-            //confirm file selction
-            setDialogText( LABEL_PRINT, (u8*)temp_info, LABEL_CONFIRM, LABEL_CANCEL);
-            showDialog(DIALOG_TYPE_QUESTION, startPrint, ExitDir, NULL);
-          }
+          if (infoHost.connected !=true) break;
+          if (EnterDir(infoFile.file[key_num + start - infoFile.F_num]) == false) break;
+          //load model preview in flash if icon exists
+          setPrintModelIcon(infoFile.source != BOARD_SD && model_DecodeToFlash(infoFile.title));
+
+          char temp_info[FILE_NUM + 50];
+          sprintf(temp_info, (char *)textSelect(LABEL_START_PRINT), infoFile.file[key_num + start - infoFile.F_num]);
+          //confirm file selction
+          setDialogText( LABEL_PRINT, (u8*)temp_info, LABEL_CONFIRM, LABEL_CANCEL);
+          showDialog(DIALOG_TYPE_QUESTION, startPrint, ExitDir, NULL);
         }
-
-        else if(key_num >=KEY_LABEL_0 && key_num <= KEY_LABEL_4)
+      }
+      else if (key_num >=KEY_LABEL_0 && key_num <= KEY_LABEL_4)
+      {
+        if (list_mode != true)
         {
-          if(list_mode != true){
-            if(key_num - KEY_LABEL_0 + infoFile.cur_page * NUM_PER_PAGE < infoFile.F_num + infoFile.f_num)
-            {
-              normalNameDisp(gcodeScroll.rect, gcodeScroll.text);
-              scrollFileNameCreate(key_num - KEY_LABEL_0);
-            }
+          if (key_num - KEY_LABEL_0 + infoFile.cur_page * NUM_PER_PAGE < infoFile.F_num + infoFile.f_num)
+          {
+            normalNameDisp(gcodeScroll.rect, gcodeScroll.text);
+            scrollFileNameCreate(key_num - KEY_LABEL_0);
           }
         }
-        break;
+      }
+      break;
     }
 
-    if(update)
+    if (update)
     {
       update=0;
 
-      if(list_mode != true){
+      if (list_mode != true)
+      {
         gocdeIconDraw();
       }
-      else{
+      else
+      {
         gocdeListDraw();
       }
     }
 
     #ifdef SD_CD_PIN
-    if(isVolumeExist(infoFile.source) != true)
+    if (isVolumeExist(infoFile.source) != true)
     {
       resetInfoFile();
       infoMenu.cur--;
@@ -390,7 +402,7 @@ void menuPrint(void)
         infoMenu.menu[++infoMenu.cur] = menuPowerOff;
         goto selectEnd;
 
-      #ifdef U_DISK_SUPPORT
+        #ifdef U_DISK_SUPPORT
           case KEY_ICON_1:
             list_mode = infoSettings.file_listmode; //follow list mode setting in usb disk
             infoFile.source = TFT_UDISK;
@@ -398,10 +410,10 @@ void menuPrint(void)
             infoMenu.menu[++infoMenu.cur] = menuPowerOff;
             goto selectEnd;
           case KEY_ICON_2:
-      #else
+        #else
           case KEY_ICON_1:
-      #endif
-          if(infoMachineSettings.onboard_sd_support == ENABLED)
+        #endif
+          if (infoMachineSettings.onboard_sd_support == ENABLED)
           {
             list_mode = true; //force list mode in Onboard sd card
             infoFile.source = BOARD_SD;
diff --git a/TFT/src/User/Menu/Print.h b/TFT/src/User/Menu/Print.h
index 5446e2065b..ae62222a56 100644
--- a/TFT/src/User/Menu/Print.h
+++ b/TFT/src/User/Menu/Print.h
@@ -1,5 +1,4 @@
-#ifndef _PRINT_H_
-#define _PRINT_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,5 +12,3 @@ void menuPrint(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/PrintingMenu.c b/TFT/src/User/Menu/PrintingMenu.c
index 022850b9f5..b9d7a731ab 100644
--- a/TFT/src/User/Menu/PrintingMenu.c
+++ b/TFT/src/User/Menu/PrintingMenu.c
@@ -69,12 +69,12 @@ void menuBeforePrinting(void)
     case BOARD_SD: // GCode from file on ONBOARD SD
       size = request_M23(infoFile.title+5);
 
-      //  if( powerFailedCreate(infoFile.title)==false)
+      //  if (powerFailedCreate(infoFile.title)==false)
       //  {
       //
       //  }    // FIXME: Powerfail resume is not yet supported for ONBOARD_SD. Need more work.
 
-      if(size == 0)
+      if (size == 0)
       {
         ExitDir();
         infoMenu.cur--;
@@ -83,7 +83,7 @@ void menuBeforePrinting(void)
 
       infoPrinting.size  = size;
 
-      //    if(powerFailedExist())
+      //    if (powerFailedExist())
       //    {
       request_M24(0);
       //    }
@@ -96,7 +96,8 @@ void menuBeforePrinting(void)
       {
         request_M27(infoSettings.m27_refresh_time);                //Check if there is a SD or USB print running.
       }
-      else{
+      else
+      {
         request_M27(0);
       }
 
@@ -106,13 +107,13 @@ void menuBeforePrinting(void)
 
     case TFT_UDISK:
     case TFT_SD: // GCode from file on TFT SD
-      if(f_open(&infoPrinting.file,infoFile.title, FA_OPEN_EXISTING | FA_READ) != FR_OK)
+      if (f_open(&infoPrinting.file,infoFile.title, FA_OPEN_EXISTING | FA_READ) != FR_OK)
       {
         ExitDir();
         infoMenu.cur--;
         return ;
       }
-      if( powerFailedCreate(infoFile.title)==false)
+      if (powerFailedCreate(infoFile.title) == false)
       {
 
       }
@@ -120,7 +121,8 @@ void menuBeforePrinting(void)
 
       infoPrinting.size  = f_size(&infoPrinting.file);
       infoPrinting.cur   = infoPrinting.file.fptr;
-      if(infoSettings.send_start_gcode == 1 && infoPrinting.cur == 0){ // PLR continue printing, CAN NOT use start gcode
+      if (infoSettings.send_start_gcode == 1 && infoPrinting.cur == 0) // PLR continue printing, CAN NOT use start gcode
+      {
         sendPrintCodes(0);
       }
       break;
@@ -192,7 +194,7 @@ void reDrawSpeed(int icon_pos)
 
   sprintf(tempstr, "%d%%", speedGetPercent(c_speedID) );
 
-  if(c_speedID == 0)
+  if (c_speedID == 0)
   {
     ICON_ReadDisplay(printinfo_points[icon_pos].x,printinfo_points[icon_pos].y,ICON_PRINTING_SPEED);
   }
@@ -362,10 +364,10 @@ void menuPrinting(void)
     }
 
     //check printing progress
-    if( infoPrinting.size != 0)
+    if (infoPrinting.size != 0)
     {
       //check print time change
-      if(time != infoPrinting.time || infoPrinting.progress != MIN((uint64_t)infoPrinting.cur*100/infoPrinting.size, 100))
+      if (time != infoPrinting.time || infoPrinting.progress != MIN((uint64_t)infoPrinting.cur*100/infoPrinting.size, 100))
       {
         time = infoPrinting.time;
         infoPrinting.progress = MIN((uint64_t)infoPrinting.cur*100/infoPrinting.size, 100);
@@ -376,7 +378,7 @@ void menuPrinting(void)
     }
     else
     {
-      if(infoPrinting.progress != 100)
+      if (infoPrinting.progress != 100)
       {
         infoPrinting.progress = 100;
         reDrawTime(TIM_ICON_POS);
@@ -385,7 +387,7 @@ void menuPrinting(void)
     }
 
     //Z_AXIS coordinate
-    if(curLayer != (infoFile.source == BOARD_SD) ? coordinateGetAxisActual(Z_AXIS) : coordinateGetAxisTarget(Z_AXIS))
+    if (curLayer != (infoFile.source == BOARD_SD) ? coordinateGetAxisActual(Z_AXIS) : coordinateGetAxisTarget(Z_AXIS))
     {
       curLayer = (infoFile.source == BOARD_SD) ? coordinateGetAxisActual(Z_AXIS) : coordinateGetAxisTarget(Z_AXIS);
       rapid_serial_loop();  //perform backend printing loop before drawing to avoid printer idling
@@ -393,7 +395,7 @@ void menuPrinting(void)
     }
 
     //check change in speed or flow
-    if(curspeed[c_speedID] != speedGetPercent(c_speedID))
+    if (curspeed[c_speedID] != speedGetPercent(c_speedID))
     {
       curspeed[c_speedID] = speedGetPercent(c_speedID);
       rapid_serial_loop();  //perform backend printing loop before drawing to avoid printer idling
@@ -419,32 +421,33 @@ void menuPrinting(void)
     KEY_VALUES key_num = menuKeyGetValue();
     switch(key_num)
     {
-      case KEY_ICON_4:
-        infoMenu.menu[++infoMenu.cur] = menuBabystep;
-        break;
-
-      case KEY_ICON_5:
-        setPrintPause(!isPause(), false);
-        break;
-
-      case KEY_ICON_6:
-        infoMenu.menu[++infoMenu.cur] = menuMore;
-        break;
-
-      case KEY_ICON_7:
-        if(isPrinting())
-        {
-          setDialogText(LABEL_WARNING, LABEL_STOP_PRINT, LABEL_CONFIRM, LABEL_CANCEL);
-          showDialog(DIALOG_TYPE_ALERT, stopConfirm, NULL, NULL);
-        }
-        else
-        {
-          exitPrinting();
-          infoMenu.cur--;
-        }
-        break;
-
-      default :break;
+    case KEY_ICON_4:
+      infoMenu.menu[++infoMenu.cur] = menuBabystep;
+      break;
+
+    case KEY_ICON_5:
+      setPrintPause(!isPause(), false);
+      break;
+
+    case KEY_ICON_6:
+      infoMenu.menu[++infoMenu.cur] = menuMore;
+      break;
+
+    case KEY_ICON_7:
+      if (isPrinting())
+      {
+        setDialogText(LABEL_WARNING, LABEL_STOP_PRINT, LABEL_CONFIRM, LABEL_CANCEL);
+        showDialog(DIALOG_TYPE_ALERT, stopConfirm, NULL, NULL);
+      }
+      else
+      {
+        exitPrinting();
+        infoMenu.cur--;
+      }
+      break;
+
+    default :
+      break;
     }
     loopProcess();
   }
diff --git a/TFT/src/User/Menu/PrintingMenu.h b/TFT/src/User/Menu/PrintingMenu.h
index fbf8573de7..3d11d0a9bf 100644
--- a/TFT/src/User/Menu/PrintingMenu.h
+++ b/TFT/src/User/Menu/PrintingMenu.h
@@ -1,5 +1,4 @@
-#ifndef _PRINTINGMENU_H_
-#define _PRINTINGMENU_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,5 +14,3 @@ void menuPrinting(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/ProbeOffset.h b/TFT/src/User/Menu/ProbeOffset.h
index cbd9f40040..0c6e292b1a 100644
--- a/TFT/src/User/Menu/ProbeOffset.h
+++ b/TFT/src/User/Menu/ProbeOffset.h
@@ -1,5 +1,4 @@
-#ifndef _PROBE_OFFSET_H_
-#define _PROBE_OFFSET_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuProbeOffset(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/ScreenSettings.c b/TFT/src/User/Menu/ScreenSettings.c
index 79bf1ae205..566ccedd8f 100644
--- a/TFT/src/User/Menu/ScreenSettings.c
+++ b/TFT/src/User/Menu/ScreenSettings.c
@@ -59,7 +59,8 @@ void menuLanguage(void)
       break;
 
     default:
-      if(key_num < LISTITEM_PER_PAGE){
+      if (key_num < LISTITEM_PER_PAGE)
+      {
         uint16_t cur_item = infoSettings.language;
         uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num;
         if (tmp_i < LANGUAGE_NUM && tmp_i != cur_item) { // has changed
@@ -79,7 +80,7 @@ void menuLanguage(void)
     loopProcess();
   }
 
-  if(memcmp(&now, &infoSettings, sizeof(SETTINGS)))
+  if (memcmp(&now, &infoSettings, sizeof(SETTINGS)))
   {
     statusScreen_setReady(); // restore msg buffer when language is changed
     storePara();
@@ -147,7 +148,8 @@ void menuSimulatorBackGroundColor(void)
       break;
 
     default:
-      if(key_num < LISTITEM_PER_PAGE){
+      if (key_num < LISTITEM_PER_PAGE)
+      {
         uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num;
         if (tmp_i < LCD_COLOR_COUNT && tmp_i != cur_item) { // has changed
           totalItems[cur_item].icon = ICONCHAR_UNCHECKED;
@@ -165,7 +167,7 @@ void menuSimulatorBackGroundColor(void)
     loopProcess();
   }
 
-  if(memcmp(&now, &infoSettings, sizeof(SETTINGS)))
+  if (memcmp(&now, &infoSettings, sizeof(SETTINGS)))
   {
     storePara();
   }
@@ -211,7 +213,8 @@ void menuSimulatorFontColor(void)
       break;
 
     default:
-      if(key_num < LISTITEM_PER_PAGE){
+      if (key_num < LISTITEM_PER_PAGE)
+      {
         uint16_t tmp_i = listWidgetGetCurPage() * LISTITEM_PER_PAGE + key_num;
         if (tmp_i < LCD_COLOR_COUNT && tmp_i != cur_item) { // has changed
           totalItems[cur_item].icon = ICONCHAR_UNCHECKED;
@@ -229,7 +232,7 @@ void menuSimulatorFontColor(void)
     loopProcess();
   }
 
-  if(memcmp(&now, &infoSettings, sizeof(SETTINGS)))
+  if (memcmp(&now, &infoSettings, sizeof(SETTINGS)))
   {
     storePara();
   }
@@ -245,19 +248,20 @@ void menuSoundSettings(void)
   LABEL_FEATURE_SETTINGS,
   // icon                 ItemType      Item Title        item value text(only for custom value)
   {
-    {ICONCHAR_TOGGLE_ON, LIST_TOGGLE,  LABEL_TOUCH_SOUND,  LABEL_BACKGROUND},
-    {ICONCHAR_TOGGLE_ON, LIST_TOGGLE,  LABEL_ALERT_SOUND,  LABEL_BACKGROUND},
-    {ICONCHAR_TOGGLE_ON, LIST_TOGGLE,  LABEL_TOAST_SOUND,  LABEL_BACKGROUND},
-    {ICONCHAR_BACKGROUND, LIST_LABEL,  LABEL_BACKGROUND,   LABEL_BACKGROUND},
-    {ICONCHAR_BACKGROUND, LIST_LABEL,  LABEL_BACKGROUND,   LABEL_BACKGROUND},
-    {ICONCHAR_BACKGROUND, LIST_LABEL,  LABEL_BACKGROUND,   LABEL_BACKGROUND},
-    {ICONCHAR_BACKGROUND, LIST_LABEL,  LABEL_BACKGROUND,   LABEL_BACKGROUND},
-    {ICONCHAR_BACK,       LIST_LABEL,  LABEL_BACKGROUND,   LABEL_BACKGROUND},}
+    {ICONCHAR_TOGGLE_ON, LIST_TOGGLE,  LABEL_TOUCH_SOUND,       LABEL_BACKGROUND},
+    {ICONCHAR_TOGGLE_ON, LIST_TOGGLE,  LABEL_ALERT_SOUND,       LABEL_BACKGROUND},
+    {ICONCHAR_TOGGLE_ON, LIST_TOGGLE,  LABEL_TOAST_SOUND,       LABEL_BACKGROUND},
+    {ICONCHAR_TOGGLE_ON, LIST_TOGGLE,  LABEL_PREHEATDONE_SOUND, LABEL_BACKGROUND},
+    {ICONCHAR_BACKGROUND, LIST_LABEL,  LABEL_BACKGROUND,        LABEL_BACKGROUND},
+    {ICONCHAR_BACKGROUND, LIST_LABEL,  LABEL_BACKGROUND,        LABEL_BACKGROUND},
+    {ICONCHAR_BACKGROUND, LIST_LABEL,  LABEL_BACKGROUND,        LABEL_BACKGROUND},
+    {ICONCHAR_BACK,       LIST_LABEL,  LABEL_BACKGROUND,        LABEL_BACKGROUND},}
   };
 
-  sounditems.items[0].icon = (infoSettings.touchSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF;
-  sounditems.items[1].icon = (infoSettings.alertSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF;
-  sounditems.items[2].icon = (infoSettings.toastSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF;
+  sounditems.items[0].icon = (infoSettings.touchSound == 1) ?       ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF;
+  sounditems.items[1].icon = (infoSettings.alertSound == 1) ?       ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF;
+  sounditems.items[2].icon = (infoSettings.toastSound == 1) ?       ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF;
+  sounditems.items[3].icon = (infoSettings.preheatDoneSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF;
 
   KEY_VALUES key_num = KEY_IDLE;
   SETTINGS now = infoSettings;
@@ -287,6 +291,12 @@ void menuSoundSettings(void)
       menuDrawListItem(&sounditems.items[key_num], key_num);
       break;
 
+    case KEY_ICON_3:
+      infoSettings.preheatDoneSound =  (infoSettings.preheatDoneSound + 1) % 2;
+      sounditems.items[key_num].icon = (infoSettings.preheatDoneSound == 1) ? ICONCHAR_TOGGLE_ON : ICONCHAR_TOGGLE_OFF;
+      menuDrawListItem(&sounditems.items[key_num], key_num);
+      break;
+
     case KEY_ICON_7:
       infoMenu.cur--;
       break;
@@ -337,7 +347,7 @@ void menuScreenSettings(void)
 
     for(u8 i = 0; i < LCD_COLOR_COUNT; i++)
     {
-      if(infoSettings.marlin_mode_bg_color == lcd_colors[i])
+      if (infoSettings.marlin_mode_bg_color == lcd_colors[i])
       {
         screenSettingsItems.items[LCD12864_BG_INDEX].label = lcd_color_names[i];
       }
@@ -346,7 +356,7 @@ void menuScreenSettings(void)
     // LCD12864 font color
     for(u8 i = 0; i < LCD_COLOR_COUNT; i++)
     {
-      if(infoSettings.marlin_mode_font_color == lcd_colors[i])
+      if (infoSettings.marlin_mode_font_color == lcd_colors[i])
       {
         screenSettingsItems.items[LCD12864_FN_INDEX].label = lcd_color_names[i];
       }
@@ -409,7 +419,7 @@ void menuScreenSettings(void)
     loopProcess();
   }
 
-  if(memcmp(&now, &infoSettings, sizeof(SETTINGS)))
+  if (memcmp(&now, &infoSettings, sizeof(SETTINGS)))
   {
     storePara();
   }
diff --git a/TFT/src/User/Menu/ScreenSettings.h b/TFT/src/User/Menu/ScreenSettings.h
index 39a6b213f6..b238d37756 100644
--- a/TFT/src/User/Menu/ScreenSettings.h
+++ b/TFT/src/User/Menu/ScreenSettings.h
@@ -1,5 +1,4 @@
-#ifndef _SCREEN_SETTINGS_H_
-#define _SCREEN_SETTINGS_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,5 +10,3 @@ void menuLanguage(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Selectmode.c b/TFT/src/User/Menu/Selectmode.c
index e4f774909c..e1b9450d93 100644
--- a/TFT/src/User/Menu/Selectmode.c
+++ b/TFT/src/User/Menu/Selectmode.c
@@ -30,7 +30,7 @@ void drawModeIcon(void)
 
   GUI_RestoreColorDefault();
 
-  if(infoSettings.marlin_type == LCD12864)
+  if (infoSettings.marlin_type == LCD12864)
     GUI_DispStringInPrect(&mode_title_rect[0],(uint8_t *)"LCD12864 Mode");
   else
     GUI_DispStringInPrect(&mode_title_rect[0],(uint8_t *)"LCD2004 Mode");
@@ -41,9 +41,9 @@ void drawModeIcon(void)
 bool LCD_ReadPen(uint16_t intervals)
 {
   static u32 TouchTime = 0;
-  if(!XPT2046_Read_Pen())
+  if (!XPT2046_Read_Pen())
   {
-    if(OS_GetTimeMs() - TouchTime > intervals)
+    if (OS_GetTimeMs() - TouchTime > intervals)
     {
       return true;
     }
@@ -78,14 +78,14 @@ void loopCheckMode(void)
 //  IDEALLY I would like to be able to swap even when the TFT is in printing mode
 //  but before I can allow that I need a way to make sure that we swap back into the right mode (and correct screen)
 //  and I really want a reliable way to DETECT that the TFT should be in printing mode even when the print was started externally.
-  if(isPrinting() || skipMode)
+  if (isPrinting() || skipMode)
     return;
 
-  if(infoMenu.menu[infoMenu.cur] == menuMode)
+  if (infoMenu.menu[infoMenu.cur] == menuMode)
     return;
 
 //  #endif
-  if(LCD_ReadPen(LCD_CHANGE_MODE_INTERVALS) 
+  if (LCD_ReadPen(LCD_CHANGE_MODE_INTERVALS) 
 #if LCD_ENCODER_SUPPORT 
       || encoder_ReadBtn(LCD_CHANGE_MODE_INTERVALS)
 #endif
@@ -129,21 +129,21 @@ void menuMode(void)
   {
     MKEY_VALUES key_num = MKeyGetValue();
 
-    if(key_num == MKEY_0 || key_num == MKEY_1)
+    if (key_num == MKEY_0 || key_num == MKEY_1)
     {
       nowMode = key_num;
       break;
     }
 
     #if LCD_ENCODER_SUPPORT
-      if(encoderPosition)
+      if (encoderPosition)
       {
         nowMode = NOBEYOND(0, nowMode + encoderPosition, MODE_COUNT - 1);
         drawSelectedMode(nowMode);
         encoderPosition = 0;
       }
 
-      if(encoder_ReadBtn(LCD_BUTTON_INTERVALS))
+      if (encoder_ReadBtn(LCD_BUTTON_INTERVALS))
       {
         break;
       }
@@ -160,7 +160,7 @@ void menuMode(void)
     }
   }
 
-  if(infoSettings.mode != nowMode)
+  if (infoSettings.mode != nowMode)
   {
     infoSettings.mode = nowMode;
     storePara();
diff --git a/TFT/src/User/Menu/Selectmode.h b/TFT/src/User/Menu/Selectmode.h
index 36b86b856c..e1336afce9 100644
--- a/TFT/src/User/Menu/Selectmode.h
+++ b/TFT/src/User/Menu/Selectmode.h
@@ -1,5 +1,4 @@
-#ifndef _SELECTMODE_H_
-#define _SELECTMODE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,5 +25,3 @@ void loopCheckMode(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/SendGcode.h b/TFT/src/User/Menu/SendGcode.h
index c6a0d18b2e..5940c8d620 100644
--- a/TFT/src/User/Menu/SendGcode.h
+++ b/TFT/src/User/Menu/SendGcode.h
@@ -1,5 +1,4 @@
-#ifndef _SEND_GCODE_H_
-#define _SEND_GCODE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,5 +17,3 @@ void sendGcodeTerminalCache(char *stream, TERMINAL_SRC src);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/SettingsMenu.h b/TFT/src/User/Menu/SettingsMenu.h
index f944d2b195..3bc817009c 100644
--- a/TFT/src/User/Menu/SettingsMenu.h
+++ b/TFT/src/User/Menu/SettingsMenu.h
@@ -1,5 +1,4 @@
-#ifndef _SETTINGSMENU_H_
-#define _SETTINGSMENU_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,5 +18,3 @@ void infoSetMachineType(uint8_t *machine, uint8_t type_len);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Speed.c b/TFT/src/User/Menu/Speed.c
index 2ff2cf0ce5..c5e5854694 100644
--- a/TFT/src/User/Menu/Speed.c
+++ b/TFT/src/User/Menu/Speed.c
@@ -84,7 +84,7 @@ void menuSpeed(void)
     switch(key_num)
     {
       case KEY_ICON_0:
-        if(now > SPEED_MIN)
+        if (now > SPEED_MIN)
           speedSetPercent(item_percentage_i, now - item_percent_unit[item_percent_unit_i]);
         break;
       case KEY_INFOBOX:
@@ -103,7 +103,7 @@ void menuSpeed(void)
         break;
       }
       case KEY_ICON_3:
-        if(now < SPEED_MAX)
+        if (now < SPEED_MAX)
           speedSetPercent(item_percentage_i, now + item_percent_unit[item_percent_unit_i]);
         break;
 
@@ -130,7 +130,7 @@ void menuSpeed(void)
         break;
       default:
         #if LCD_ENCODER_SUPPORT
-          if(encoderPosition)
+          if (encoderPosition)
           {
             if (now < SPEED_MAX && encoderPosition > 0)
             {
diff --git a/TFT/src/User/Menu/Speed.h b/TFT/src/User/Menu/Speed.h
index 369a08fc00..4e42393a5c 100644
--- a/TFT/src/User/Menu/Speed.h
+++ b/TFT/src/User/Menu/Speed.h
@@ -1,5 +1,4 @@
-#ifndef _SPEED_H_
-#define _SPEED_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,5 +13,3 @@ void menuSpeed(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/StatusScreen.c b/TFT/src/User/Menu/StatusScreen.c
index 5528639a5e..c3ad72fed9 100644
--- a/TFT/src/User/Menu/StatusScreen.c
+++ b/TFT/src/User/Menu/StatusScreen.c
@@ -189,10 +189,12 @@ void statusScreen_setMsg(const uint8_t *title, const uint8_t *msg)
 void statusScreen_setReady(void)
 {
   strncpy(msgtitle, (char *)textSelect(LABEL_STATUS), sizeof(msgtitle));
-  if(infoHost.connected == false){
+  if (infoHost.connected == false)
+  {
     strncpy(msgbody, (char *)textSelect(LABEL_UNCONNECTED), sizeof(msgbody));
   }
-  else{
+  else
+  {
     strncpy(msgbody, (char *)machine_type, sizeof(msgbody));
     strcat(msgbody, " ");
     strcat(msgbody, (char *)textSelect(LABEL_READY));
@@ -220,7 +222,8 @@ void drawStatusScreenMsg(void)
   msgNeedRefresh = false;
 }
 
-void scrollMsg(void){
+void scrollMsg(void)
+{
   GUI_SetBkColor(INFOMSG_BKCOLOR);
   GUI_SetColor(INFOMSG_COLOR);
   Scroll_DispString(&msgScroll,CENTER);
@@ -261,7 +264,8 @@ void menuStatus(void)
   drawStatusScreenMsg();
   while (infoMenu.menu[infoMenu.cur] == menuStatus)
   {
-    if(infoHost.connected != lastConnection_status){
+    if (infoHost.connected != lastConnection_status)
+    {
       statusScreen_setReady();
       lastConnection_status = infoHost.connected;
     }
diff --git a/TFT/src/User/Menu/StatusScreen.h b/TFT/src/User/Menu/StatusScreen.h
index d50e5ba9e9..1f61225898 100644
--- a/TFT/src/User/Menu/StatusScreen.h
+++ b/TFT/src/User/Menu/StatusScreen.h
@@ -1,5 +1,4 @@
-#ifndef _STATUSSCREEN_H_
-#define _STATUSSCREEN_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,5 +34,3 @@ void gantry_inc(int n, float val);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/TuneExtruder.h b/TFT/src/User/Menu/TuneExtruder.h
index 84a22ccda2..8d221abbaf 100644
--- a/TFT/src/User/Menu/TuneExtruder.h
+++ b/TFT/src/User/Menu/TuneExtruder.h
@@ -1,5 +1,4 @@
-#ifndef _TUNE_EXTRUDER_H
-#define _TUNE_EXTRUDER_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,5 +10,3 @@ void menuNewExtruderESteps(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/Tuning.h b/TFT/src/User/Menu/Tuning.h
index 2562448696..5440933db1 100644
--- a/TFT/src/User/Menu/Tuning.h
+++ b/TFT/src/User/Menu/Tuning.h
@@ -1,5 +1,4 @@
-#ifndef _TUNING_H_
-#define _TUNING_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuTuning(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/UnifiedHeat.h b/TFT/src/User/Menu/UnifiedHeat.h
index 65165c377d..acf322d81c 100644
--- a/TFT/src/User/Menu/UnifiedHeat.h
+++ b/TFT/src/User/Menu/UnifiedHeat.h
@@ -1,5 +1,4 @@
-#ifndef _UNIFIEDHEAT_H_
-#define _UNIFIEDHEAT_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuUnifiedHeat(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/Menu/UnifiedMove.h b/TFT/src/User/Menu/UnifiedMove.h
index 48c3bfe3b1..f4bf8aac4f 100644
--- a/TFT/src/User/Menu/UnifiedMove.h
+++ b/TFT/src/User/Menu/UnifiedMove.h
@@ -1,5 +1,4 @@
-#ifndef _UNIFIEDMOVE_H_
-#define _UNIFIEDMOVE_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,5 +9,3 @@ void menuUnifiedMove(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/TFT/src/User/SanityCheck.h b/TFT/src/User/SanityCheck.h
index 014f79c10d..6bafac8775 100644
--- a/TFT/src/User/SanityCheck.h
+++ b/TFT/src/User/SanityCheck.h
@@ -1,5 +1,4 @@
-#ifndef _SANITYCHECK_H_
-#define _SANITYCHECK_H_
+#pragma once
 
 #include "includes.h"
 #include "Configuration.h"
@@ -23,7 +22,7 @@
       #ifdef DEFAULT_LCD_MODE
         #undef DEFAULT_LCD_MODE
       #endif
-      #define DEFAULT_LCD_MODE SERIAL_TSC  // Just set hardcoded here. 
+      #define DEFAULT_LCD_MODE SERIAL_TSC  // Just set hardcoded here.
       //#warning "DEFAULT_LCD_MODE supports only SERIAL_TSC. Please update/check your configuration."
     #endif
 #endif
@@ -317,5 +316,3 @@
 #define CUSTOM_GCODE_LABELS    {CUSTOM_0_LABEL, CUSTOM_1_LABEL, CUSTOM_2_LABEL, CUSTOM_3_LABEL, CUSTOM_4_LABEL,\
                               CUSTOM_5_LABEL, CUSTOM_6_LABEL, CUSTOM_7_LABEL, CUSTOM_8_LABEL, CUSTOM_9_LABEL,\
                               CUSTOM_10_LABEL,CUSTOM_11_LABEL,CUSTOM_12_LABEL,CUSTOM_13_LABEL,CUSTOM_14_LABEL }
-
-#endif //_SANITYCHECK_H_
diff --git a/TFT/src/User/config.ini b/TFT/src/User/config.ini
index c49636d4cb..1b200af445 100644
--- a/TFT/src/User/config.ini
+++ b/TFT/src/User/config.ini
@@ -384,6 +384,11 @@ lcd_idle_brightness:5
 # Options [Off: 0, 5Sec: 1, 10Sec: 2, 30sec: 3, 1min: 4, 2min: 5, 5min: 6, 10min: 7]
 lcd_idle_delay:4
 
+#### sequentialmode
+# With this set to true, the neopixel and knob-led will change color while heating
+# like they do in marlin mode. (Only while printing)
+# Options: [On: 1, Off: 0]
+event_led_mode:1
 
 #--------------------------------------------------------------------
 # Custom G-Code Commands (up to 15 custom G-code)
diff --git a/TFT/src/User/delay.h b/TFT/src/User/delay.h
index 9890557819..e79a39f8dd 100644
--- a/TFT/src/User/delay.h
+++ b/TFT/src/User/delay.h
@@ -1,9 +1,8 @@
-#ifndef _DELAY_H_
-#define _DELAY_H_
+#pragma once
+
 #include "stdint.h"
 
 void Delay_init(void);
 void Delay_ms(uint16_t ms);
 void Delay_us(uint32_t us);
 
-#endif
diff --git a/TFT/src/User/includes.h b/TFT/src/User/includes.h
index b241aee48a..7c131b1368 100644
--- a/TFT/src/User/includes.h
+++ b/TFT/src/User/includes.h
@@ -1,5 +1,4 @@
-#ifndef _INCLUDES_H_
-#define _INCLUDES_H_
+#pragma once
 
 #include "variants.h"
 
@@ -120,6 +119,11 @@
 #include "Pid.h"
 #include "TuneExtruder.h"
 #include "ConnectionSettings.h"
+
+#include "event_led_mode.h"
+
+#include "CaseLight.h"
+
 #include "MeshTuner.h"
 #include "MeshEditor.h"
 #include "CaseLight.h"
@@ -152,5 +156,3 @@ typedef struct
   u32 PCLK2_Timer_Frequency;
 }CLOCKS;
 extern CLOCKS mcuClocks;
-
-#endif
diff --git a/TFT/src/User/my_misc.h b/TFT/src/User/my_misc.h
index 45e9df8ddc..c34442e9e7 100644
--- a/TFT/src/User/my_misc.h
+++ b/TFT/src/User/my_misc.h
@@ -1,5 +1,4 @@
-#ifndef _MY_MISC_H_
-#define _MY_MISC_H_
+#pragma once
 
 #include "stdint.h"
 
@@ -22,5 +21,3 @@ uint8_t string_2_uint8_t(const uint8_t *string);
 uint8_t *uint8_2_string(uint8_t num, uint8_t *string);
 uint32_t string_2_uint32(const uint8_t *string, const uint8_t bytes_num);
 uint8_t *uint32_2_string(uint32_t num, uint8_t bytes_num, uint8_t *string);
-
-#endif
diff --git a/TFT/src/User/os_timer.c b/TFT/src/User/os_timer.c
index a46eb1c030..8f45f7a2f6 100644
--- a/TFT/src/User/os_timer.c
+++ b/TFT/src/User/os_timer.c
@@ -33,7 +33,7 @@ void TIM7_IRQHandler(void)
 
     loopTouchScreen();
 
-    if(os_counter == (uint32_t)(~0)) {
+    if (os_counter == (uint32_t)(~0)) {
       os_counter = 0;
     }
   }
@@ -59,9 +59,9 @@ void OS_TaskInit(OS_TASK *task, uint32_t time_ms, FP_TASK function, void *para)
 */
 void OS_TaskLoop(OS_TASK *task_t)
 {
-  if(task_t->is_exist == 0)   return;
-  if(OS_GetTimeMs() < task_t->next_time)  return;
-  if(task_t->is_repeat == 0)
+  if (task_t->is_exist == 0)   return;
+  if (OS_GetTimeMs() < task_t->next_time)  return;
+  if (task_t->is_repeat == 0)
   {
     task_t->is_exist = 0;
   }
@@ -79,7 +79,7 @@ void OS_TaskEnable(OS_TASK *task_t, uint8_t is_exec,uint8_t is_repeat)
   task_t->is_exist =1;
   task_t->is_repeat = is_repeat;
   task_t->next_time = OS_GetTimeMs() + task_t->time_ms;
-  if(is_exec)
+  if (is_exec)
     (*task_t->task)(task_t->para);
 }
 
diff --git a/TFT/src/User/os_timer.h b/TFT/src/User/os_timer.h
index b69dc203fd..077927cbf6 100644
--- a/TFT/src/User/os_timer.h
+++ b/TFT/src/User/os_timer.h
@@ -1,5 +1,5 @@
-#ifndef _OS_TIMER_H_
-#define _OS_TIMER_H_
+#pragma once
+
 #include "stdint.h"
 
 
@@ -23,5 +23,3 @@ void OS_TaskInit(OS_TASK *task, uint32_t time_ms, FP_TASK function,void *para);
 void OS_TaskCheck(OS_TASK *task);
 void OS_TaskEnable(OS_TASK *task, uint8_t is_exec, uint8_t is_repeat);
 void OS_TaskDisable(OS_TASK *task);
-
-#endif
diff --git a/platformio.ini b/platformio.ini
index f4ba4b172a..966af4eeac 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -28,7 +28,7 @@
 src_dir      = TFT
 boards_dir   = buildroot/boards
 ;Build only Target - BIGTREE_TFT35_V3_0
-default_envs = BIGTREE_TFT35_V3_0
+default_envs = BIGTREE_TFT35_E3_V3_0
 
 ;Build all Targets
 ;default_envs = BIGTREE_TFT35_V1_0, BIGTREE_TFT35_V1_1, BIGTREE_TFT35_V1_2, BIGTREE_TFT35_V2_0, BIGTREE_TFT35_V3_0, BIGTREE_TFT35_E3_V3_0, BIGTREE_TFT43_V3_0, BIGTREE_TFT50_V3_0, BIGTREE_TFT70_V3_0, BIGTREE_TFT28_V1_0, BIGTREE_TFT28_V3_0, BIGTREE_TFT24_V1_1, MKS_32_V1_4, MKS_28_V1_0
diff --git a/styleguide.md b/styleguide.md
new file mode 100644
index 0000000000..5fb88699ac
--- /dev/null
+++ b/styleguide.md
@@ -0,0 +1,55 @@
+### Comments in code
+Comments in the code should always be in English. After the comment marks '//' their should be a space.
+Example:
+```
+//Wrong comment
+// Correct comment
+```
+
+### If else statements
+A if else statement should always look like this:
+```
+if (statementA == checkup)
+{
+  //Do something for B
+}
+else if (statementB == checkup)
+{
+  //Do something for B
+}
+else
+{
+  //Default
+}
+```
+_Notice the space in between the if and '('_
+
+When using a if else statement you should always use the curly braces. Even if it's one line!
+Some examples:
+```
+if (whattodo == true) return; // This is correct
+if (whattodo == true)
+  return;                                // This should be with curly braces
+if (whattodo == true)
+{
+  return;                                //This is correct. 
+}
+```
+
+Some more examples
+| Wrong | Correct |
+|-------|---------|
+|`if (checka == true)`|`if (checka == true)`|
+|`{ if (checkb == false)`|`{`|
+|`    doActionA();`|`  if (checkb == false)`|
+|`}`|`  {`|
+||`    doActionA();`|
+||`  }`|
+||`}`|
+|----|----|
+|`if(checha) {doA();return;}`|`if(checka)`|
+||`{`|
+||`  doA();`|
+||`  return;`|
+||`}`|
+|----|----|