diff --git a/config.g b/config.g
index dd82dec..03ca999 100644
--- a/config.g
+++ b/config.g
@@ -18,10 +18,10 @@ M569 P0.5 S0 D3 H50 V50                        ; physical drive 0.5 goes backwar
 M584 X0.3 Y0.4 Z0.0:0.1:0.2 E0.5               ; set drive mapping
 M350 X16 Y16 Z16 E16 I1                        ; configure microstepping with interpolation
 
-M92 X160.00 Y160.00 Z1600.00 E820                  ; set steps per mm
-M566 X400.00 Y400.00 Z6.00 E120.00                 ; set maximum instantaneous speed changes (mm/min)
+M92 X160.00 Y160.00 Z1600.00 E830                  ; set steps per mm
+M566 X300.00 Y300.00 Z6.00 E120.00                 ; set maximum instantaneous speed changes (mm/min)
 M203 X10800.00 Y10800.00 Z1000.00 E1600.00         ; set maximum speeds (mm/min)
-M201 X3000.00 Y3000.00 Z100.00 E3600.00            ; set accelerations (mm/s^2)
+M201 X2000.00 Y2000.00 Z100.00 E3600.00            ; set accelerations (mm/s^2)
 M906 X1200 Y1200 Z1200 E800 I30                    ; set motor currents (mA) and motor idle factor in per cent
 M84 S30                                            ; Set idle timeout
 
diff --git a/macros/2_Preheat ASA b/macros/1_Preheat ASA
similarity index 100%
rename from macros/2_Preheat ASA
rename to macros/1_Preheat ASA
diff --git a/macros/1_Preheat PLA b/macros/1_Preheat PLA
deleted file mode 100644
index bef3de7..0000000
--- a/macros/1_Preheat PLA	
+++ /dev/null
@@ -1,29 +0,0 @@
-; Raise temp of heated bed to 60 and nozzle to 210
-;
-
-M291 P"Setting PID and retraction values for PLA" R"Proceed?" S3 
-
-; New values
-;M307 H0 A82.6 C112.0 D2.7 S1.00 V24.0 B0 ; PID tune for bed at 60c
-;M307 H1 A460.6 C173.6 D3.1 S1.00 V23.9 B0 ; Pid tune for hotend at 210c
-M572 D0 S0.05   ; Pressure advance for PLA
-M207 S0.7 R-0.000 F8000 T1500   ; retraction settings for PLA
-
-T0
-
-M140 S60			; Set bed temp to 80
-M116				; Wait for temps to be reached...
-G10 P0 S180			; Set extruder temp (tool 0) to 200
-M116
-M117 PLA Preheat complete	; and send a notice to the screen that temps have been reached
-;Play a tone
-M300 S1250 P200
-G4 P201
-M300 S1500 P200
-G4 P201
-M300 S1100 P200
-G4 P201
-M300 S950 P300
-G4 P400
-M300 S1175 P300
-G4 S1
diff --git a/macros/3_Preheat PETG b/macros/2_Preheat PETG
similarity index 100%
rename from macros/3_Preheat PETG
rename to macros/2_Preheat PETG
diff --git a/macros/4_Lights ON b/macros/3_Lights ON
similarity index 100%
rename from macros/4_Lights ON
rename to macros/3_Lights ON
diff --git a/macros/5_Lights OFF b/macros/4_Lights OFF
similarity index 100%
rename from macros/5_Lights OFF
rename to macros/4_Lights OFF