diff --git a/ercf/software.cfg b/ercf/software.cfg
index 6482b94..41cd124 100644
--- a/ercf/software.cfg
+++ b/ercf/software.cfg
@@ -448,6 +448,31 @@ gcode:
 # move the selector (if needed) to the requested tool
 ############################################
 
+[gcode_macro S0]
+gcode:
+    ERCF_SELECT_TOOL TOOL=0
+
+[gcode_macro S1]
+gcode:
+    ERCF_SELECT_TOOL TOOL=1
+
+[gcode_macro S2]
+gcode:
+    ERCF_SELECT_TOOL TOOL=2
+
+[gcode_macro S3]
+gcode:
+    ERCF_SELECT_TOOL TOOL=3
+
+[gcode_macro S4]
+gcode:
+    ERCF_SELECT_TOOL TOOL=4
+
+[gcode_macro S5]
+gcode:
+    ERCF_SELECT_TOOL TOOL=5
+
+
 # Select a tool. move the idler and then move the color selector (if needed)
 [gcode_macro ERCF_SELECT_TOOL]
 description: Move the selector to the Tool and select it
diff --git a/ercf/vars.cfg b/ercf/vars.cfg
index 2fc61dd..af5f5d2 100644
--- a/ercf/vars.cfg
+++ b/ercf/vars.cfg
@@ -1,15 +1,15 @@
 [Variables]
 ercf_calib_0 = 1.0
-ercf_calib_1 = 1.00315859598
+ercf_calib_1 = 0.992410468168
 ercf_calib_10 = 1.0
 ercf_calib_11 = 1.0
-ercf_calib_2 = 1.00406479164
+ercf_calib_2 = 1.00044979689
 ercf_calib_3 = 1.00044979689
-ercf_calib_4 = 1.00135110302
-ercf_calib_5 = 1.00225403458
+ercf_calib_4 = 1.00044979689
+ercf_calib_5 = 0.999550111824
 ercf_calib_6 = 1.0
 ercf_calib_7 = 1.0
 ercf_calib_8 = 1.0
 ercf_calib_9 = 1.0
-ercf_calib_ref = 977.058272
+ercf_calib_ref = 967.611576