diff --git a/calibration.html b/calibration.html
index 25b6f3e..4bb8a5d 100644
--- a/calibration.html
+++ b/calibration.html
@@ -56,7 +56,7 @@
             <p>The gcode generated by this page has the following general characteristics:</p>
             <ul>
                 <li>Sliced for Marlin firmware, although in most cases will still be compatible with other firmwares.</li>
-                <li>1.75mm filament (<b>M221 S61.4</b> <i>may</i> work to compsensate for 2.85 mm filament in the custom start gcode field)</b></li>
+                <li>1.75mm filament (However <b>M221 S38</b> for 2.85 mm filament and <b>M221 S34</b> for 3.0 mm filament can be appiled in the custom start gcode field as compensation)</b></li>
                 <li>0.2mm layer height</li>
                 <li>0.4mm nozzle</li>
                 <li>Base feedrate of 60mm/sec</li>
@@ -174,7 +174,7 @@
         <a href="#" data-featherlight="img/firstlayerpreview.jpg"><img class="thumb" src="img/firstlayerpreview.jpg" /></a>
         <form name="firstlayerForm" id="firstlayerForm" onsubmit="return false;">
             <h4>Additional start gcode</h4>
-            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85 mm filament, setting K factor and more. Tick the box for more details.</p>
+            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85/3.00 mm filament, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#firstlayerStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
             <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
@@ -183,7 +183,7 @@
                 <ul>
                     <li>Copying gcode commands from your slicer to draw an intro/prime/purge line. By default this is left out to accommodate delta printers.</li>
                     <li>Telling the firmware to alter the flow rate of the gcode to follow. This does not mean the exact flow rate you have set in your own slicer. For example, using <b><a href="https://marlinfw.org/docs/gcode/M221.html" target="_blank">M221</a> S120</b> would set the flow rate to 120% of what it was originally sliced as in Simpilfy3D. Use this to compensate for obvious over or under extrusion you may encounter with these tests. Additional information available at the base of the <a href="#flow">Flow Rate</a> tab.</li>
-                    <li><b>M221 S61.4</b> can also be used to compensate for 2.85 mm filament instead of the default 1.75 mm. This has not had extensive testing but works in theory.</li>
+                    <li><b>M221 S38</b> can also be used to compensate for 2.85 mm filament and <b>M221 S34</b> for 3.00 mm filament instead of the default 1.75 mm.</li>
                     <li>Setting the K factor for linear advance. For example, <b>M900 K0.11</b></li>
                     <li>Custom ABL sequence. By default, only G28 is present. This gcode will be inserted immediately afer that so custom commands can be used here.</li>
                     <li>Anythng else you have in your start gcode, such as setting acceleration values, E-steps, etc.</li>
@@ -257,7 +257,7 @@
         <a href="#" data-featherlight="img/cube.jpg"><img class="thumb" src="img/cube.jpg" /></a>
         <form name="baselineForm" id="baselineForm" onsubmit="return false;">
             <h4>Additional start gcode</h4>
-            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85 mm filament, setting K factor and more. Tick the box for more details.</p>
+            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85/3.00 mm filament, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#baselineStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
             <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
@@ -266,7 +266,7 @@
                 <ul>
                     <li>Copying gcode commands from your slicer to draw an intro/prime/purge line. By default this is left out to accommodate delta printers.</li>
                     <li>Telling the firmware to alter the flow rate of the gcode to follow. This does not mean the exact flow rate you have set in your own slicer. For example, using <b><a href="https://marlinfw.org/docs/gcode/M221.html" target="_blank">M221</a> S120</b> would set the flow rate to 120% of what it was originally sliced as in Simpilfy3D. Use this to compensate for obvious over or under extrusion you may encounter with these tests. Additional information available at the base of the <a href="#flow">Flow Rate</a> tab.</li>
-                    <li><b>M221 S61.4</b> can also be used to compensate for 2.85 mm filament instead of the default 1.75 mm. This has not had extensive testing but works in theory.</li>
+                    <li><b>M221 S38</b> can also be used to compensate for 2.85 mm filament and <b>M221 S34</b> for 3.00 mm filament instead of the default 1.75 mm.</li>
                     <li>Setting the K factor for linear advance. For example, <b>M900 K0.11</b></li>
                     <li>Custom ABL sequence. By default, only G28 is present. This gcode will be inserted immediately afer that so custom commands can be used here.</li>
                     <li>Anythng else you have in your start gcode, such as setting acceleration values, E-steps, etc.</li>
@@ -702,7 +702,7 @@
         <p>Here is the STL if you would like to slice a similar test yourself: <a href="files/retractiontest.stl">retractiontest.stl</a></p>
         <form name="retractionForm" id="retractionForm" onsubmit="return false;">
             <h4>Additional start gcode</h4>
-            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85 mm filament, setting K factor and more. Tick the box for more details.</p>
+            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85/3.00 mm filament, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#retractionStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
             <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
@@ -711,7 +711,7 @@
                 <ul>
                     <li>Copying gcode commands from your slicer to draw an intro/prime/purge line. By default this is left out to accommodate delta printers.</li>
                     <li>Telling the firmware to alter the flow rate of the gcode to follow. This does not mean the exact flow rate you have set in your own slicer. For example, using <b><a href="https://marlinfw.org/docs/gcode/M221.html" target="_blank">M221</a> S120</b> would set the flow rate to 120% of what it was originally sliced as in Simpilfy3D. Use this to compensate for obvious over or under extrusion you may encounter with these tests. Additional information available at the base of the <a href="#flow">Flow Rate</a> tab.</li>
-                    <li><b>M221 S61.4</b> can also be used to compensate for 2.85 mm filament instead of the default 1.75 mm. This has not had extensive testing but works in theory.</li>
+                    <li><b>M221 S38</b> can also be used to compensate for 2.85 mm filament and <b>M221 S34</b> for 3.00 mm filament instead of the default 1.75 mm.</li>
                     <li>Setting the K factor for linear advance. For example, <b>M900 K0.11</b></li>
                     <li>Custom ABL sequence. By default, only G28 is present. This gcode will be inserted immediately afer that so custom commands can be used here.</li>
                     <li>Anythng else you have in your start gcode, such as setting acceleration values, E-steps, etc.</li>
@@ -855,7 +855,7 @@
         <p>Here is the STL if you would like to slice a similar test yourself: <a href="files/temperaturetower.stl">temperaturetower.stl</a></p>
         <form name="temperatureForm" id="temperatureForm" onsubmit="return false;">
             <h4>Additional start gcode</h4>
-            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85 mm filament, setting K factor and more. Tick the box for more details.</p>
+            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85/3.00 mm filament, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#temperatureStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
             <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
@@ -864,7 +864,7 @@
                 <ul>
                     <li>Copying gcode commands from your slicer to draw an intro/prime/purge line. By default this is left out to accommodate delta printers.</li>
                     <li>Telling the firmware to alter the flow rate of the gcode to follow. This does not mean the exact flow rate you have set in your own slicer. For example, using <b><a href="https://marlinfw.org/docs/gcode/M221.html" target="_blank">M221</a> S120</b> would set the flow rate to 120% of what it was originally sliced as in Simpilfy3D. Use this to compensate for obvious over or under extrusion you may encounter with these tests. Additional information available at the base of the <a href="#flow">Flow Rate</a> tab.</li>
-                    <li><b>M221 S61.4</b> can also be used to compensate for 2.85 mm filament instead of the default 1.75 mm. This has not had extensive testing but works in theory.</li>
+                    <li><b>M221 S38</b> can also be used to compensate for 2.85 mm filament and <b>M221 S34</b> for 3.00 mm filament instead of the default 1.75 mm.</li>
                     <li>Setting the K factor for linear advance. For example, <b>M900 K0.11</b></li>
                     <li>Custom ABL sequence. By default, only G28 is present. This gcode will be inserted immediately afer that so custom commands can be used here.</li>
                     <li>Anythng else you have in your start gcode, such as setting acceleration values, E-steps, etc.</li>
@@ -1049,7 +1049,7 @@
         <p>Use the following form to customise the gcode to your liking:</p>
         <form name="accelerationForm" id="accelerationForm" onsubmit="return false;">
             <h4>Additional start gcode</h4>
-            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85 mm filament, setting K factor and more. Tick the box for more details.</p>
+            <p>If you have additional start commands, tick the box and enter the gcode. This can be used for an extruder prime sequence, overwriting the standard flow rate, compensating for 2.85/3.00 mm filament, setting K factor and more. Tick the box for more details.</p>
             <label>Additional start gcode:<input name="start" type="checkbox" onchange="toggle(!this.checked, '#accelerationStart')" value="extraStart"></label>
             <label>Add M80 to turn PSU on:<input name="psuon" type="checkbox" value="on"></label>
             <label>Remove <b>T0</b> from gcode (advanced users with MMU)<input name="removet0" type="checkbox"></label>
@@ -1058,7 +1058,7 @@
                 <ul>
                     <li>Copying gcode commands from your slicer to draw an intro/prime/purge line. By default this is left out to accommodate delta printers.</li>
                     <li>Telling the firmware to alter the flow rate of the gcode to follow. This does not mean the exact flow rate you have set in your own slicer. For example, using <b><a href="https://marlinfw.org/docs/gcode/M221.html" target="_blank">M221</a> S120</b> would set the flow rate to 120% of what it was originally sliced as in Simpilfy3D. Use this to compensate for obvious over or under extrusion you may encounter with these tests. Additional information available at the base of the <a href="#flow">Flow Rate</a> tab.</li>
-                    <li><b>M221 S61.4</b> can also be used to compensate for 2.85 mm filament instead of the default 1.75 mm. This has not had extensive testing but works in theory.</li>
+                    <li><b>M221 S38</b> can also be used to compensate for 2.85 mm filament and <b>M221 S34</b> for 3.00 mm filament instead of the default 1.75 mm.</li>
                     <li>Setting the K factor for linear advance. For example, <b>M900 K0.11</b></li>
                     <li>Custom ABL sequence. By default, only G28 is present. This gcode will be inserted immediately afer that so custom commands can be used here.</li>
                     <li>Anythng else you have in your start gcode, such as setting acceleration values, E-steps, etc.</li>