diff --git a/_saved_variables/variables.cfg b/_saved_variables/variables.cfg
index 11cbc3b..69916f4 100644
--- a/_saved_variables/variables.cfg
+++ b/_saved_variables/variables.cfg
@@ -1,3 +1,5 @@
 [Variables]
+led_brightness = 0.5
 plate_name = 'Smooth'
 plate_offset_z = -0.03
+
diff --git a/hw_config/bed.cfg b/hw_config/bed.cfg
index 4b42cbc..4e309b7 100644
--- a/hw_config/bed.cfg
+++ b/hw_config/bed.cfg
@@ -1,45 +1,47 @@
-## BED CONFIG ##
-
-[probe]
-pin: P0.10
-x_offset: 24.
-y_offset: 5.
-z_offset = 1.400
-speed: 10.0
-samples: 1
-sample_retract_dist: 2.0
-
-[bed_mesh]
-speed: 120
-#horizontal_move_z: 5
-mesh_min: 35, 6
-mesh_max: 240,198
-probe_count: 5, 5
-fade_start: 1.0
-fade_end: 10.0
-move_check_distance: 5.0
-#split_delta_z: .025
-mesh_pps: 2,2
-algorithm: lagrange
-bicubic_tension: .2
-
-[heater_bed]
-heater_pin: P2.5
-sensor_type: EPCOS 100K B57560G104F
-sensor_pin: P0.25
-control = pid
-pid_kp = 56.165
-pid_ki = 0.816
-pid_kd = 966.747
-min_temp: 0
-max_temp: 130
-
-#[z_tilt]
-#z_positions:
-#    0, 112
-#    230, 112
-#points:
-#    2, 112
-#    210, 112
-#speed: 120
+## BED CONFIG ##
+
+[probe]
+pin: PE4
+x_offset: 24.
+y_offset: 5.
+z_offset = 1.400
+speed: 10.0
+samples: 1
+sample_retract_dist: 2.0
+
+[bed_mesh]
+speed: 180
+#horizontal_move_z: 5
+mesh_min: 35, 6
+mesh_max: 240,198
+probe_count: 7, 7
+fade_start: 1.0
+fade_end: 10.0
+move_check_distance: 5.0
+#split_delta_z: .025
+mesh_pps: 3,3
+algorithm: bicubic
+bicubic_tension: .2
+#faulty_region_1_min: 170.0, 165.0
+#faulty_region_1_max: 240.0, 198.0
+
+[heater_bed]
+heater_pin: PD7
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: PA1
+control = pid
+pid_kp = 56.814
+pid_ki = 0.724
+pid_kd = 1114.268
+min_temp: 0
+max_temp: 130
+
+#[z_tilt]
+#z_positions:
+#    0, 112
+#    230, 112
+#points:
+#    2, 112
+#    210, 112
+#speed: 120
 #horizontal_move_z: 5
\ No newline at end of file
diff --git a/hw_config/display.cfg b/hw_config/display.cfg
index 989bd08..c027a79 100644
--- a/hw_config/display.cfg
+++ b/hw_config/display.cfg
@@ -1,30 +1,33 @@
-########################################
-# EXP1 / EXP2 (display) pins
-########################################
-
-[board_pins]
-aliases:
-    # EXP1 header
-    EXP1_1=P1.30, EXP1_3=P1.18, EXP1_5=P1.20, EXP1_7=P1.22, EXP1_9=<GND>,
-    EXP1_2=P0.28, EXP1_4=P1.19, EXP1_6=P1.21, EXP1_8=P1.23, EXP1_10=<5V>,
-    # EXP2 header
-    EXP2_1=P0.17, EXP2_3=P3.26, EXP2_5=P3.25, EXP2_7=P1.31, EXP2_9=<GND>,
-    EXP2_2=P0.15, EXP2_4=P0.16, EXP2_6=P0.18, EXP2_8=<RST>, EXP2_10=<NC>
-    # Pins EXP2_1, EXP2_6, EXP2_2 are also MISO, MOSI, SCK of bus "ssp0"
-
-# See the sample-lcd.cfg file for definitions of common LCD displays.
-
-[display]
-lcd_type: hd44780
-rs_pin: EXP1_4
-e_pin: EXP1_3
-d4_pin: EXP1_5
-d5_pin: EXP1_6
-d6_pin: EXP1_7
-d7_pin: EXP1_8
-encoder_pins: ^EXP2_3, ^EXP2_5
-click_pin: ^!EXP1_2
-#kill_pin: ^!EXP2_8
-
-[output_pin beeper]
-pin: EXP1_1
\ No newline at end of file
+########################################
+# EXP1 / EXP2 (display) pins
+########################################
+
+[board_pins]
+aliases:
+    # EXP1 header
+    EXP1_1=PC5, EXP1_3=PB1, EXP1_5=PE10, EXP1_7=PE12, EXP1_9=<GND>,
+    EXP1_2=PB0, EXP1_4=PE9, EXP1_6=PE11, EXP1_8=PE13, EXP1_10=<5V>,
+    # EXP2 header
+    EXP2_1=PA6, EXP2_3=PE7, EXP2_5=PB2, EXP2_7=PC4,   EXP2_9=<GND>,
+    EXP2_2=PA5, EXP2_4=PA4, EXP2_6=PA7, EXP2_8=<RST>, EXP2_10=<NC>
+# See the sample-lcd.cfg file for definitions of common LCD displays.
+
+[display]
+lcd_type: hd44780
+rs_pin: EXP1_4
+e_pin: EXP1_3
+d4_pin: EXP1_5
+d5_pin: EXP1_6
+d6_pin: EXP1_7
+d7_pin: EXP1_8
+encoder_pins: ^EXP2_3, ^EXP2_5
+click_pin: ^!EXP1_2
+#kill_pin: ^!EXP2_8
+
+[output_pin beeper]
+pin: EXP1_1
+pwm: True
+value: 0
+shutdown_value:0
+cycle_time: 0.001
+scale: 1000
\ No newline at end of file
diff --git a/hw_config/extruder.cfg b/hw_config/extruder.cfg
index b1cf2ff..8f1b704 100644
--- a/hw_config/extruder.cfg
+++ b/hw_config/extruder.cfg
@@ -1,38 +1,34 @@
-## EXTRUDER ##
-
-[extruder]
-step_pin: P2.13
-dir_pin: !P0.11
-enable_pin: !P2.12
-microsteps: 32
-rotation_distance: 22.598
-full_steps_per_rotation: 200
-gear_ratio: 50:17
-nozzle_diameter: 0.600
-filament_diameter: 1.750
-max_extrude_cross_section: 50.0
-max_extrude_only_distance: 100.0
-max_extrude_only_velocity: 120.0
-max_extrude_only_accel: 1250.0
-pressure_advance: 0.039000
-pressure_advance_smooth_time: 0.040
-heater_pin: P2.7
-sensor_type: ATC Semitec 104GT-2
-sensor_pin: P0.24
-control = pid
-pid_Kp=33.354 
-pid_Ki=2.021 
-pid_Kd=137.585
-min_extrude_temp: 180
-min_temp: 0
-max_temp: 280
-
-[tmc2209 extruder]
-diag_pin: P1.26
-uart_pin: P1.4
-run_current: 0.550
-hold_current: 0.400
-stealthchop_threshold: 50
-interpolate: True
-driver_SGTHRS: 120
-sense_resistor: 0.11
\ No newline at end of file
+## EXTRUDER ##
+
+[extruder]
+step_pin: PD15
+dir_pin: !PD14
+enable_pin: !PC7
+microsteps: 32
+rotation_distance: 22.598
+full_steps_per_rotation: 200
+gear_ratio: 50:17
+nozzle_diameter: 0.600
+filament_diameter: 1.750
+max_extrude_cross_section: 50.0
+max_extrude_only_distance: 100.0
+max_extrude_only_velocity: 120.0
+max_extrude_only_accel: 1250.0
+pressure_advance: 0.039
+pressure_advance_smooth_time: 0.040
+heater_pin: PB3
+sensor_type: ATC Semitec 104GT-2
+sensor_pin: PA2
+control = pid
+pid_Kp=35.207
+pid_Ki=2.153
+pid_Kd=143.908
+min_extrude_temp: 180
+min_temp: 0
+max_temp: 305
+
+[tmc2209 extruder]
+uart_pin: PC6
+run_current: 0.640
+hold_current: 0.5
+stealthchop_threshold: 50
\ No newline at end of file
diff --git a/hw_config/fans.cfg b/hw_config/fans.cfg
new file mode 100644
index 0000000..833827e
--- /dev/null
+++ b/hw_config/fans.cfg
@@ -0,0 +1,14 @@
+[fan]
+pin: PB7
+
+[heater_fan extruder_fan]
+pin: PB6
+heater_temp: 50
+
+#[temperature_fan rpi_fan]
+#pin: rpi:gpio20
+#sensor_type: temperature_host
+#control: watermark
+#min_temp: 15
+#max_temp: 80
+#target_temp: 50
\ No newline at end of file
diff --git a/hw_config/filament_sensor.cfg b/hw_config/filament_sensor.cfg
new file mode 100644
index 0000000..59dbdcd
--- /dev/null
+++ b/hw_config/filament_sensor.cfg
@@ -0,0 +1,12 @@
+## FILAMENT SENSOR ##
+[filament_switch_sensor fsensor]
+pause_on_runout: True
+runout_gcode:
+ M118 Filament Runout Detected
+ M600
+insert_gcode:
+ M118 Filament Load Detected
+ LOAD_FILAMENT
+event_delay: 3.0
+pause_delay: 0.01
+switch_pin: !PA0
\ No newline at end of file
diff --git a/hw_config/input_shaper.cfg b/hw_config/input_shaper.cfg
index 9d91456..3834405 100644
--- a/hw_config/input_shaper.cfg
+++ b/hw_config/input_shaper.cfg
@@ -1,20 +1,17 @@
-[mcu rpi]
-serial: /tmp/klipper_host_mcu
-
-## INPUT SHAPER ##
-
-#[adxl345]
-#cs_pin: rpi:None
-
-#[resonance_tester]
-#accel_chip: adxl345
-#probe_points:
-#    130,100,10
-#    100,100,10
-#    90,100,10
-
-#[input_shaper]
-#shaper_freq_x: 48.0
-#shaper_type_x: ei
-#shaper_freq_y: 28.6
+## INPUT SHAPER ##
+
+#[adxl345]
+#cs_pin: rpi:None
+
+#[resonance_tester]
+#accel_chip: adxl345
+#probe_points:
+#    130,100,10
+#    100,100,10
+#    90,100,10
+
+#[input_shaper]
+#shaper_freq_x: 53.6
+#shaper_type_x: ei
+#shaper_freq_y: 28.6
 #shaper_type_y: zv
\ No newline at end of file
diff --git a/hw_config/led.cfg b/hw_config/led.cfg
new file mode 100644
index 0000000..8ce526c
--- /dev/null
+++ b/hw_config/led.cfg
@@ -0,0 +1,18 @@
+[neopixel downlight]
+pin: PE6
+#   The pin connected to the neopixel. This parameter must be
+#   provided.
+chain_count: 15
+#   The number of Neopixel chips that are "daisy chained" to the
+#   provided pin. The default is 1 (which indicates only a single
+#   Neopixel is connected to the pin).
+color_order: GRB
+#   Set the pixel order required by the LED hardware. Options are GRB,
+#   RGB, GRBW, or RGBW. The default is GRB.
+initial_RED: 0.0
+initial_GREEN: 0.0
+initial_BLUE: 0.0
+#initial_WHITE: 1.0
+#   Sets the initial LED color of the Neopixel. Each value should be
+#   between 0.0 and 1.0. The WHITE option is only available on RGBW
+#   LEDs. The default for each color is 0.
\ No newline at end of file
diff --git a/hw_config/stepper_xyz.cfg b/hw_config/stepper_xyz.cfg
index 1986e5a..a0df172 100644
--- a/hw_config/stepper_xyz.cfg
+++ b/hw_config/stepper_xyz.cfg
@@ -1,87 +1,88 @@
-## STEPPER X ##
-
-[stepper_x]
-step_pin: P2.2
-dir_pin: !P2.6
-enable_pin: !P2.1
-microsteps: 32
-rotation_distance: 32
-full_steps_per_rotation: 200
-endstop_pin: tmc2209_stepper_x:virtual_endstop
-position_endstop: 0
-position_max: 250
-homing_speed: 100
-homing_retract_dist: 0
-
-[tmc2209 stepper_x]
-diag_pin: P1.29
-uart_pin: P1.10
-run_current: 0.650
-hold_current: 0.500
-stealthchop_threshold: 200
-driver_SGTHRS: 110
-sense_resistor: 0.11
-
-
-## STEPPER Y ##
-
-[stepper_y]
-step_pin: P0.19
-dir_pin: P0.20
-enable_pin: !P2.8
-microsteps: 32
-rotation_distance: 32
-full_steps_per_rotation: 200
-endstop_pin: tmc2209_stepper_y:virtual_endstop
-position_endstop: -4
-position_max: 210
-position_min: -4
-homing_speed: 50
-homing_retract_dist: 0
-
-[tmc2209 stepper_y]
-diag_pin: P1.28
-uart_pin: P1.9
-run_current: 0.700
-hold_current: 0.500
-stealthchop_threshold: 200
-driver_SGTHRS: 120
-sense_resistor: 0.11
-
-## STEPPER Z ##
-
-[stepper_z]
-step_pin: P0.22
-dir_pin: P2.11
-enable_pin: !P0.21
-microsteps: 32
-rotation_distance: 8
-full_steps_per_rotation: 200
-endstop_pin: probe:z_virtual_endstop
-position_max: 210
-position_min: -2.5
-
-[tmc2209 stepper_z]
-diag_pin: P1.27
-uart_pin: P1.8
-run_current: 0.650
-hold_current: 0.450
-stealthchop_threshold: 50
-interpolate: True
-driver_SGTHRS: 255
-sense_resistor: 0.11
-
-#[stepper_z1]
-#step_pin: P1.15
-#dir_pin: P1.14
-#enable_pin: !P1.16
-#microsteps: 32
-#rotation_distance: 8
-#full_steps_per_rotation: 200
-
-#[tmc2209 stepper_z1]
-#uart_pin: P1.1
-#diag_pin: P1.25
-#run_current: 0.650
-#hold_current: 0.450
+## STEPPER X ##
+
+[stepper_x]
+step_pin: PE2
+dir_pin: !PE1
+enable_pin: !PE3
+
+microsteps: 32
+rotation_distance: 32
+full_steps_per_rotation: 200
+endstop_pin: tmc2209_stepper_x:virtual_endstop
+position_endstop: 0
+position_max: 250
+homing_speed: 100
+homing_retract_dist: 0
+
+[tmc2209 stepper_x]
+uart_pin: PE0
+diag_pin: PC1
+run_current: 0.7
+hold_current: 0.500
+stealthchop_threshold: 200
+driver_SGTHRS: 110
+#sense_resistor: 0.11
+
+
+## STEPPER Y ##
+
+[stepper_y]
+step_pin: PD5
+dir_pin: PD4
+enable_pin: !PD6
+microsteps: 32
+rotation_distance: 32
+full_steps_per_rotation: 200
+endstop_pin: tmc2209_stepper_y:virtual_endstop
+position_endstop: -4
+position_max: 210
+position_min: -4
+homing_speed: 50
+homing_retract_dist: 0
+
+[tmc2209 stepper_y]
+uart_pin: PD3
+diag_pin: PC3
+run_current: 0.700
+hold_current: 0.500
+stealthchop_threshold: 200
+driver_SGTHRS: 100
+#sense_resistor: 0.11
+
+## STEPPER Z ##
+
+[stepper_z]
+step_pin: PA15
+dir_pin: PA8
+enable_pin: !PD1
+microsteps: 32
+rotation_distance: 8
+full_steps_per_rotation: 200
+endstop_pin: probe:z_virtual_endstop
+position_max: 215
+position_min: -2.5
+
+[tmc2209 stepper_z]
+uart_pin: PD0
+diag_pin: PC0
+run_current: 0.650
+hold_current: 0.450
+stealthchop_threshold: 50
+interpolate: True
+driver_SGTHRS: 255
+#sense_resistor: 0.11
+
+#[stepper_z1]
+#step_pin: P1.15
+#dir_pin: P1.14
+#enable_pin: !P1.16
+#microsteps: 32
+#rotation_distance: 8
+#full_steps_per_rotation: 200
+
+#[tmc2209 stepper_z1]
+#uart_pin: P1.1
+#diag_pin: P1.25
+#run_current: 0.650
+#hold_current: 0.450
 #stealthchop_threshold: 50
\ No newline at end of file
diff --git a/macros/beeper.cfg b/macros/beeper.cfg
new file mode 100644
index 0000000..538dec2
--- /dev/null
+++ b/macros/beeper.cfg
@@ -0,0 +1,8 @@
+[gcode_macro M300]
+gcode:
+    {% set S = params.S|default(1000)|int %}
+    {% set P = params.P|default(100)|int %}
+
+    SET_PIN PIN=beeper VALUE={S}
+    G4 P{P}
+    SET_PIN PIN=beeper VALUE=0
\ No newline at end of file
diff --git a/macros/client_macros.cfg b/macros/client_macros.cfg
index 81de556..4717eb8 100644
--- a/macros/client_macros.cfg
+++ b/macros/client_macros.cfg
@@ -7,13 +7,14 @@
 # [include client_macros.cfg]
 
 [gcode_macro PARKING_POSITION]
-default_parameter_RAISE_Z_MIN_POSITION: 50
-default_parameter_RAISE_Z_DISTANCE: 40
-default_parameter_Z_SPEED: 600
-default_parameter_XY_SPEED: 4500
-default_parameter_PARKING_POSITION_X: 10
-default_parameter_PARKING_POSITION_Y: 200
 gcode:
+  	{% set RAISE_Z_MIN_POSITION = params.RAISE_Z_MIN_POSITION|default(50)|float %}
+  	{% set RAISE_Z_DISTANCE = params.RAISE_Z_DISTANCE|default(40)|float %}
+  	{% set Z_SPEED = params.Z_SPEED|default(600)|float %}
+  	{% set XY_SPEED = params.XY_SPEED|default(4500)|float %}
+  	{% set PARKING_POSITION_X = params.PARKING_POSITION_X|default(10)|float %}
+  	{% set PARKING_POSITION_Y = params.PARKING_POSITION_Y|default(200)|float %}
+
     {% set MAX_Z = (printer.configfile.config["stepper_z"]["position_max"] | min) %}
 
     {% if 'z' in printer.toolhead.homed_axes %}
@@ -91,7 +92,7 @@ gcode:
     BED_MESH_CALIBRATE
 
     M117 Preparing for print...
-    G1 X2.0 Y-3.0 Z1 F4000.0 ; goto start position for line
+    G1 X10.0 Y-3.0 Z1 F4000.0 ; goto start position for line
 
     M117 Heating extruder...
     M109 S{EXTRUDER_TEMP} ; set and wait for extruder temp
@@ -102,13 +103,13 @@ gcode:
     G1 Z0.2 F800 ;
     G92 E0.0 ; reset extruder distance position
     G91 ; relative positioning
-    G1 E7 F1000 ; Purge Bubble
+    G1 E8 F1000 ; Purge Bubble
     M117 Purge line 1/2...
     G1 X60.0 E9  F1000 ; intro line
-    G1 X70.0 E14  F1000 ; intro line
-    M117 Purge line 2/2...
-    G1 X1 Z0.1 F1000 ; outro line
-    G1 X20 Z0.05 F1000 ; outro line
+    G1 X60.0 E14  F1000 ; intro line
+    #M117 Purge line 2/2...
+    #G1 X1 Z0.1 F1000 ; outro line
+    #G1 X20 Z0.05 F1000 ; outro line
 
     M117 Starting print...
 
@@ -121,10 +122,10 @@ gcode:
 
 [gcode_macro M600]
 variable_extr_temp: 0
-default_parameter_X: 100
-default_parameter_Y: 0
-default_parameter_Z: 10
 gcode:
+  	{% set X = params.X|default(100)|float %}
+  	{% set Y = params.Y|default(0)|float %}
+  	{% set Z = params.Z|default(10)|float %}
     PAUSE
     G91
     G1 E-.8 F2700
@@ -164,7 +165,6 @@ gcode:
     G92 E0.0
     M400
     M117 Remove Filament Now!
-    M300 S300 P1000
     UPDATE_DELAYED_GCODE ID=clear_display DURATION=5
     SET_FILAMENT_SENSOR SENSOR=fsensor ENABLE=1
 
@@ -193,8 +193,8 @@ gcode:
   ##### calculate save lift position #####
   {% set max_z = printer.toolhead.axis_maximum.z|float %}
   {% set act_z = printer.toolhead.position.z|float %}
-  {% if act_z < (max_z - 10.0) %}
-      {% set z_safe = 10.0 %}
+  {% if act_z < (max_z - 20.0) %}
+      {% set z_safe = 20.0 %}
   {% else %}
       {% set z_safe = max_z - act_z %}
   {% endif %}
@@ -224,6 +224,13 @@ gcode:
 gcode:
   G1 X0 Y0 F2000
 
+[gcode_macro LED_ON]
+gcode:
+  SET_LED LED=downlight RED={printer.save_variables.variables.led_brightness} GREEN={printer.save_variables.variables.led_brightness} BLUE={printer.save_variables.variables.led_brightness}
+
+[gcode_macro LED_OFF]
+gcode:
+  SET_LED LED=downlight RED=0 GREEN=0 BLUE=0
 
 [gcode_macro TEST_NOISE_X]
 gcode:
diff --git a/menu/flex_plate_menu.cfg b/menu/flex_plate_menu.cfg
index 4afc934..a28466f 100644
--- a/menu/flex_plate_menu.cfg
+++ b/menu/flex_plate_menu.cfg
@@ -1,33 +1,33 @@
-## FlexPlate selection (thx to alexz on voron discord)
-[menu __main __flexplate]
-type: list
-name: Flexplate
-index: 1
-
-[menu __main __flexplate __act]
-type: command
-name:  Act: {printer.save_variables.variables.plate_name} 
-
-
-[menu __main __flexplate __set]
-type: input
-name:  Set: {['Textur','Smooth','Satin'][menu.input|int]}
-input: 0
-input_min: 0
-input_max: 2
-gcode:
-    {%- if menu.event == 'long_click' -%}
-      {%- if menu.input|int == 1 -%}
-        SAVE_VARIABLE VARIABLE=plate_name VALUE='"Smooth"'
-        SAVE_VARIABLE VARIABLE=plate_offset_z VALUE=-0.03
-        OFFSET_FROM_VARS
-      {%- elif menu.input|int == 2 -%}
-        SAVE_VARIABLE VARIABLE=plate_name VALUE='"Satin"'
-        SAVE_VARIABLE VARIABLE=plate_offset_z VALUE=0.000
-        OFFSET_FROM_VARS
-      {%- else -%}
-        SAVE_VARIABLE VARIABLE=plate_name VALUE='"Textur"'
-        SAVE_VARIABLE VARIABLE=plate_offset_z VALUE=0.000
-        OFFSET_FROM_VARS
-      {%- endif -%}
+## FlexPlate selection (thx to alexz on voron discord)
+[menu __main __flexplate]
+type: list
+name: Flexplate
+index: 1
+
+[menu __main __flexplate __act]
+type: command
+name:  Act: {printer.save_variables.variables.plate_name} 
+
+
+[menu __main __flexplate __set]
+type: input
+name:  Set: {['Textur','Smooth','Satin'][menu.input|int]}
+input: 0
+input_min: 0
+input_max: 2
+gcode:
+    {%- if menu.event == 'long_click' -%}
+      {%- if menu.input|int == 1 -%}
+        SAVE_VARIABLE VARIABLE=plate_name VALUE='"Smooth"'
+        SAVE_VARIABLE VARIABLE=plate_offset_z VALUE=-0.03
+        OFFSET_FROM_VARS
+      {%- elif menu.input|int == 2 -%}
+        SAVE_VARIABLE VARIABLE=plate_name VALUE='"Satin"'
+        SAVE_VARIABLE VARIABLE=plate_offset_z VALUE=0.000
+        OFFSET_FROM_VARS
+      {%- else -%}
+        SAVE_VARIABLE VARIABLE=plate_name VALUE='"Textur"'
+        SAVE_VARIABLE VARIABLE=plate_offset_z VALUE=-0.335
+        OFFSET_FROM_VARS
+      {%- endif -%}
     {%- endif -%}
\ No newline at end of file
diff --git a/menu/led.cfg b/menu/led.cfg
new file mode 100644
index 0000000..a84d879
--- /dev/null
+++ b/menu/led.cfg
@@ -0,0 +1,29 @@
+[menu __main __led]
+type: list
+name: LED
+index: 1
+
+[menu __main __led __on]
+type: command
+name:  On
+gcode:
+  LED_ON
+
+
+[menu __main __led __off]
+type: command
+name:  Off
+gcode:
+  LED_OFF
+
+[menu __main __led __brightness]
+type: input
+name: Brightness: {'%f' % (menu.input)}
+input: {printer.save_variables.variables.led_brightness}
+input_min: 0
+input_max: 1
+input_step: 0.1
+realtime: True
+gcode:
+    SAVE_VARIABLE VARIABLE=led_brightness VALUE={menu.input}
+    SET_LED LED=downlight RED={menu.input} GREEN={menu.input} BLUE={menu.input}
\ No newline at end of file
diff --git a/menu/menu.cfg b/menu/menu.cfg
index b27b12e..b0d167d 100644
--- a/menu/menu.cfg
+++ b/menu/menu.cfg
@@ -1,44 +1,64 @@
-[menu __main __temp __preheat_petg]
-type: list
-name: Preheat PETG
-
-[menu __main __temp __preheat_petg __all]
-type: command
-enable: {('extruder' in printer) and ('heater_bed' in printer)}
-name: Preheat all
-gcode:
-    M140 S80
-    M104 S235
-
-[menu __main __temp __preheat_petg __hotend]
-type: command
-enable: {'extruder' in printer}
-name: Preheat hotend
-gcode: M104 S235
-
-[menu __main __temp __preheat_petg __hotbed]
-type: command
-enable: {'heater_bed' in printer}
-name: Preheat hotbed
-gcode: M140 S80
-
-
-[menu __main __filament __unload_filament_fully]
-type: command
-name: Unload Filament
-gcode:
-    UNLOAD_FILAMENT
-
-[menu __filament __load]
-type: command
-name: Load Filament
-gcode:
-    LOAD_FILAMENT
-
-[menu __filament __unload]
-type: command
-name: Unload Filament
-gcode:
-    UNLOAD_FILAMENT
-
-[include flex_plate_menu.cfg]
\ No newline at end of file
+[menu __main __temp __preheat_petg]
+type: list
+name: Preheat PETG
+
+[menu __main __temp __preheat_petg __all]
+type: command
+enable: {('extruder' in printer) and ('heater_bed' in printer)}
+name: Preheat all
+gcode:
+    M140 S80
+    M104 S235
+
+[menu __main __temp __preheat_petg __hotend]
+type: command
+enable: {'extruder' in printer}
+name: Preheat hotend
+gcode: M104 S235
+
+[menu __main __temp __preheat_petg __hotbed]
+type: command
+enable: {'heater_bed' in printer}
+name: Preheat hotbed
+gcode: M140 S80
+
+[menu __main __temp __preheat_greentec_pro]
+type: list
+name: Preheat GreenTEC Pro
+
+[menu __main __temp __preheat_greentec_pro __all]
+type: command
+enable: {('extruder' in printer) and ('heater_bed' in printer)}
+name: Preheat all
+gcode:
+    M140 S70
+    M104 S240
+
+[menu __main __temp __preheat_greentec_pro __hotend]
+type: command
+enable: {'extruder' in printer}
+name: Preheat hotend
+gcode: M104 S240
+
+[menu __main __temp __preheat_greentec_pro __hotbed]
+type: command
+enable: {'heater_bed' in printer}
+name: Preheat hotbed
+gcode: M140 S70
+
+
+
+[menu __main __filament __unload_filament_fully]
+type: command
+name: Unload Filament
+gcode:
+    UNLOAD_FILAMENT
+
+[menu __main __resume]
+type: command
+name: Resume Print
+gcode:
+    RESUME
+
+[include flex_plate_menu.cfg]
+[include led.cfg]
\ No newline at end of file
diff --git a/moonraker.conf b/moonraker.conf
index 25f4ea7..ab5dc99 100644
--- a/moonraker.conf
+++ b/moonraker.conf
@@ -2,23 +2,9 @@
 host: 0.0.0.0
 port: 7125
 enable_debug_logging: False
-config_path: ~/klipper_config
 
-[authorization]
-enabled: True
-cors_domains:
-    https://my.mainsail.xyz
-    http://my.mainsail.xyz
-    http://*.local
-    http://*.lan
-trusted_clients:
-    10.0.0.0/8
-    127.0.0.0/8
-    169.254.0.0/16
-    172.16.0.0/12
-    192.168.0.0/16
-    FE80::/10
-    ::1/128
+[file_manager]
+config_path: ~/klipper_config
 
 # enables partial support of Octoprint API
 [octoprint_compat]
@@ -32,4 +18,18 @@ trusted_clients:
 [update_manager client mainsail]
 type: web
 repo: meteyou/mainsail
-path: ~/mainsail
\ No newline at end of file
+path: ~/mainsail
+
+
+[mqtt]
+address: lanstorage
+port: 1883
+mqtt_protocol: v3.1.1
+enable_moonraker_api: True
+instance_name: bear
+status_objects:
+  extruder=temperature
+  webhooks
+  heater_bed=temperature
+  fan
+default_qos: 0
\ No newline at end of file
diff --git a/printer.cfg b/printer.cfg
index 825753d..e11fe93 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -5,36 +5,28 @@
 # See docs/Config_Reference.md for a description of parameters.
 
 [mcu]
-serial: /dev/serial/by-id/usb-Klipper_lpc1769_0C200117A9846AAFCAF8545EC22000F5-if00
-
-## FILAMENT SENSOR ##
-[filament_switch_sensor fsensor]
-pause_on_runout: True
-runout_gcode:
- M118 Filament Runout Detected
- M600
-insert_gcode:
- M118 Filament Load Detected
- LOAD_FILAMENT
-event_delay: 3.0
-pause_delay: 0.01
-switch_pin: !P1.25
-
-[fan]
-pin: P2.3
+serial: /dev/serial/by-id/usb-Klipper_stm32f407xx_400037000F47393437303337-if00
+
+ #[mcu rpi]
+#serial: /tmp/klipper_host_mcu
+
+## MOTOR POWER ##
+[output_pin motor_power]
+pin: PC13
+value: 1
 
 [printer]
 kinematics: cartesian
-max_velocity: 400
-max_accel: 500
-max_accel_to_decel: 500
-max_z_velocity: 10
-max_z_accel: 100
+max_velocity: 250
+max_accel: 3000
+max_z_velocity: 15
+max_z_accel: 300
+square_corner_velocity: 5.0
 
 [safe_z_home]
 home_xy_position: 2,2
 speed: 60
-z_hop: 10
+z_hop: 6
 z_hop_speed: 10
 
 ## INCLUDE CONFIGS ##
@@ -42,12 +34,20 @@ z_hop_speed: 10
 [include hw_config/bed.cfg]
 [include hw_config/display.cfg]
 [include hw_config/extruder.cfg]
+[include hw_config/filament_sensor.cfg]
+[include hw_config/fans.cfg]
 [include hw_config/stepper_xyz.cfg]
 [include hw_config/input_shaper.cfg]
+[include hw_config/led.cfg]
+
+## INCLUDE MACROS
 
 [include macros/client_macros.cfg]
-[include menu/menu.cfg]
+[include macros/beeper.cfg]
 
+## INCLUDE MENU
+
+[include menu/menu.cfg]
 
 ## MISC ##
 
@@ -64,6 +64,11 @@ default_type: command
 [save_variables]
 filename: ~/klipper_config/_saved_variables/variables.cfg
 
+[temperature_sensor raspberry_pi]
+sensor_type: temperature_host
+min_temp: 10
+max_temp: 100
+
 [delayed_gcode clear_display]
 initial_duration: 0.
 gcode:
@@ -80,18 +85,20 @@ gcode:
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	  0.006250, 0.046250, -0.033750, -0.036250, -0.073750
-#*# 	  0.056250, 0.092500, 0.033750, -0.001250, -0.070000
-#*# 	  0.017500, 0.056250, 0.016250, -0.036250, -0.055000
-#*# 	  0.032500, 0.041250, -0.022500, -0.030000, -0.040000
-#*# 	  -0.001250, -0.022500, -0.048750, -0.082500, -0.035000
+#*# 	  -0.025000, 0.012500, 0.047500, -0.016250, 0.017500, -0.031250, -0.015000
+#*# 	  0.045000, 0.098750, 0.095000, 0.080000, 0.065000, 0.021250, -0.021250
+#*# 	  0.062500, 0.095000, 0.096250, 0.065000, 0.062500, 0.038750, 0.011250
+#*# 	  0.025000, 0.066250, 0.060000, 0.043750, 0.008750, 0.000000, 0.021250
+#*# 	  0.035000, 0.065000, 0.038750, 0.026250, 0.011250, 0.021250, 0.011250
+#*# 	  0.041250, 0.058750, 0.028750, 0.010000, 0.027500, 0.045000, 0.026250
+#*# 	  -0.003750, -0.007500, -0.036250, -0.016250, -0.017500, -0.025000, 0.025000
 #*# tension = 0.2
 #*# min_x = 35.0
-#*# algo = lagrange
-#*# y_count = 5
+#*# algo = bicubic
+#*# y_count = 7
 #*# mesh_y_pps = 2
 #*# min_y = 6.0
-#*# x_count = 5
+#*# x_count = 7
 #*# max_y = 198.0
 #*# mesh_x_pps = 2
-#*# max_x = 240.0
+#*# max_x = 239.96
diff --git a/webcam1.txt b/webcam1.txt
new file mode 100644
index 0000000..0eb558c
--- /dev/null
+++ b/webcam1.txt
@@ -0,0 +1,2 @@
+camera="usb"
+camera_usb_options="-r 1280x720 -q 100 -sh 100 -d /dev/v4l/by-id/usb-046d_0825_7A88AD10-video-index0"
\ No newline at end of file