diff --git a/KlipperScreen.conf b/KlipperScreen.conf
index 15e5bcb..f0f36c2 100644
--- a/KlipperScreen.conf
+++ b/KlipperScreen.conf
@@ -1,357 +1,17 @@
-[main]
-moonraker_host: 127.0.0.1
-moonraker_port: 7125
-service: KlipperScreen
-
-[z_calibrate_position]
-calibrate_x_position: 150
-calibrate_y_position: 250
-
 [preheat PLA]
 bed = 50
 extruder = 200
 
 [preheat ABS]
-bed = 100
+bed = 105
 extruder = 250
 
 [preheat PETG]
 bed = 80
 extruder = 240
-
-[menu __main]
-name: {{ gettext('Main Menu') }}
-
-[menu __main homing]
-name: {{ gettext('Homing') }}
-icon: home
-
-[menu __main temperature]
-name: {{ gettext('Temperature') }}
-icon: heat-up
-panel: temperature
-
-[menu __main actions]
-name: {{ gettext('Actions') }}
-icon: move
-
-[menu __main config]
-name: {{ gettext('Configuration') }}
-icon: settings
-
-[menu __main print]
-name: {{ gettext('Print') }}
-icon: print
-panel: print
-
-[menu __main homing homeall]
-name: {{ gettext('Home All') }}
-icon: home
-method: printer.gcode.script
-params: {"script":"G28"}
-
-[menu __main homing homex]
-name: {{ gettext('Home X') }}
-icon: home-x
-method: printer.gcode.script
-params: {"script":"G28 X"}
-
-[menu __main homing homey]
-name: {{ gettext('Home Y') }}
-icon: home-y
-method: printer.gcode.script
-params: {"script":"G28 Y"}
-
-[menu __main homing homez]
-name: {{ gettext('Home Z') }}
-icon: home-z
-method: printer.gcode.script
-params: {"script":"G28 Z"}
-
-[menu __main homing homexy]
-name: {{ gettext('Home XY') }}
-icon: home
-method: printer.gcode.script
-params: {"script":"G28 X Y"}
-
-[menu __main homing quad_gantry_level]
-name: {{ gettext('Quad Gantry Level') }}
-icon: home-z
-method: printer.gcode.script
-params: {"script":"QUAD_GANTRY_LEVEL"}
-enable: {{ printer.quad_gantry_level is defined }}
-
-[menu __main homing bed_mesh_calibrate]
-name: {{ gettext('Bed Mesh') }}
-icon: bed-level
-panel: bed_mesh
-enable: {{ printer.bed_mesh is defined }}
-
-[menu __main homing calibrate_z]
-name: {{ gettext('Calibrate Z') }}
-icon: home-z
-method: printer.gcode.script
-params: {"script":"CALIBRATE_Z"}
-enable: {{ printer.probe is defined }}
-
-[menu __main homing Z-Tilt]
-name: {{ gettext('Z Tilt') }}
-icon: z-tilt
-method: printer.gcode.script
-params: {"script":"Z_TILT_ADJUST"}
-enable: {{ printer.z_tilt is defined }}
-
-
-[menu __main actions move]
-name: {{ gettext('Move') }}
-icon: move
-panel: move
-
-[menu __main actions extrude]
-name: {{ gettext('Extrude') }}
-icon: filament
-panel: extrude
-
-[menu __main actions fan]
-name: {{ gettext('Fan') }}
-icon: fan
-panel: fan
-
-[menu __main actions temperature]
-name: {{ gettext('Temperature') }}
-icon: heat-up
-panel: temperature
-
-[menu __main actions macros]
-name: {{ gettext('Macros') }}
-icon: custom-script
-panel: gcode_macros
-enable: {{ printer.gcode_macros.count > 0 }}
-
-[menu __main actions power]
-name: {{ gettext('Power') }}
-icon: shutdown
-panel: power
-enable: {{ printer.power_devices.count > 0 }}
-
-[menu __main actions disablemotors]
-name: {{ gettext('Disable Motors') }}
-icon: motor-off
-method: printer.gcode.script
-params: {"script":"M18"}
-
-[menu __main actions console]
-name: {{ gettext('Console') }}
-icon: console
-panel: console
-
-[menu __main config bedlevel]
-name: {{ gettext('Bed Level') }}
-icon: bed-level
-panel: bed_level
-
-[menu __main config bedmesh]
-name: {{ gettext('Bed Mesh') }}
-icon: bed-level
-panel: bed_mesh
-enable: {{ printer.bed_mesh is defined }}
-
-[menu __main config zoffset]
-name: {{ gettext('Z Calibrate') }}
-icon: z-farther
-panel: zcalibrate
-enable: {{ ((printer.bltouch != False) or (printer.probe != False)) }}
-
-[menu __main config limits]
-name: {{ gettext('Limits') }}
-icon: fine-tune
-panel: limits
-
-[menu __main config network]
-name: {{ gettext('Network') }}
-icon: network
-panel: network
-
-[menu __main config system]
-name: {{ gettext('System') }}
-icon: info
-panel: system
-
-[menu __main config save]
-name: {{ gettext('Save Config') }}
-icon: complete
-method: printer.gcode.script
-params: {"script":"SAVE_CONFIG"}
-confirm:
-    {{ gettext('Save configuration.') }}
-
-    {{ gettext('Klipper will reboot') }}
-
-[menu __main config settings]
-name: {{ gettext('Settings') }}
-icon: settings
-panel: settings
-
-[menu __print]
-name: {{ gettext('Print Control') }}
-
-[menu __print temperature]
-name: {{ gettext('Temperature') }}
-icon: heat-up
-panel: temperature
-
-[menu __print fan]
-name: {{ gettext('Fan') }}
-icon: fan
-panel: fan
-
-[menu __print extrude]
-name: {{ gettext('Extrude') }}
-icon: filament
-panel: extrude
-enable: {{ printer.pause_resume.is_paused == True }}
-
-[menu __print power]
-name: {{ gettext('Power') }}
-icon: shutdown
-panel: power
-enable: {{ printer.power_devices.count > 0 }}
-
-[menu __print macros]
-name: {{ gettext('Macros') }}
-icon: custom-script
-panel: gcode_macros
-enable: {{ printer.gcode_macros.count > 0 }}
-
-[menu __print console]
-name: {{ gettext('Console') }}
-icon: console
-panel: console
-
-[menu __print limits]
-name: {{ gettext('Limits') }}
-icon: fine-tune
-panel: limits
-
-[menu __print network]
-name: {{ gettext('Network') }}
-icon: network
-panel: network
-
-[menu __print system]
-name: {{ gettext('System') }}
-icon: info
-panel: system
-
-[menu __print settings]
-name: {{ gettext('Settings') }}
-icon: settings
-panel: settings
-
-[menu __splashscreen]
-name: {{ gettext('Menu') }}
-
-[menu __splashscreen power]
-name: {{ gettext('Power') }}
-icon: shutdown
-panel: power
-enable: {{ printer.power_devices.count > 0 }}
-
-[menu __splashscreen network]
-name: {{ gettext('Network') }}
-icon: network
-panel: network
-
-[menu __splashscreen system]
-name: {{ gettext('System') }}
-icon: info
-panel: system
-
-[menu __splashscreen settings]
-name: {{ gettext('Settings') }}
-icon: settings
-panel: settings
 #~# --- Do not edit below this line. This section is auto generated --- #~#
 
 #~#
 #~# [main]
-#~# move_speed_xy = 50
 #~# print_sort_dir = date_desc
-#~# 
-#~# [displayed_macros Printer]
-#~# g32 = False
-#~# park = False
-#~# cancel_print = False
-#~# print_start = False
-#~# print_end = False
-#~# pause = False
-#~# print_layer_change = False
-#~# probe = False
-#~# resume = False
-#~# probe_calibrate = False
-#~# dump_warnings = False
-#~# dump_parameters = False
-#~# dump_settings = False
-#~# g0 = False
-#~# m900 = False
-#~# dump_config = False
-#~# get_probe_status = False
-#~# probe_abort = False
-#~# probe_accept = False
-#~# probe_accuracy = False
-#~# _set_current = False
-#~# _attach_probe = False
-#~# query_probe = False
-#~# set_probe_status = False
-#~# _cg28 = False
-#~# _user_variable = False
-#~# _set_acc = False
-#~# _mag_probe = False
-#~# _dock_probe = False
-#~# _z_move_check = False
-#~# zc = False
-#~# _probe_action = False
-#~# zm = False
-#~# ercf_calib_save_var = False
-#~# ercf_calib_unload = False
-#~# ercf_change_tool_slicer_end = False
-#~# ercf_calibrate_single = False
-#~# ercf_change_tool_standalone = False
-#~# ercf_change_tool = False
-#~# ercf_display_encoder_pos = False
-#~# ercf_calib_selector = False
-#~# ercf_check_if_resume = False
-#~# ercf_encoder_motion_issue = False
-#~# ercf_eject_unknow_state = False
-#~# ercf_select_tool = False
-#~# ercf_home_selector = False
-#~# ercf_eject_from_bowden = False
-#~# ercf_test_grip = False
-#~# ercf_change_tool_slicer = False
-#~# ercf_clog_or_runout = False
-#~# ercf_test_servo = False
-#~# ercf_is_filament_stuck_in_ercf = False
-#~# ercf_load_tool = False
-#~# ercf_unload_filament_in_extruder_with_tip_forming = False
-#~# ercf_load_filament_in_extruder = False
-#~# ercf_form_tip_standalone = False
-#~# ercf_is_filament_in_extruder = False
-#~# ercf_home_only = False
-#~# ercf_var = False
-#~# ercf_pause = False
-#~# ercf_unload_tool = False
-#~# ercf_test_load_sequence = False
-#~# ercf_test_move_gear = False
-#~# _timelapse_new_frame = False
-#~# timelapse_render = False
-#~# _set_timelapse_setup = False
-#~# test_stream_delay = False
-#~# move_speed = False
-#~# get_timelapse_setup = False
-#~# ercf_unselect_tool = False
-#~# hyperlapse = False
-#~# ercf_calibrate = False
-#~# t6 = False
-#~# t7 = False
-#~# t8 = False
 #~#