diff --git a/printer.cfg b/printer.cfg
index 094d9c7..fc90b04 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -410,7 +410,10 @@ color_order: GRB,RBG,GRB,RGB,RGB,RGB
 # 	Idle Timeout
 #####################################################################
 [idle_timeout]
-timeout: 1800
+timeout: 600
+gcode:
+    TURN_OFF_HEATERS
+    M84
 
 #####################################################################
 # 	Homing and Gantry Adjustment Routines
@@ -529,7 +532,7 @@ gcode:
 
 [gcode_macro PRINT_START]
 gcode:
-
+    UPDATE_DELAYED_GCODE ID=TURN_ON_LIGHTS DURATION=0
     SET_LED LED="caselight" RED=0.898 GREEN=1 BLUE=0 SYNC=0 TRANSMIT=1
     M140 S{ params.BED | float }                                    ; set bed temperature
 
@@ -583,8 +586,12 @@ gcode:
     G90                                                             ; absolute positioning
     PARK_NOZZLE_REAR                                                ; park nozzle
     #M84                                                             ; disable motors (optional)
-    SET_LED LED="hotend_rgb" RED=0 GREEN=0 BLUE=0 SYNC=0 TRANSMIT=1 ; turn off hotend LED
+    UPDATE_DELAYED_GCODE ID=TURN_OFF_LIGHTS DURATION=300
+
+[delayed_gcode TURN_OFF_LIGHTS]
+gcode:
     SET_LED LED="caselight" RED=0 GREEN=0 BLUE=0 SYNC=0 TRANSMIT=1
+    SET_LED LED="hotend_rgb" RED=0 GREEN=0 BLUE=0 SYNC=0 TRANSMIT=1
 
 [gcode_macro LOAD_FILAMENT]
 gcode: