diff --git a/printer.cfg b/printer.cfg
index 461a91a..f97f90a 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -213,6 +213,29 @@ accel_chip: adxl345
 probe_points:
     175, 175, 30
 
+#####################################################################
+#   Filament Sensor
+#####################################################################
+[filament_switch_sensor switch_sensor]
+switch_pin: ^PF0
+pause_on_runout: True
+runout_gcode:
+ PAUSE
+ M117 Filament switch runout
+insert_gcode:
+ M117 Filament switch inserted
+
+[filament_motion_sensor encoder_sensor]
+switch_pin: ^PC15
+detection_length: 2.88 # accuracy of motion sensor 2.88mm
+extruder: extruder
+pause_on_runout: True
+runout_gcode:
+ PAUSE
+ M117 Filament encoder runout
+insert_gcode:
+ M117 Filament encoder inserted
+
 #####################################################################
 # 	Bed Heater
 #####################################################################
@@ -315,7 +338,6 @@ heater_temp: 45.0
 #####################################################################
 
 [neopixel caselight]
-# Chamber Lighting - HE2 Connector (Optional)
 pin: PD15
 chain_count: 30
 color_order: GRB
@@ -383,6 +405,17 @@ resolution: 0.1
 
 [exclude_object]
 
+[pause_resume]
+recover_velocity: 100
+
+[firmware_retraction]
+retract_length: 0.8
+retract_speed: 40
+unretract_extra_length: 0
+unretract_speed: 40
+
+[respond]
+default_type: echo
 
 #####################################################################
 # 	Macros
@@ -457,30 +490,6 @@ gcode:
     G1 E-50 F3000
     G1 E-50 F3000
 
-[gcode_macro PAUSE]
-gcode:
-    { action_respond_info('Pausing printer') }
-    SAVE_GCODE_STATE NAME=PAUSE
-    M83 ; relative extrusion
-    G1 E-5 F3600 ; retract filament
-    G91 ; relative positioning
-    G1 Z5 F3600 ; move nozzle up 5mm
-    G90 ; absolute positioning
-    PARK_NOZZLE_FRONT ; park nozzle
-    PAUSE_PRINT
-
-
-[gcode_macro RESUME]
-gcode:
-    { action_respond_info('Resuming printer') }
-    { % set IS_PAUSED = false % }
-    G91 ; relative positioning
-    G1 Z-5 F3600 ; move nozzle down 5mm
-    G90 ; absolute positioning
-    G1 E5 F3600 ; unretract filament
-    G1 E3 F1500 ; prime the nozzle
-    RESTORE_GCODE_STATE NAME=PAUSE MOVE=1 ; restore the state and move nozzle back to where it was
-
 #*# <---------------------- SAVE_CONFIG ---------------------->
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#