diff --git a/display.cfg b/display.cfg
index 35f2540..5f80b7e 100644
--- a/display.cfg
+++ b/display.cfg
@@ -49,3 +49,238 @@ gcode:
   SET_LED LED=btt_mini12864 RED=0.50 GREEN=0.00 BLUE=0.00 INDEX=1 TRANSMIT=0
   SET_LED LED=btt_mini12864 RED=0.13 GREEN=0.16 BLUE=1.00 INDEX=2 TRANSMIT=0
   SET_LED LED=btt_mini12864 RED=0.13 GREEN=0.16 BLUE=1.00 INDEX=3
+
+
+#####################################################################
+# Display Menu definition
+#####################################################################
+
+# Removed items
+[menu __main __octoprint]
+type: disabled
+
+## Control
+[menu __main __control __home]
+type: disabled
+
+[menu __main __control __homez]
+type: disabled
+
+[menu __main __control __homexy]
+type: disabled
+
+##  PreHeat
+[menu __main __temp __preheat_pla]
+type: disabled
+
+[menu __main __temp __preheat_abs]
+type: disabled
+
+##  use own load and unload macro
+[menu __main __filament __loadf]
+type: disabled
+
+[menu __main __filament __loads]
+type: disabled
+
+[menu __main __filament __unloadf]
+type: disabled
+
+[menu __main __filament __unloads]
+type: disabled
+
+## Control
+[menu __main __control __home]
+type: disabled
+
+[menu __main __control __homez]
+type: disabled
+
+[menu __main __control __homexy]
+type: disabled
+
+
+# Bed Probe
+[menu __main __setup __calib __bedprobe]
+type: disabled
+
+##  Delta Calibration
+[menu __main __setup __calib __delta_calib_auto]
+type: disabled
+
+[menu __main __setup __calib __delta_calib_man]
+type: disabled
+
+
+# Added Items to the Stock menu
+## Control
+[menu __main __control __home]
+type: input
+enable: {not printer.idle_timeout.state == "Printing"}
+name: Home: {['noop', 'ALL', 'XY', 'Z'][menu.input|int]}
+input: 0
+input_min: 0
+input_max: 3
+input_step: 1
+gcode:
+  {%- if menu.event == 'long_click' -%}
+    {[' ', 'G28', 'G28 XY', 'G28 Z'][menu.input|int]}
+  {%- endif -%}
+
+[menu __main __control __move]
+type: input
+enable: {not printer.idle_timeout.state == "Printing"}
+name: Move: {['FRONT CENTER', 'CENTER', 'REAR CENTER'][menu.input|int]}
+input: 0
+input_min: 0
+input_max: 2
+input_step: 1
+gcode:
+  {%- if menu.event == 'long_click' -%}
+    CENTER {['Y=15', '', 'Y=290'][menu.input|int]}
+  {%- endif -%}
+
+
+## Filament
+[menu __main __filament __preheat]
+type: input
+enable: {not printer.idle_timeout.state == "Printing"}
+name: Preheat: {['Off', 'ABS', 'PLA', 'PET'][menu.input|int]}
+input: 0
+input_min: 0
+input_max: 3
+input_step: 1
+gcode:
+  {%- if menu.event == 'long_click' -%}
+    M104 S{[0, 215, 190, 200][menu.input|int]}
+  {%- endif -%}
+
+
+[menu __main __filament __filament_load]
+type: input
+enable: {not printer.idle_timeout.state == "Printing"}
+name: Filament: {['noop', 'Load', 'Unload', 'Purge (10mm)'][menu.input|int]}
+input: 0
+input_min: 0
+input_max: 3
+input_step: 1
+gcode:
+  {%- if menu.event == 'long_click' -%}
+    {% if printer.extruder.can_extrude|lower == 'true' %}
+      M83
+      G1 {['E0', 'E50 F3000', 'E-75 F3000', 'E10 F300'][menu.input|int]}
+      G1 {['E0', 'E35 F300', 'E0', 'E0'][menu.input|int]}
+      M82
+    {% else %}
+      {action_respond_info("extruder not hot enough")}
+    {%- endif -%}
+  {%- endif -%}
+
+
+## Calibration
+[menu __main __setup __calib __bedprobe]
+type: command
+enable: {not printer.idle_timeout.state == "Printing"}
+name: Bed probe
+gcode:
+  {%- if printer.toolhead.position.y|float < 270 -%}
+    PROBE
+  {%- else -%}
+    {action_respond_info("Won't probe inunsafe position")}
+  {%- endif -%}
+
+
+## Probe & Endstop Z-Offset calibration
+[menu __main __setup __calib __Z_offset]
+type: list
+enable: {not printer.idle_timeout.state == "Printing"}
+name: Z offset
+
+[menu __main __setup __calib __Z_offset __start]
+type: input
+enable: {not printer.idle_timeout.state == "Printing"}
+name: Calibrate: {['noop','Probe','Endstop'][menu.input|int]}
+input: 0
+input_min: 0
+input_max: 2
+input_step: 1
+gcode:
+  {%- if menu.event == 'long_click' -%}
+    {menu.back()}
+  {%- endif -%}
+  {%- if menu.input|int == 1 -%}
+    {% if "xyz" in printer.toolhead.homed_axes %}
+      {action_respond_info("Start Probe calibration")}
+      CENTER
+      PROBE_CALIBRATE
+    {%- else -%}
+      {action_respond_info("Printer not homed")}
+    {%- endif -%}
+  {%- elif menu.input|int == 2 -%}
+    {% if "xyz" in printer.toolhead.homed_axes %}
+      {action_respond_info(" Start Z-Endstop calibration")}
+      CENTER
+      Z_ENDSTOP_CALIBRATE
+    {%- else -%}
+      {action_respond_info("Printer not homed")}
+    {%- endif -%}
+  {%- endif -%}
+
+
+[menu __main __setup __calib __Z_offset __move_z]
+type: input
+name: Move Z: {'%03.2f' % menu.input}
+input: {printer.gcode_move.gcode_position.z}
+input_step: 1
+realtime: True
+gcode:
+  {%- if menu.event == 'change' -%}
+    G1 Z{'%.2f' % menu.input}
+  {%- elif menu.event == 'long_click' -%}
+    G1 Z{'%.2f' % menu.input}
+    SAVE_GCODE_STATE NAME=__move__axis
+    G91
+    G1 Z2
+    G1 Z-2
+    RESTORE_GCODE_STATE NAME=__move__axis
+  {%- endif -%}
+
+[menu __main __setup __calib __Z_offset __test_z]
+type: input
+name: Test Z: {['-1.0', '-0.5', '-0.1', '-.05', '-.01', '0.0', '+0.01', '+0.05', '+0.1', '+0.5', '+1.0'][menu.input|int]}
+input: 5
+input_min: 0
+input_max: 10
+input_step: 1
+gcode:
+  {%- if menu.event == 'long_click' -%}
+    TESTZ Z={['-1.0', '-0.5', '-0.1', '-.05', '-.01', '0', '+0.01', '+0.05', '+0.1', '+0.5', '+1.0'][menu.input|int]}
+  {%- endif -%}
+
+[menu __main __setup __calib __Z_offset __test_z_live]
+type: input
+name: Test Z : {'%03.3f' % menu.input}
+input: 0
+input_min: -5.0
+input_max: 5.0
+input_step: 0.01
+realtime: True
+gcode:
+  {%- if menu.event == 'long_click' -%}
+    TESTZ Z={'%.3f' % menu.input}
+  {%- endif -%}
+
+[menu __main __setup __calib __Z_offset __accept]
+type: command
+name: Accept
+gcode: ACCEPT
+
+[menu __main __setup __calib __Z_offset __abort]
+type: command
+name: Abort
+gcode: ABORT
+
+[menu __main __setup __calib __Z_offset __saveconfig]
+type: command
+name: Save config
+gcode: SAVE_CONFIG
diff --git a/display_menu.cfg b/display_menu.cfg
deleted file mode 100644
index 66071d2..0000000
--- a/display_menu.cfg
+++ /dev/null
@@ -1,233 +0,0 @@
-#####################################################################
-# Display Menu definition
-#####################################################################
-
-# Removed items
-[menu __main __octoprint]
-type: disabled
-
-## Control
-[menu __main __control __home]
-type: disabled
-
-[menu __main __control __homez]
-type: disabled
-
-[menu __main __control __homexy]
-type: disabled
-
-##  PreHeat
-[menu __main __temp __preheat_pla]
-type: disabled
-
-[menu __main __temp __preheat_abs]
-type: disabled
-
-##  use own load and unload macro
-[menu __main __filament __loadf]
-type: disabled
-
-[menu __main __filament __loads]
-type: disabled
-
-[menu __main __filament __unloadf]
-type: disabled
-
-[menu __main __filament __unloads]
-type: disabled
-
-## Control
-[menu __main __control __home]
-type: disabled
-
-[menu __main __control __homez]
-type: disabled
-
-[menu __main __control __homexy]
-type: disabled
-
-
-# Bed Probe
-[menu __main __setup __calib __bedprobe]
-type: disabled
-
-##  Delta Calibration
-[menu __main __setup __calib __delta_calib_auto]
-type: disabled
-
-[menu __main __setup __calib __delta_calib_man]
-type: disabled
-
-
-# Added Items to the Stock menu
-## Control
-[menu __main __control __home]
-type: input
-enable: {not printer.idle_timeout.state == "Printing"}
-name: Home: {['noop', 'ALL', 'XY', 'Z'][menu.input|int]}
-input: 0
-input_min: 0
-input_max: 3
-input_step: 1
-gcode:
-  {%- if menu.event == 'long_click' -%}
-    {[' ', 'G28', 'G28 XY', 'G28 Z'][menu.input|int]}
-  {%- endif -%}
-
-[menu __main __control __move]
-type: input
-enable: {not printer.idle_timeout.state == "Printing"}
-name: Move: {['FRONT CENTER', 'CENTER', 'REAR CENTER'][menu.input|int]}
-input: 0
-input_min: 0
-input_max: 2
-input_step: 1
-gcode:
-  {%- if menu.event == 'long_click' -%}
-    CENTER {['Y=15', '', 'Y=290'][menu.input|int]}
-  {%- endif -%}
-
-
-## Filament
-[menu __main __filament __preheat]
-type: input
-enable: {not printer.idle_timeout.state == "Printing"}
-name: Preheat: {['Off', 'ABS', 'PLA', 'PET'][menu.input|int]}
-input: 0
-input_min: 0
-input_max: 3
-input_step: 1
-gcode:
-  {%- if menu.event == 'long_click' -%}
-    M104 S{[0, 215, 190, 200][menu.input|int]}
-  {%- endif -%}
-
-
-[menu __main __filament __filament_load]
-type: input
-enable: {not printer.idle_timeout.state == "Printing"}
-name: Filament: {['noop', 'Load', 'Unload', 'Purge (10mm)'][menu.input|int]}
-input: 0
-input_min: 0
-input_max: 3
-input_step: 1
-gcode:
-  {%- if menu.event == 'long_click' -%}
-    {% if printer.extruder.can_extrude|lower == 'true' %}
-      M83
-      G1 {['E0', 'E50 F3000', 'E-75 F3000', 'E10 F300'][menu.input|int]}
-      G1 {['E0', 'E35 F300', 'E0', 'E0'][menu.input|int]}
-      M82
-    {% else %}
-      {action_respond_info("extruder not hot enough")}
-    {%- endif -%}
-  {%- endif -%}
-
-
-## Calibration
-[menu __main __setup __calib __bedprobe]
-type: command
-enable: {not printer.idle_timeout.state == "Printing"}
-name: Bed probe
-gcode:
-  {%- if printer.toolhead.position.y|float < 270 -%}
-    PROBE
-  {%- else -%}
-    {action_respond_info("Won't probe inunsafe position")}
-  {%- endif -%}
-
-
-## Probe & Endstop Z-Offset calibration
-[menu __main __setup __calib __Z_offset]
-type: list
-enable: {not printer.idle_timeout.state == "Printing"}
-name: Z offset
-
-[menu __main __setup __calib __Z_offset __start]
-type: input
-enable: {not printer.idle_timeout.state == "Printing"}
-name: Calibrate: {['noop','Probe','Endstop'][menu.input|int]}
-input: 0
-input_min: 0
-input_max: 2
-input_step: 1
-gcode:
-  {%- if menu.event == 'long_click' -%}
-    {menu.back()}
-  {%- endif -%}
-  {%- if menu.input|int == 1 -%}
-    {% if "xyz" in printer.toolhead.homed_axes %}
-      {action_respond_info("Start Probe calibration")}
-      CENTER
-      PROBE_CALIBRATE
-    {%- else -%}
-      {action_respond_info("Printer not homed")}
-    {%- endif -%}
-  {%- elif menu.input|int == 2 -%}
-    {% if "xyz" in printer.toolhead.homed_axes %}
-      {action_respond_info(" Start Z-Endstop calibration")}
-      CENTER
-      Z_ENDSTOP_CALIBRATE
-    {%- else -%}
-      {action_respond_info("Printer not homed")}
-    {%- endif -%}
-  {%- endif -%}
-
-
-[menu __main __setup __calib __Z_offset __move_z]
-type: input
-name: Move Z: {'%03.2f' % menu.input}
-input: {printer.gcode_move.gcode_position.z}
-input_step: 1
-realtime: True
-gcode:
-  {%- if menu.event == 'change' -%}
-    G1 Z{'%.2f' % menu.input}
-  {%- elif menu.event == 'long_click' -%}
-    G1 Z{'%.2f' % menu.input}
-    SAVE_GCODE_STATE NAME=__move__axis
-    G91
-    G1 Z2
-    G1 Z-2
-    RESTORE_GCODE_STATE NAME=__move__axis
-  {%- endif -%}
-
-[menu __main __setup __calib __Z_offset __test_z]
-type: input
-name: Test Z: {['-1.0', '-0.5', '-0.1', '-.05', '-.01', '0.0', '+0.01', '+0.05', '+0.1', '+0.5', '+1.0'][menu.input|int]}
-input: 5
-input_min: 0
-input_max: 10
-input_step: 1
-gcode:
-  {%- if menu.event == 'long_click' -%}
-    TESTZ Z={['-1.0', '-0.5', '-0.1', '-.05', '-.01', '0', '+0.01', '+0.05', '+0.1', '+0.5', '+1.0'][menu.input|int]}
-  {%- endif -%}
-
-[menu __main __setup __calib __Z_offset __test_z_live]
-type: input
-name: Test Z : {'%03.3f' % menu.input}
-input: 0
-input_min: -5.0
-input_max: 5.0
-input_step: 0.01
-realtime: True
-gcode:
-  {%- if menu.event == 'long_click' -%}
-    TESTZ Z={'%.3f' % menu.input}
-  {%- endif -%}
-
-[menu __main __setup __calib __Z_offset __accept]
-type: command
-name: Accept
-gcode: ACCEPT
-
-[menu __main __setup __calib __Z_offset __abort]
-type: command
-name: Abort
-gcode: ABORT
-
-[menu __main __setup __calib __Z_offset __saveconfig]
-type: command
-name: Save config
-gcode: SAVE_CONFIG
diff --git a/printer.cfg b/printer.cfg
index 0d3729a..111b348 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -47,7 +47,6 @@ square_corner_velocity: 5.0
 [include fluidd.cfg]
 [include macros.cfg]
 [include display.cfg]
-[include display_menu.cfg]
 [include neopixel.cfg]
 [include fans.cfg]